From b3252d15b3ad891227dd1dffc590509e8441b1ed Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Thu, 18 Mar 2004 15:30:57 +0000
Subject: [PATCH] Removed float/double warning

---
 wrap/io_trimesh/export_ply.h | 13 ++++++++-----
 wrap/io_trimesh/import_stl.h |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/wrap/io_trimesh/export_ply.h b/wrap/io_trimesh/export_ply.h
index bdf74838..dcfc0076 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.2  2004/03/09 21:26:47  cignoni
+cr lf mismatch
+
 Revision 1.1  2004/03/08 09:21:33  cignoni
 Initial commit
 
@@ -375,14 +378,14 @@ static bool Save(SaveMeshType &m,  const char * filename, bool binary, PlyInfo &
 
 				for(i=0;i<pi.vdn;i++)
 				{
-					float tf;
+					float tf; double td;
 					int ti;
 					switch (pi.VertexData[i].memtype1)
 					{
 					case ply::T_FLOAT	 :		tf=*( (float  *)        (((char *)vp)+pi.VertexData[i].offset1));	fprintf(fpout,"%g ",tf); break;
-					case ply::T_DOUBLE :    tf=*( (double *)        (((char *)vp)+pi.VertexData[i].offset1));	fprintf(fpout,"%g ",tf); break;
+					case ply::T_DOUBLE :    td=*( (double *)        (((char *)vp)+pi.VertexData[i].offset1));	fprintf(fpout,"%g ",tf); break;
 					case ply::T_INT		 :		ti=*( (int    *)        (((char *)vp)+pi.VertexData[i].offset1));	fprintf(fpout,"%i ",ti); break;
-					case ply::T_SHORT	 :		ti=*( (short  *)        (((char *)vp)+pi.VertexData[i].offset1));  fprintf(fpout,"%i ",ti); break;
+					case ply::T_SHORT	 :		ti=*( (short  *)        (((char *)vp)+pi.VertexData[i].offset1)); fprintf(fpout,"%i ",ti); break;
 					case ply::T_CHAR	 :		ti=*( (char   *)        (((char *)vp)+pi.VertexData[i].offset1));	fprintf(fpout,"%i ",ti); break;
 					case ply::T_UCHAR	 :		ti=*( (unsigned char *) (((char *)vp)+pi.VertexData[i].offset1));	fprintf(fpout,"%i ",ti); break;
 					default : assert(0);
@@ -545,12 +548,12 @@ static bool Save(SaveMeshType &m,  const char * filename, bool binary, PlyInfo &
 
 					for(i=0;i<pi.fdn;i++)
 					{
-						float tf;
+						float tf; double td;
 						int ti;
 						switch (pi.FaceData[i].memtype1)
 						{
 						case  ply::T_FLOAT	:		tf=*( (float  *)        (((char *)fp)+pi.FaceData[i].offset1));	fprintf(fpout,"%g ",tf); break;
-						case  ply::T_DOUBLE :		tf=*( (double *)        (((char *)fp)+pi.FaceData[i].offset1));	fprintf(fpout,"%g ",tf); break;
+						case  ply::T_DOUBLE :		td=*( (double *)        (((char *)fp)+pi.FaceData[i].offset1));	fprintf(fpout,"%g ",tf); break;
 						case  ply::T_INT		:		ti=*( (int    *)        (((char *)fp)+pi.FaceData[i].offset1));	fprintf(fpout,"%i ",ti); break;
 						case  ply::T_SHORT	:		ti=*( (short  *)        (((char *)fp)+pi.FaceData[i].offset1));	fprintf(fpout,"%i ",ti); break;
 						case  ply::T_CHAR		:		ti=*( (char   *)        (((char *)fp)+pi.FaceData[i].offset1));	fprintf(fpout,"%i ",ti); break;
diff --git a/wrap/io_trimesh/import_stl.h b/wrap/io_trimesh/import_stl.h
index a06ebb0f..96bc8892 100644
--- a/wrap/io_trimesh/import_stl.h
+++ b/wrap/io_trimesh/import_stl.h
@@ -25,6 +25,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.3  2004/03/12 21:42:52  cignoni
+First working version!
+
 ****************************************************************************/
 
 #ifndef __VCGLIB_IMPORT_STL
@@ -141,7 +144,6 @@ static int OpenBinary( OpenMeshType &m, const char * filename, CallBackPos *cb=0
   static int OpenAscii( OpenMeshType &m, const char * filename, CallBackPos *cb=0)
   {
     FILE *fp;
-    bool binary;
     fp = fopen(filename, "r");
     if(fp == NULL)
     {