From e46cd8ad1ac9a57e29c0ac0df2f912d35e3eb664 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 21 Mar 2018 11:32:16 +0100 Subject: [PATCH] Remove the last -Wconversion warnings from all Mesh_3 I have only compiled tests and examples. Maybe the Mesh_3 plugin of the 3D demo has other warnings. --- CGAL_ImageIO/include/CGAL/Image_3.h | 4 ++-- Mesh_3/examples/Mesh_3/mesh_3D_gray_image_multiple_values.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CGAL_ImageIO/include/CGAL/Image_3.h b/CGAL_ImageIO/include/CGAL/Image_3.h index e13a7e81e08..e344d0ccc19 100644 --- a/CGAL_ImageIO/include/CGAL/Image_3.h +++ b/CGAL_ImageIO/include/CGAL/Image_3.h @@ -503,7 +503,7 @@ Image_3::labellized_trilinear_interpolation static_cast(lc)); if(lc == 1) { - return labels[0]; + return static_cast(labels[0]); } double best_value = 0.; @@ -521,7 +521,7 @@ Image_3::labellized_trilinear_interpolation } } // CGAL_assertion(best_value > 0.5); - return best; + return static_cast(best); } } // end namespace CGAL diff --git a/Mesh_3/examples/Mesh_3/mesh_3D_gray_image_multiple_values.cpp b/Mesh_3/examples/Mesh_3/mesh_3D_gray_image_multiple_values.cpp index 21fccb1a098..aff18d72b48 100644 --- a/Mesh_3/examples/Mesh_3/mesh_3D_gray_image_multiple_values.cpp +++ b/Mesh_3/examples/Mesh_3/mesh_3D_gray_image_multiple_values.cpp @@ -55,7 +55,7 @@ int main(int argc, char*argv[]) iso_values.insert(2.9f); } else { for(int i = 2; i < argc; ++i) { - iso_values.insert(std::atof(argv[i])); + iso_values.insert(static_cast(std::atof(argv[i]))); } }