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

Fix conversion warnings in polylines_to_protect

This commit is contained in:
Laurent Rineau 2018-06-05 11:21:28 +02:00
parent c1a9f93a24
commit d108f920d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,7 +545,7 @@ polylines_to_protect
{{ { pix10, Point_3(), Domain_type(), 0, false }, {{ { pix10, Point_3(), Domain_type(), 0, false },
{ pix11, Point_3(), Domain_type(), 0, false } }} }}; { pix11, Point_3(), Domain_type(), 0, false } }} }};
std::map<Image_word_type, int> pixel_values_set; std::map<Domain_type, int> pixel_values_set;
for(int ii = 0; ii < 2; ++ii) { for(int ii = 0; ii < 2; ++ii) {
for(int jj = 0; jj < 2; ++jj) { for(int jj = 0; jj < 2; ++jj) {
const Pixel& pixel = square[ii][jj].pixel; const Pixel& pixel = square[ii][jj].pixel;
@ -902,7 +902,7 @@ case_1_2_1:
} }
else { else {
// case of two colors with one pixel green and three red // case of two colors with one pixel green and three red
Image_word_type value_alone; Domain_type value_alone;
if(pixel_values_set.begin()->second == 1) { if(pixel_values_set.begin()->second == 1) {
value_alone = pixel_values_set.begin()->first; value_alone = pixel_values_set.begin()->first;
} else { } else {