From 51c88ab378336c0ad2063296912210c6d4bdea12 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Wed, 26 Jan 2005 22:45:34 +0000
Subject: [PATCH] Release 4.04 final updates for gcc compiling issues

---
 apps/metro/mesh_type.h | 14 ++++++--------
 apps/metro/metro.cpp   | 11 +++++++++--
 apps/metro/readme.txt  |  2 +-
 apps/metro/sampling.h  |  8 ++++++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/apps/metro/mesh_type.h b/apps/metro/mesh_type.h
index 8f44e88f..8544d850 100644
--- a/apps/metro/mesh_type.h
+++ b/apps/metro/mesh_type.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.5  2004/05/14 00:32:36  ganovelli
+just color and quality on the vertex
+
 
 
 ****************************************************************************/
@@ -38,16 +41,11 @@ $Log: not supported by cvs2svn $
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/complex/trimesh/base.h>
 
-
-
-using namespace vcg;
-using namespace std;
-
 // Vertex, Face, Mesh and Grid definitions.
 class MyEdge;
 class CFace;
-class CVertex   : public VertexVCVQ< double,MyEdge,CFace > {};
-class CFace     : public FaceRTFCFMFN< CVertex,MyEdge,CFace > {};
-class CMesh     : public tri::TriMesh< vector<CVertex>, vector<CFace> > {};
+class CVertex   : public vcg::VertexVCVQ< double,MyEdge,CFace > {};
+class CFace     : public vcg::FaceRTFCFMFN< CVertex,MyEdge,CFace > {};
+class CMesh     : public vcg::tri::TriMesh< std::vector<CVertex>, std::vector<CFace> > {};
 
 #endif
diff --git a/apps/metro/metro.cpp b/apps/metro/metro.cpp
index bfb46456..105ffec6 100644
--- a/apps/metro/metro.cpp
+++ b/apps/metro/metro.cpp
@@ -24,6 +24,11 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.13  2005/01/24 15:46:48  cignoni
+Release 4.04
+Moved to the library core the code for computing min distance froma a point to a mesh using a uniform grid.
+Slightly faster.
+
 Revision 1.12  2005/01/03 11:28:52  cignoni
 Release 4.03
 Better ply compatibility, and improved error reporting
@@ -75,6 +80,8 @@ GPL  added
 
 
 // -----------------------------------------------------------------------------------------------
+using namespace std;
+using namespace vcg;
 
 
 ////////////////// Command line Flags and parameters 
@@ -111,10 +118,10 @@ void Usage()
 
 
 // simple aux function that compute the name for the file containing the stored computations
-string SaveFileName(const string &filename)
+std::string SaveFileName(const std::string &filename)
 {
  int pos=filename.find_last_of('.',filename.length());
- string fileout=filename.substr(0,pos)+"_metro.ply";
+ std::string fileout=filename.substr(0,pos)+"_metro.ply";
  return fileout;
 }
 
diff --git a/apps/metro/readme.txt b/apps/metro/readme.txt
index 0a4a5fcf..16f566bc 100644
--- a/apps/metro/readme.txt
+++ b/apps/metro/readme.txt
@@ -6,7 +6,7 @@
    Visual Computing Lab  http://vcg.isti.cnr.it                    /\/|      
    ISTI - Italian National Research Council                           |      
                                                                       \      
-   Metro 4.04 24/01/2005
+   Metro 4.04 25/01/2005
    All rights reserved.                                                      
    
 
diff --git a/apps/metro/sampling.h b/apps/metro/sampling.h
index 659da64f..498647e4 100644
--- a/apps/metro/sampling.h
+++ b/apps/metro/sampling.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.14  2005/01/24 15:37:14  cignoni
+updated from MinDistPoint to Closest (and removed some warnings)
+
 Revision 1.13  2004/09/20 16:17:46  ponchio
 Floating except fixed (happened on meshes with less than 100 faces :P)
 
@@ -69,7 +72,8 @@ instantiate GridStaticPtr on the simplexClass template.
 #include <vcg/simplex/face/distance.h>
 #include <vcg/complex/trimesh/update/color.h>
 #include <vcg/space/index/grid_static_ptr.h>
-using namespace vcg;
+namespace vcg
+{
 
 struct SamplingFlags{	
 			 enum{
@@ -615,5 +619,5 @@ void Sampling<MetroMesh>::Hausdorff()
     mean_dist /= n_total_samples;
     RMS_dist   = sqrt(RMS_dist / n_total_samples);
 }
-
+}
 #endif