From f19c4b29d8bc13664bec1522cadb23905374d6f9 Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Thu, 3 Jul 2014 16:18:48 +0200 Subject: [PATCH] Fix MSVC warnings --- CGAL_ImageIO/include/CGAL/Image_3.h | 4 +++- Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CGAL_ImageIO/include/CGAL/Image_3.h b/CGAL_ImageIO/include/CGAL/Image_3.h index 993af24acc7..4fea8f4e90b 100644 --- a/CGAL_ImageIO/include/CGAL/Image_3.h +++ b/CGAL_ImageIO/include/CGAL/Image_3.h @@ -457,7 +457,9 @@ Image_3::labellized_trilinear_interpolation(const Coord_type& x, labels.insert(((Image_word_type*)image()->data)[(i2 * dimy + j2) * dimx + k1]); labels.insert(((Image_word_type*)image()->data)[(i2 * dimy + j2) * dimx + k2]); - CGAL_HISTOGRAM_PROFILER("Number of labels around a vertex, Image_3::labellized_trilinear_interpolation()", labels.size()); + CGAL_HISTOGRAM_PROFILER( + "Number of labels around a vertex, Image_3::labellized_trilinear_interpolation()", + static_cast(labels.size())); if(labels.size() == 1) { return *(labels.begin()); diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h index feffc6f86e7..ad19f8febfe 100644 --- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h @@ -1932,7 +1932,8 @@ private: std::unique_copy(all_facets.begin(), all_facets.end(), std::back_inserter(facets)); - CGAL_HISTOGRAM_PROFILER("|facets|", facets.size()); + CGAL_HISTOGRAM_PROFILER("|facets|", + static_cast(facets.size())); return facets; } @@ -2678,7 +2679,8 @@ rebuild_restricted_delaunay(OutdatedCells& outdated_cells, t.reset(); # endif - CGAL_HISTOGRAM_PROFILER("|vertex_to_proj|=", vertex_to_proj.size()); + CGAL_HISTOGRAM_PROFILER("|vertex_to_proj|=", + static_cast(vertex_to_proj.size())); // Project interior vertices // Note: ~0% of rebuild_restricted_delaunay time // TODO : iterate to be sure no interior vertice become on the surface