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

prevented cast/unused/uninitialized warnings and some indentation work.

This commit is contained in:
Marco Di Benedetto 2009-12-01 17:37:45 +00:00
parent 939da657a9
commit 08f9b6a4b3
3 changed files with 692 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wrap/io_trimesh/import_dae.h
View File

@ -691,6 +691,8 @@ static Matrix44f getTransfMatrixFromNode(const QDomElement parentNode)
static int Open(OpenMeshType& m,const char* filename, InfoDAE& info, CallBackPos *cb=0) static int Open(OpenMeshType& m,const char* filename, InfoDAE& info, CallBackPos *cb=0)
{ {
(void)cb;
QDEBUG("----- Starting the processing of %s ------",filename); QDEBUG("----- Starting the processing of %s ------",filename);
//AdditionalInfoDAE& inf = new AdditionalInfoDAE(); //AdditionalInfoDAE& inf = new AdditionalInfoDAE();
//info = new InfoDAE(); //info = new InfoDAE();

4
wrap/io_trimesh/import_obj.h
View File

@ -916,7 +916,7 @@ static bool LoadMask(const char * filename, int &mask)
materials.clear(); materials.clear();
Material currentMaterial; Material currentMaterial;
currentMaterial.index = -1; currentMaterial.index = (unsigned int)(-1);
bool first = true; bool first = true;
while (!stream.eof()) while (!stream.eof())
@ -935,7 +935,7 @@ static bool LoadMask(const char * filename, int &mask)
{ {
materials.push_back(currentMaterial); materials.push_back(currentMaterial);
currentMaterial = Material(); currentMaterial = Material();
currentMaterial.index = -1; currentMaterial.index = (unsigned int)(-1);
} }
else else
first = false; first = false;

2
wrap/io_trimesh/import_vmi.h
View File

@ -638,7 +638,7 @@ namespace io {
if(fnameV != nameV) return VMI_INCOMPATIBLE_VERTEX_TYPE; if(fnameV != nameV) return VMI_INCOMPATIBLE_VERTEX_TYPE;
if(fnameF != nameF) return VMI_INCOMPATIBLE_FACE_TYPE; if(fnameF != nameF) return VMI_INCOMPATIBLE_FACE_TYPE;
int offsetV,offsetF; int offsetV=0,offsetF=0;
if(vertSize!=0) if(vertSize!=0)
/* read the address of the first vertex */ /* read the address of the first vertex */