From fbbf8fe436207f14191cbd80fe44193dc0d094bd Mon Sep 17 00:00:00 2001 From: cignoni Date: Tue, 8 Dec 2009 15:57:19 +0000 Subject: [PATCH] Removed gcc4.4 warnings --- vcg/complex/trimesh/update/color.h | 7 ++++--- vcg/space/index/space_iterators.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vcg/complex/trimesh/update/color.h b/vcg/complex/trimesh/update/color.h index f7674bfc..e1d6b515 100644 --- a/vcg/complex/trimesh/update/color.h +++ b/vcg/complex/trimesh/update/color.h @@ -244,9 +244,10 @@ static int FaceSelected(UpdateMeshType &m, Color4b vs=Color4b::LightBlue) int cnt=0; typename UpdateMeshType::FaceIterator fi; for(fi=m.face.begin();fi!=m.face.end();++fi) - if(!(*fi).IsD()) + if(!(*fi).IsD()){ if((*fi).IsS()) { (*fi).C() = vs; ++cnt; } else (*fi).C() = Color4b::White; + } return cnt; } @@ -278,10 +279,10 @@ static int VertexSelected(UpdateMeshType &m, Color4b vs=Color4b::LightBlue) int cnt=0; typename UpdateMeshType::VertexIterator vi; for(vi=m.vert.begin();vi!=m.vert.end();++vi) - if(!(*vi).IsD()) + if(!(*vi).IsD()){ if((*vi).IsS()) {(*vi).C() = vs; ++cnt; } else (*vi).C() = Color4b::White; - + } return cnt; } diff --git a/vcg/space/index/space_iterators.h b/vcg/space/index/space_iterators.h index 9a5f5947..44e829e8 100644 --- a/vcg/space/index/space_iterators.h +++ b/vcg/space/index/space_iterators.h @@ -110,7 +110,7 @@ namespace vcg{ dist=(r.Origin()-goal).Norm(); const float LocalMaxScalar = (std::numeric_limits::max)(); - const float EPS = 1e-50f; + const float EPS = std::numeric_limits::min; /* Parametri della linea */ ScalarType tx,ty,tz;