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

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.
This commit is contained in:
Laurent Rineau 2018-03-21 11:32:16 +01:00
parent d1c5eb655b
commit e46cd8ad1a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CGAL_ImageIO/include/CGAL/Image_3.h
View File

@ -503,7 +503,7 @@ Image_3::labellized_trilinear_interpolation
static_cast<unsigned int>(lc)); static_cast<unsigned int>(lc));
if(lc == 1) { if(lc == 1) {
return labels[0]; return static_cast<Target_type>(labels[0]);
} }
double best_value = 0.; double best_value = 0.;
@ -521,7 +521,7 @@ Image_3::labellized_trilinear_interpolation
} }
} }
// CGAL_assertion(best_value > 0.5); // CGAL_assertion(best_value > 0.5);
return best; return static_cast<Target_type>(best);
} }
} // end namespace CGAL } // end namespace CGAL

2
Mesh_3/examples/Mesh_3/mesh_3D_gray_image_multiple_values.cpp
View File

@ -55,7 +55,7 @@ int main(int argc, char*argv[])
iso_values.insert(2.9f); iso_values.insert(2.9f);
} else { } else {
for(int i = 2; i < argc; ++i) { for(int i = 2; i < argc; ++i) {
iso_values.insert(std::atof(argv[i])); iso_values.insert(static_cast<float>(std::atof(argv[i])));
} }
} }