songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix -Wconversion warnings 

All conversions are safe.
This commit is contained in:
Laurent Rineau 2016-06-16 16:35:20 +02:00
parent b95a960058
commit bbc05a11d9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesh_3/examples/Mesh_3/random_labeled_image.h
View File

@ -25,9 +25,9 @@ CGAL::Image_3 random_labeled_image()
dim-2 - max_radius_of_spheres);
k = rand.uniform_smallint(1 + max_radius_of_spheres,
dim-2 - max_radius_of_spheres);
} while ( ( CGAL::square(double(center) - i) +
CGAL::square(double(center) - j) +
CGAL::square(double(center) - k) )
} while ( ( CGAL::square(double(center) - double(i)) +
CGAL::square(double(center) - double(j)) +
CGAL::square(double(center) - double(k)) )
<
CGAL::square(double(radius_of_big_sphere) + 4 * max_radius_of_spheres) );
std::ptrdiff_t radius = max_radius_of_spheres;

4
Mesh_3/include/CGAL/Mesh_3/initialize_triangulation_from_labeled_image.h
View File

@ -46,7 +46,7 @@ struct Get_point
const std::size_t j,
const std::size_t k) const
{
return Point(i * vx, j * vy, k * vz);
return Point(double(i) * vx, double(j) * vy, double(k) * vz);
}
};
template<class C3T3, class MeshDomain, class MeshCriteria>
@ -119,7 +119,7 @@ void initialize_triangulation_from_labeled_image(C3T3& c3t3,
for(typename Seeds::const_iterator it = seeds.begin(), end = seeds.end();
it != end; ++it)
{
const double radius = (it->second + 1)* max_v;
const double radius = double(it->second + 1)* max_v;
CGAL::Random_points_on_sphere_3<Point> points_on_sphere_3(radius);
typename Mesh_domain::Construct_intersection construct_intersection =
domain.construct_intersection_object();

2
Mesh_3/include/CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h
View File

@ -189,7 +189,7 @@ search_for_connected_components_in_labeled_image(const CGAL::Image_3& image,
const int m_n = (visited[offset_n] ? 1 : 0) +
(second_pass[offset_n] ? 2 : 0);
if(m_n < pass) {
Indices indices(uint(i_n), uint(j_n), uint(k_n), depth+1);
Indices indices(uint(i_n), uint(j_n), uint(k_n), uint(depth+1));
queue.push(indices);
}
}