From 7be5d031b9fa2868c94f1e1f2a7f2553d71484f9 Mon Sep 17 00:00:00 2001 From: cignoni Date: Sun, 15 Oct 2006 07:31:22 +0000 Subject: [PATCH] typenames and qualifiers for gcc compliance --- vcg/complex/local_optimization/tri_edge_collapse.h | 5 ++++- vcg/complex/local_optimization/tri_edge_collapse_quadric.h | 5 ++++- vcg/complex/trimesh/clean.h | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/vcg/complex/local_optimization/tri_edge_collapse.h b/vcg/complex/local_optimization/tri_edge_collapse.h index c7653190..c3589f4f 100644 --- a/vcg/complex/local_optimization/tri_edge_collapse.h +++ b/vcg/complex/local_optimization/tri_edge_collapse.h @@ -22,6 +22,9 @@ ****************************************************************************/ /**************************************************************************** $Log: not supported by cvs2svn $ + Revision 1.18 2006/10/09 20:09:40 cignoni + Changed some access to VertexFaceIterator to reflect the shorter new operators. + Revision 1.17 2005/10/12 10:44:01 cignoni Now creation of new edge use Ordered() constructor to comply the fact that the basic collapse is simmetric. @@ -101,7 +104,7 @@ public: protected: typedef typename TriMeshType::FaceType FaceType; typedef typename TriMeshType::FaceType::VertexType VertexType; - typedef typename FaceType::EdgeType EdgeType; + typedef typename VertexType::EdgeType EdgeType; typedef typename FaceType::VertexType::CoordType CoordType; typedef typename TriMeshType::VertexType::ScalarType ScalarType; typedef typename LocalOptimization::HeapElem HeapElem; diff --git a/vcg/complex/local_optimization/tri_edge_collapse_quadric.h b/vcg/complex/local_optimization/tri_edge_collapse_quadric.h index 3653108f..bc2634f9 100644 --- a/vcg/complex/local_optimization/tri_edge_collapse_quadric.h +++ b/vcg/complex/local_optimization/tri_edge_collapse_quadric.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.10 2006/10/09 20:12:55 cignoni +Heavyly restructured for meshlab inclusion. Now the access to the quadric elements are mediated by a static helper class. + Revision 1.9 2006/10/07 17:20:25 cignoni Updated to the new style face->Normal() becomes Normal(face) @@ -142,7 +145,7 @@ public: }; -template > +template > class TriEdgeCollapseQuadric: public TriEdgeCollapse< TriMeshType, MYTYPE> { public: diff --git a/vcg/complex/trimesh/clean.h b/vcg/complex/trimesh/clean.h index 496bd7e2..18aaf10d 100644 --- a/vcg/complex/trimesh/clean.h +++ b/vcg/complex/trimesh/clean.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.41 2006/10/09 20:06:46 cignoni +Added Remove NonManifoldFace + Revision 1.40 2006/05/25 09:41:09 cignoni missing std and other gcc detected syntax errors @@ -393,7 +396,7 @@ private: { FaceIterator fi; int count_fd = 0; - vector ToDelVec; + std::vector ToDelVec; for(fi=m.face.begin(); fi!=m.face.end();++fi) if (!fi->IsD())