manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changes needed for compilation on linux 64b with gcc 3.4.5

This commit is contained in:
Paolo Cignoni 2006-04-11 09:48:04 +00:00
parent 53dfb84a07
commit 2754d4697d
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wrap/io_trimesh/import_obj.h
View File

@ -25,6 +25,9 @@
History
$Log: not supported by cvs2svn $
Revision 1.4 2006/03/29 09:27:07 cignoni
Added managemnt of non critical errors
Revision 1.3 2006/03/29 08:51:16 corsini
reset to zero warnings
@ -693,12 +696,13 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
(*fi).C()[3] = faceColor[3];
}
/*
// A face polygon composed of more than three vertices is triangulated
// according to the following schema:
// v5
// / \
// / \
// / \
// / \
// / \
// / \
// v1------v4
// |\ /
// | \ /
@ -709,7 +713,7 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
// has been split into the triangles (v1,v2,v3), (v1,v3,v4) e (v1,v4,v5).
// This way vertex v1 becomes the common vertex of all newly generated
// triangles, and this may lead to the creation of very thin triangles.
*/
++fi;
++numTriangles;
@ -1176,4 +1180,4 @@ static bool LoadMask(const char * filename, int &mask)
} // end Namespace io
} // end Namespace vcg
#endif // ndef __VCGLIB_IMPORT_OBJ
#endif // ndef __VCGLIB_IMPORT_OBJ

19
wrap/ply/plystuff.h
View File

@ -31,6 +31,9 @@ of Greg Turk and on the work of Claudio Rocchini
History
$Log: not supported by cvs2svn $
Revision 1.4 2005/12/02 00:00:53 cignoni
Moved and corrected interpret_texture_name from plystuff.h to plylib.cpp
Revision 1.3 2005/03/18 00:14:40 cignoni
removed small gcc compiling issues
@ -48,7 +51,9 @@ Cleaning of the automatic bbox caching support for ply files. First working vers
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#ifdef WIN32
#include <io.h>
#endif
#include <vcg/space/box3.h>
#include <wrap/ply/plylib.h>
@ -69,6 +74,8 @@ using namespace vcg;
#define pb_fstat fstat
#define pb_open open
#define pb_close close
#define _O_BINARY 0 // Does not exist on Unix
#define _O_RDONLY O_RDONLY
#endif
@ -256,9 +263,9 @@ bool ScanBBox( const char * fname, Box3d & box, bool use_cache=true )
static const PropDescriptor pv[3]=
{
{"vertex","x",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,x),0,0,0,0,0},
{"vertex","y",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,y),0,0,0,0,0},
{"vertex","z",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,z),0,0,0,0,0},
{"vertex","x",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,x),0,0,0,0,0 ,0}, // TO GET RID OF COMPILER WARNING I ADDED 0 TO INITIALIZE format (MV)
{"vertex","y",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,y),0,0,0,0,0 ,0}, // TO GET RID OF COMPILER WARNING I ADDED 0 TO INITIALIZE format (MV)
{"vertex","z",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,z),0,0,0,0,0, 0},// TO GET RID OF COMPILER WARNING I ADDED 0 TO INITIALIZE format (MV)
};
@ -321,9 +328,9 @@ bool ScanBBox( const char * fname, Box3d & box, const Matrix44d & m, bool use_ca
static const PropDescriptor pv[3]=
{
{"vertex","x",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,x),0,0,0,0,0},
{"vertex","y",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,y),0,0,0,0,0},
{"vertex","z",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,z),0,0,0,0,0},
{"vertex","x",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,x),0,0,0,0,0, 0},// TO GET RID OF COMPILER WARNING I ADDED 0 TO INITIALIZE format (MV)
{"vertex","y",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,y),0,0,0,0,0, 0},// TO GET RID OF COMPILER WARNING I ADDED 0 TO INITIALIZE format (MV)
{"vertex","z",T_FLOAT,T_DOUBLE,offsetof(PlyPoint3d,z),0,0,0,0,0, 0},// TO GET RID OF COMPILER WARNING I ADDED 0 TO INITIALIZE format (MV)
};