From 97d7baf66ca229dc1c173cbd454e58cca0d1c824 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Mon, 21 May 2007 13:22:40 +0000
Subject: [PATCH] Corrected gcc compiling issues

---
 vcg/complex/edgemesh/base.h   | 7 +++++--
 wrap/gl/picking.h             | 7 +++++--
 wrap/io_edgemesh/export_svg.h | 9 ++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/vcg/complex/edgemesh/base.h b/vcg/complex/edgemesh/base.h
index 030ef24f..4b310b88 100644
--- a/vcg/complex/edgemesh/base.h
+++ b/vcg/complex/edgemesh/base.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.7  2007/03/12 15:38:02  tarini
+Texture coord name change!  "TCoord" and "Texture" are BAD. "TexCoord" is GOOD.
+
 Revision 1.6  2005/09/14 14:09:16  spinelli
 ConstVertexPointer --> VertexPointer
 ConstEdgePointer --> EdgePointer
@@ -132,7 +135,7 @@ public:
 
 	inline int MemNeeded() const
 	{
-		return sizeof(EdgeMesh)+sizeof(VertexType)*vn+sizeof(EdgeType)*fn;
+		return sizeof(EdgeMesh)+sizeof(VertexType)*vn+sizeof(EdgeType)*en;
 	}
 
 
@@ -161,7 +164,7 @@ static bool HasPerEdgeMark()      { return EdgeType::HasEdgeMark()   ; }
 static bool HasPerEdgeQuality()   { return EdgeType::HasEdgeQuality(); }
 
 static bool HasEETopology()       { return EdgeType::HasEEAdjacency();  }
-static bool HasVETopology()       { return FaceType::HasVEAdjacency(); }
+static bool HasVETopology()       { return EdgeType::HasVEAdjacency(); }
 static bool HasTopology()         { return HasEETopology() || HasVETopology(); }
 
 
diff --git a/wrap/gl/picking.h b/wrap/gl/picking.h
index ed6f7544..5a7de60a 100644
--- a/wrap/gl/picking.h
+++ b/wrap/gl/picking.h
@@ -28,6 +28,9 @@ This file contains two function providing the standard way to do picking using o
 
   History
 $Log: not supported by cvs2svn $
+Revision 1.4  2006/10/27 08:55:15  fiorin
+Added type cast (in order to remove warnings)
+
 Revision 1.3  2006/02/28 13:25:48  ponchio
 for(ii... -> for(int ii
 
@@ -58,7 +61,7 @@ int Pick(	const int & x, const int &y,
 		result.clear();
 		long hits;	
 		int sz = int(m.size())*5;
-		unsigned int *selectBuf =new unsigned int[sz];
+		GLuint *selectBuf =new GLuint[sz];
 		glSelectBuffer(sz, selectBuf);
 		glRenderMode(GL_SELECT);
 		glInitNames();
@@ -67,7 +70,7 @@ int Pick(	const int & x, const int &y,
 		glPushName(-1);
 		double mp[16];
 
-		int viewport[4];
+		GLint viewport[4];
 		glGetIntegerv(GL_VIEWPORT,viewport);
 		glMatrixMode(GL_PROJECTION);
 		glGetDoublev(GL_PROJECTION_MATRIX ,mp);
diff --git a/wrap/io_edgemesh/export_svg.h b/wrap/io_edgemesh/export_svg.h
index 74095399..ff5e8c29 100644
--- a/wrap/io_edgemesh/export_svg.h
+++ b/wrap/io_edgemesh/export_svg.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.3  2006/02/16 15:16:51  corsini
+Add reference plane support
+
 Revision 1.2  2006/02/15 15:40:06  corsini
 Decouple SVG properties and exporter for simmetry with the other exporter
 
@@ -273,11 +276,11 @@ public:
 		Point2f pmin(100000000.0f,  100000000.0f);
 		Point2f pmax(-100000000.0f, -100000000.0f);
 
-		EdgeMeshType::EdgeIterator i;
+		typename EdgeMeshType::EdgeIterator i;
 		for (i = mp->edges.begin(); i != mp->edges.end(); ++i)
 		{
-			Point3<EdgeMeshType::ScalarType> p1 = (*i).V(0)->P();
-			Point3<EdgeMeshType::ScalarType> p2 = (*i).V(1)->P();
+			Point3<typename EdgeMeshType::ScalarType> p1 = (*i).V(0)->P();
+			Point3<typename EdgeMeshType::ScalarType> p2 = (*i).V(1)->P();
 
 			Point3d p1d(p1[0], p1[1], p1[2]);
 			Point3d p2d(p2[0], p2[1], p2[2]);