From c4f4db436c1f5c8e33718d8ce7bbfb52e19642e4 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Mon, 21 Feb 2011 10:33:05 +0000 Subject: [PATCH] removed harmless warnings (added parenthesis to disambiguate if-then-else) --- src/meshlabplugins/filter_meshing/quadric_simp.cpp | 2 ++ src/meshlabplugins/filter_meshing/quadric_tex_simp.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/meshlabplugins/filter_meshing/quadric_simp.cpp b/src/meshlabplugins/filter_meshing/quadric_simp.cpp index 555a7cbfd..3cedf7bfa 100644 --- a/src/meshlabplugins/filter_meshing/quadric_simp.cpp +++ b/src/meshlabplugins/filter_meshing/quadric_simp.cpp @@ -46,8 +46,10 @@ void QuadricSimplification(CMeshO &m,int TargetFaceNum, bool Selected, CallBack // Mark not writable un-selected vertices CMeshO::VertexIterator vi; for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + { if(!(*vi).IsS()) (*vi).ClearW(); else (*vi).SetW(); + } } if(pp.PreserveBoundary && !Selected) diff --git a/src/meshlabplugins/filter_meshing/quadric_tex_simp.cpp b/src/meshlabplugins/filter_meshing/quadric_tex_simp.cpp index ac568d321..03fdff534 100644 --- a/src/meshlabplugins/filter_meshing/quadric_tex_simp.cpp +++ b/src/meshlabplugins/filter_meshing/quadric_tex_simp.cpp @@ -48,8 +48,10 @@ void QuadricTexSimplification(CMeshO &m,int TargetFaceNum, bool Selected, CallB // Mark not writable un-selected vertices CMeshO::VertexIterator vi; for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) + { if(!(*vi).IsS()) (*vi).ClearW(); else (*vi).SetW(); + } } vcg::LocalOptimization DeciSession(m);