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

fixed compiler's errors

This commit is contained in:
granzuglia 2009-04-21 05:58:08 +00:00
parent 241d058c92
commit 17d5caeed1
4 changed files with 5 additions and 1 deletions

1
wrap/gl/pick.h
View File

@ -165,6 +165,7 @@ public:
} }
delete [] buffer; delete [] buffer;
return result.size();
} }
}; };

3
wrap/gl/picking.h
View File

@ -75,6 +75,7 @@ int Pick( const int & x, const int &y,
GLint viewport[4]; GLint viewport[4];
glGetIntegerv(GL_VIEWPORT,viewport); glGetIntegerv(GL_VIEWPORT,viewport);
glPushAttrib(GL_TRANSFORM_BIT);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glGetDoublev(GL_PROJECTION_MATRIX ,mp); glGetDoublev(GL_PROJECTION_MATRIX ,mp);
glPushMatrix(); glPushMatrix();
@ -114,7 +115,7 @@ int Pick( const int & x, const int &y,
std::advance(ei ,H[ii].second); std::advance(ei ,H[ii].second);
result[ii]=&*ei; result[ii]=&*ei;
} }
glPopAttrib();
delete [] selectBuf; delete [] selectBuf;
return int(result.size()); return int(result.size());
} }

1
wrap/io_trimesh/import_dae.h
View File

@ -271,6 +271,7 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector<ColladaVertex>, std
++fp; ++fp;
} }
assert(fp==m.face.end()); assert(fp==m.face.end());
return E_NOERROR;
} }
static DAEError OldLoadPolygonalListMesh(QDomNodeList& polylist,ColladaMesh& m,const size_t offset,InfoDAE* info) static DAEError OldLoadPolygonalListMesh(QDomNodeList& polylist,ColladaMesh& m,const size_t offset,InfoDAE* info)

1
wrap/io_trimesh/import_obj.h
View File

@ -92,6 +92,7 @@ Initial Working version coded by Buzzelli.
#include <vcg/complex/trimesh/allocate.h> #include <vcg/complex/trimesh/allocate.h>
#include <wrap/io_trimesh/io_mask.h> #include <wrap/io_trimesh/io_mask.h>
#include <wrap/io_trimesh/io_material.h> #include <wrap/io_trimesh/io_material.h>
#include <vcg/space/color4.h>
#include <fstream> #include <fstream>
#include <string> #include <string>