From 9f8497013fb5c8f5497b6ff723b0ce5e68eca612 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 24 Feb 2010 09:55:28 +0000 Subject: [PATCH] removed harmless warnings --- vcg/complex/trimesh/bitquad_creation.h | 6 +++--- vcg/complex/trimesh/clean.h | 14 ++++++++------ vcg/math/deprecated_matrix.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/vcg/complex/trimesh/bitquad_creation.h b/vcg/complex/trimesh/bitquad_creation.h index 53136bbb..55fe0f3b 100644 --- a/vcg/complex/trimesh/bitquad_creation.h +++ b/vcg/complex/trimesh/bitquad_creation.h @@ -174,7 +174,7 @@ static std::pair { assert(tri::HasFFAdjacency(m)); assert(face::IsBorder(f,edge)); - qDebug("OldFacePRE %i %i %i",tri::Index(m,f.V(0)),tri::Index(m,f.V(1)),tri::Index(m,f.V(2))); + //qDebug("OldFacePRE %i %i %i",tri::Index(m,f.V(0)),tri::Index(m,f.V(1)),tri::Index(m,f.V(2))); if(newFace==0) newFace=&*tri::Allocator::AddFaces(m,1); if(newVert==0) { newVert=&*tri::Allocator::AddVertices(m,1); @@ -186,8 +186,8 @@ static std::pair f.V1(edge)=newVert; - qDebug("NewFace %i %i %i",tri::Index(m,newFace->V(0)),tri::Index(m,newFace->V(1)),tri::Index(m,newFace->V(2))); - qDebug("OldFace %i %i %i",tri::Index(m,f.V(0)),tri::Index(m,f.V(1)),tri::Index(m,f.V(2))); + //qDebug("NewFace %i %i %i",tri::Index(m,newFace->V(0)),tri::Index(m,newFace->V(1)),tri::Index(m,newFace->V(2))); + //qDebug("OldFace %i %i %i",tri::Index(m,f.V(0)),tri::Index(m,f.V(1)),tri::Index(m,f.V(2))); // Topology diff --git a/vcg/complex/trimesh/clean.h b/vcg/complex/trimesh/clean.h index 579d32e9..96773f47 100644 --- a/vcg/complex/trimesh/clean.h +++ b/vcg/complex/trimesh/clean.h @@ -544,8 +544,10 @@ private: static int RemoveNonManifoldVertex(MeshType& m) { - int count_vd = CountNonManifoldVertexFF(m,true); - int count_fd = UpdateSelection::FaceFromVertexLoose(m); + /*int count_vd = */ + CountNonManifoldVertexFF(m,true); + /*int count_fd = */ + UpdateSelection::FaceFromVertexLoose(m); int count_removed = 0; FaceIterator fi; for(fi=m.face.begin(); fi!=m.face.end();++fi) @@ -1143,7 +1145,7 @@ private: Compindex++; } } - assert(CCV.size()==Compindex); + assert(int(CCV.size())==Compindex); return Compindex; } @@ -1472,8 +1474,8 @@ private: for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if((*fi).IsD()) DeletedFaceNum++; - if(m.vn+DeletedVertexNum != m.vert.size()) return false; - if(m.fn+DeletedFaceNum != m.face.size()) return false; + if(size_t(m.vn+DeletedVertexNum) != m.vert.size()) return false; + if(size_t(m.fn+DeletedFaceNum) != m.face.size()) return false; return true; } @@ -1586,7 +1588,7 @@ static int MergeCloseVertex(MeshType &m, const ScalarType radius) Box3f bb(p-Point3f(radius,radius,radius),p+Point3f(radius,radius,radius)); GridGetInBox(sht, markerFunctor, bb, closests); // qDebug("Vertex %i has %i closest", &*viv - &*m.vert.begin(),closests.size()); - for(int i=0; icP()); if(dist < radius && !closests[i]->IsV()) diff --git a/vcg/math/deprecated_matrix.h b/vcg/math/deprecated_matrix.h index 3273170b..1a1f0502 100644 --- a/vcg/math/deprecated_matrix.h +++ b/vcg/math/deprecated_matrix.h @@ -288,7 +288,7 @@ namespace vcg{ */ inline TYPE* operator[](const unsigned int i) { - assert(i>=0 && i<_rows); + assert(i<_rows); return _data + i*_columns; };