From 40e7807c68ceca29d132d7da38b08837b3924214 Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Wed, 12 May 2004 10:19:30 +0000
Subject: [PATCH] new line added at the end of file

---
 wrap/callback.h              |  5 ++++-
 wrap/io_trimesh/export_ply.h |  5 ++++-
 wrap/io_trimesh/import_ply.h | 15 +++++++++------
 wrap/io_trimesh/io_mask.h    |  5 ++++-
 wrap/io_trimesh/io_ply.h     |  5 ++++-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/wrap/callback.h b/wrap/callback.h
index 595b925a..2cd916da 100644
--- a/wrap/callback.h
+++ b/wrap/callback.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.2  2004/05/10 14:26:33  ganovelli
+argument name removed to avoid "unreference variable"warning
+
 Revision 1.1  2004/03/03 15:00:51  cignoni
 Initial commit
 
@@ -46,4 +49,4 @@ inline bool DummyCallBackPos(const int ,  const char * ) {return true;}
 }	// End namespace
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/wrap/io_trimesh/export_ply.h b/wrap/io_trimesh/export_ply.h
index dcfc0076..b7570285 100644
--- a/wrap/io_trimesh/export_ply.h
+++ b/wrap/io_trimesh/export_ply.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.3  2004/03/18 15:30:46  cignoni
+Removed float/double warning
+
 Revision 1.2  2004/03/09 21:26:47  cignoni
 cr lf mismatch
 
@@ -587,4 +590,4 @@ static bool Save(SaveMeshType &m,  const char * filename, bool binary, PlyInfo &
 } // end namespace io
 } // end namespace vcg
 
-#endif
\ No newline at end of file
+#endif
diff --git a/wrap/io_trimesh/import_ply.h b/wrap/io_trimesh/import_ply.h
index 1a98558d..ecbe4904 100644
--- a/wrap/io_trimesh/import_ply.h
+++ b/wrap/io_trimesh/import_ply.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.4  2004/05/04 02:36:07  ganovelli
+#ifndef __VCGLIB_IMPORTERPLY added
+
 Revision 1.3  2004/04/03 13:30:01  cignoni
 missing include allocate.h
 
@@ -273,7 +276,7 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi )
 
 
 	// The main descriptor of the ply file 
-  vcg::ply::PlyFile pf;
+	vcg::ply::PlyFile pf;
   
   // Open the file and parse the header
   if( pf.Open(filename,vcg::ply::PlyFile::MODE_READ)==-1 )
@@ -693,8 +696,8 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi )
 	// Caricamento camera da un ply
 int LoadCamera(const char * filename)
 {
-	PlyFile pf;
-	if( pf.Open(filename,PlyFile::MODE_READ)==-1 )
+	vcg::ply::PlyFile pf;
+	if( pf.Open(filename,vcg::ply::PlyFile::MODE_READ)==-1 )
 	{
 		pi.status = pf.GetError();
 		return -1;
@@ -768,8 +771,8 @@ int LoadCamera(const char * filename)
 bool LoadMask(const char * filename, int &mask)
 {
 	mask=0;
-	PlyFile pf;
-	if( pf.Open(filename,PlyFile::MODE_READ)==-1 )
+	vcg::ply::PlyFile pf;
+	if( pf.Open(filename,vcg::ply::PlyFile::MODE_READ)==-1 )
 	{
 		pi.status = pf.GetError();
 		return false;
@@ -810,4 +813,4 @@ bool LoadMask(const char * filename, int &mask)
 } // end namespace io
 } // end namespace vcg
 
-#endif
\ No newline at end of file
+#endif
diff --git a/wrap/io_trimesh/io_mask.h b/wrap/io_trimesh/io_mask.h
index 5410197f..2a318244 100644
--- a/wrap/io_trimesh/io_mask.h
+++ b/wrap/io_trimesh/io_mask.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.2  2004/03/09 21:26:47  cignoni
+cr lf mismatch
+
 Revision 1.1  2004/03/03 15:00:51  cignoni
 Initial commit
 
@@ -108,4 +111,4 @@ static void SMFlags2String( int mask, char str[] )
 } // end namespace tri
 } // end namespace io
 } // end namespace vcg
-#endif
\ No newline at end of file
+#endif
diff --git a/wrap/io_trimesh/io_ply.h b/wrap/io_trimesh/io_ply.h
index 5017d8a0..e1d44a8c 100644
--- a/wrap/io_trimesh/io_ply.h
+++ b/wrap/io_trimesh/io_ply.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.2  2004/03/09 21:26:47  cignoni
+cr lf mismatch
+
 Revision 1.1  2004/03/08 09:21:34  cignoni
 Initial commit
 
@@ -104,4 +107,4 @@ enum Error
 } // end namespace tri
 } // end namespace io
 } // end namespace vcg
-#endif
\ No newline at end of file
+#endif