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

removed harmless warnings

This commit is contained in:
Paolo Cignoni 2010-02-24 09:55:28 +00:00
parent bb75099c5d
commit 9f8497013f
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@ static std::pair<typename MeshType::FaceType *, typename MeshType::VertexType *>
{ {
assert(tri::HasFFAdjacency(m)); assert(tri::HasFFAdjacency(m));
assert(face::IsBorder(f,edge)); 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<MeshType>::AddFaces(m,1); if(newFace==0) newFace=&*tri::Allocator<MeshType>::AddFaces(m,1);
if(newVert==0) { if(newVert==0) {
newVert=&*tri::Allocator<MeshType>::AddVertices(m,1); newVert=&*tri::Allocator<MeshType>::AddVertices(m,1);
@ -186,8 +186,8 @@ static std::pair<typename MeshType::FaceType *, typename MeshType::VertexType *>
f.V1(edge)=newVert; 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("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("OldFace %i %i %i",tri::Index(m,f.V(0)),tri::Index(m,f.V(1)),tri::Index(m,f.V(2)));
// Topology // Topology

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

@ -544,8 +544,10 @@ private:
static int RemoveNonManifoldVertex(MeshType& m) static int RemoveNonManifoldVertex(MeshType& m)
{ {
int count_vd = CountNonManifoldVertexFF(m,true); /*int count_vd = */
int count_fd = UpdateSelection<MeshType>::FaceFromVertexLoose(m); CountNonManifoldVertexFF(m,true);
/*int count_fd = */
UpdateSelection<MeshType>::FaceFromVertexLoose(m);
int count_removed = 0; int count_removed = 0;
FaceIterator fi; FaceIterator fi;
for(fi=m.face.begin(); fi!=m.face.end();++fi) for(fi=m.face.begin(); fi!=m.face.end();++fi)
@ -1143,7 +1145,7 @@ private:
Compindex++; Compindex++;
} }
} }
assert(CCV.size()==Compindex); assert(int(CCV.size())==Compindex);
return Compindex; return Compindex;
} }
@ -1472,8 +1474,8 @@ private:
for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
if((*fi).IsD()) DeletedFaceNum++; if((*fi).IsD()) DeletedFaceNum++;
if(m.vn+DeletedVertexNum != m.vert.size()) return false; if(size_t(m.vn+DeletedVertexNum) != m.vert.size()) return false;
if(m.fn+DeletedFaceNum != m.face.size()) return false; if(size_t(m.fn+DeletedFaceNum) != m.face.size()) return false;
return true; 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)); Box3f bb(p-Point3f(radius,radius,radius),p+Point3f(radius,radius,radius));
GridGetInBox(sht, markerFunctor, bb, closests); GridGetInBox(sht, markerFunctor, bb, closests);
// qDebug("Vertex %i has %i closest", &*viv - &*m.vert.begin(),closests.size()); // qDebug("Vertex %i has %i closest", &*viv - &*m.vert.begin(),closests.size());
for(int i=0; i<closests.size(); ++i) for(size_t i=0; i<closests.size(); ++i)
{ {
float dist = Distance(p,closests[i]->cP()); float dist = Distance(p,closests[i]->cP());
if(dist < radius && !closests[i]->IsV()) if(dist < radius && !closests[i]->IsV())

2
vcg/math/deprecated_matrix.h
View File

@ -288,7 +288,7 @@ namespace vcg{
*/ */
inline TYPE* operator[](const unsigned int i) inline TYPE* operator[](const unsigned int i)
{ {
assert(i>=0 && i<_rows); assert(i<_rows);
return _data + i*_columns; return _data + i*_columns;
}; };