From 0113f178114c09829bbb31a8edd4b3f4e305fa26 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Mon, 19 Feb 2007 06:02:13 +0000 Subject: [PATCH] Added casts and typedefs for gcc --- src/meshlabplugins/meshfilter/quadricsteximp.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/meshlabplugins/meshfilter/quadricsteximp.cpp b/src/meshlabplugins/meshfilter/quadricsteximp.cpp index ea772c1f3..0a9295889 100644 --- a/src/meshlabplugins/meshfilter/quadricsteximp.cpp +++ b/src/meshlabplugins/meshfilter/quadricsteximp.cpp @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.4 2007/02/19 06:02:13 cignoni +Added casts and typedefs for gcc + Revision 1.3 2007/02/09 16:07:35 pirosu Removed debug code @@ -172,8 +175,11 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType, typedef typename tri::TriEdgeCollapse::HeapType HeapType; typedef typename tri::TriEdgeCollapse::HeapElem HeapElem; typedef typename TriMeshType::FaceType FaceType; + typedef typename TriMeshType::FaceType::EdgeType EdgeType; typedef typename TriMeshType::VertexType VertexType; - + typedef typename TriMeshType::CoordType CoordType; + typedef typename TriMeshType::CoordType::ScalarType ScalarType; + public: @@ -295,7 +301,7 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType, ncoords = GetTexCoords(tcoord0_1,tcoord1_1,tcoord0_2,tcoord1_2); - return ComputeMinimalsAndPriority(min1,min2,qsum1,qsum2,tcoord0_1,tcoord1_1,tcoord0_2,tcoord1_2,ncoords); + return (ScalarType)ComputeMinimalsAndPriority(min1,min2,qsum1,qsum2,tcoord0_1,tcoord1_1,tcoord0_2,tcoord1_2,ncoords); } ScalarType ComputePriority(double vv[5],Quadric5 &qsum)