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

removed harmless gcc warnings

This commit is contained in:
Paolo Cignoni 2010-03-02 23:17:15 +00:00
parent c2456526fd
commit d340b8b92a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcg/complex/trimesh/bitquad_creation.h
View File

@ -342,7 +342,7 @@ static void MakePureByRefine(MeshType &m){
assert(ev%2==0); // should be even by now assert(ev%2==0); // should be even by now
ev/=2; // I was counting each of them twice ev/=2; // I was counting each of them twice
int originalFaceNum = m.fn; //int originalFaceNum = m.fn;
FaceIterator nfi = tri::Allocator<MeshType>::AddFaces(m,ef); FaceIterator nfi = tri::Allocator<MeshType>::AddFaces(m,ef);
VertexIterator nvi = tri::Allocator<MeshType>::AddVertices(m,ev); VertexIterator nvi = tri::Allocator<MeshType>::AddVertices(m,ev);

2
vcg/complex/trimesh/clean.h
View File

@ -1382,7 +1382,7 @@ private:
static int RemoveTVertexByCollapse(MeshType &m, float threshold=40, bool repeat=true) static int RemoveTVertexByCollapse(MeshType &m, float threshold=40, bool repeat=true)
{ {
assert(m.HasPerVertexMark()); assert(tri::HasPerVertexMark(m));
//Counters for logging and convergence //Counters for logging and convergence
int count, total = 0; int count, total = 0;

2
vcg/complex/trimesh/clustering.h
View File

@ -176,7 +176,7 @@ class AverageColorCell
typedef BasicGrid<typename MeshType::ScalarType> GridType; typedef BasicGrid<typename MeshType::ScalarType> GridType;
public: public:
inline void AddFaceVertex(MeshType &m, FaceType &f, int i) inline void AddFaceVertex(MeshType &/*m*/, FaceType &f, int i)
{ {
p+=f.cV(i)->cP(); p+=f.cV(i)->cP();
c+=CoordType(f.cV(i)->C()[0],f.cV(i)->C()[1],f.cV(i)->C()[2]); c+=CoordType(f.cV(i)->C()[0],f.cV(i)->C()[1],f.cV(i)->C()[2]);

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

@ -192,12 +192,12 @@ static void MultiFaceRandom( UpdateMeshType &m)
FaceIterator fi; FaceIterator fi;
Color4b BaseColor = Color4b::Black; Color4b BaseColor = Color4b::Black;
FaceConstant(m,BaseColor); FaceConstant(m,BaseColor);
int id=0; int id_num=0;
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())
{ {
id++; id_num++;
if((*fi).C() == BaseColor) (*fi).C() = Color4b::Scatter(50, id%50,.4f,.7f); if((*fi).C() == BaseColor) (*fi).C() = Color4b::Scatter(50, id_num%50,.4f,.7f);
for(int j=0;j<3;++j) for(int j=0;j<3;++j)
if((*fi).IsF(j)) if((*fi).IsF(j))
{ {