manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed gcc4.4 warnings

This commit is contained in:
Paolo Cignoni 2009-12-08 15:57:19 +00:00
parent 39f12e9fdd
commit fbbf8fe436
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/complex/trimesh/update/color.h
View File

@ -244,9 +244,10 @@ static int FaceSelected(UpdateMeshType &m, Color4b vs=Color4b::LightBlue)
int cnt=0; int cnt=0;
typename UpdateMeshType::FaceIterator fi; typename UpdateMeshType::FaceIterator fi;
for(fi=m.face.begin();fi!=m.face.end();++fi) for(fi=m.face.begin();fi!=m.face.end();++fi)
if(!(*fi).IsD()) if(!(*fi).IsD()){
if((*fi).IsS()) { (*fi).C() = vs; ++cnt; } if((*fi).IsS()) { (*fi).C() = vs; ++cnt; }
else (*fi).C() = Color4b::White; else (*fi).C() = Color4b::White;
}
return cnt; return cnt;
} }
@ -278,10 +279,10 @@ static int VertexSelected(UpdateMeshType &m, Color4b vs=Color4b::LightBlue)
int cnt=0; int cnt=0;
typename UpdateMeshType::VertexIterator vi; typename UpdateMeshType::VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi) for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if(!(*vi).IsD()) if(!(*vi).IsD()){
if((*vi).IsS()) {(*vi).C() = vs; ++cnt; } if((*vi).IsS()) {(*vi).C() = vs; ++cnt; }
else (*vi).C() = Color4b::White; else (*vi).C() = Color4b::White;
}
return cnt; return cnt;
} }

2
vcg/space/index/space_iterators.h
View File

@ -110,7 +110,7 @@ namespace vcg{
dist=(r.Origin()-goal).Norm(); dist=(r.Origin()-goal).Norm();
const float LocalMaxScalar = (std::numeric_limits<float>::max)(); const float LocalMaxScalar = (std::numeric_limits<float>::max)();
const float EPS = 1e-50f; const float EPS = std::numeric_limits<float>::min;
/* Parametri della linea */ /* Parametri della linea */
ScalarType tx,ty,tz; ScalarType tx,ty,tz;