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

small GCC compiling issues

This commit is contained in:
Paolo Cignoni 2006-04-20 08:30:27 +00:00
parent 4ae1cb2a64
commit c5f4a75533
3 changed files with 79 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/metro/metro.cpp
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.19 2006/03/27 04:17:07 cignoni
moved to generic export.h
Revision 1.18 2006/01/10 13:20:40 cignoni Revision 1.18 2006/01/10 13:20:40 cignoni
Changed ply::PlyMask to io::Mask Changed ply::PlyMask to io::Mask
@ -83,7 +86,7 @@ GPL added
// standard libraries // standard libraries
#include <time.h> #include <time.h>
using namespace std;
// project definitions. // project definitions.
#include "defs.h" #include "defs.h"
#include "sampling.h" #include "sampling.h"
@ -97,7 +100,7 @@ GPL added
// ----------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------
using namespace std;
using namespace vcg; using namespace vcg;

11
apps/metro/sampling.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.21 2006/01/22 10:05:43 cignoni
Corrected use of Area with the unambiguous DoubleArea
Revision 1.20 2005/11/12 06:44:29 cignoni Revision 1.20 2005/11/12 06:44:29 cignoni
Changed GetClosest -> GetClosestFace Changed GetClosest -> GetClosestFace
@ -608,14 +611,14 @@ void Sampling<MetroMesh>::Hausdorff()
{ {
Box3< ScalarType> bbox; Box3< ScalarType> bbox;
typedef typename std::vector<FaceType>::iterator FaceVecIterator;
// set grid meshes. // set grid meshes.
if(Flags & SamplingFlags::USE_HASH_GRID) if(Flags & SamplingFlags::USE_HASH_GRID)
hS2.Set<vector<FaceType>::iterator>(S2.face.begin(),S2.face.end()); hS2.Set(S2.face.begin(),S2.face.end());
if(Flags & SamplingFlags::USE_AABB_TREE) if(Flags & SamplingFlags::USE_AABB_TREE)
tS2.Set<vector<FaceType>::iterator>(S2.face.begin(),S2.face.end()); tS2.Set(S2.face.begin(),S2.face.end());
if(Flags & SamplingFlags::USE_STATIC_GRID) if(Flags & SamplingFlags::USE_STATIC_GRID)
gS2.Set<vector<FaceType>::iterator>(S2.face.begin(),S2.face.end()); gS2.Set(S2.face.begin(),S2.face.end());
// set bounding box // set bounding box
bbox = S2.bbox; bbox = S2.bbox;

7
vcg/space/index/spatial_hashing.h
View File

@ -24,6 +24,11 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.17 2006/01/23 21:26:57 ponchio
gcc compatibility (templates mostly)
bbox -> this->bbox
More consistent use of Box3x and such.
Revision 1.16 2006/01/23 15:26:31 ponchio Revision 1.16 2006/01/23 15:26:31 ponchio
P1 --> HASH_P1 P1 --> HASH_P1
Old definition was conflicting with functions in segment.h Old definition was conflicting with functions in segment.h
@ -355,7 +360,7 @@ namespace vcg{
{ {
IteHtable I; IteHtable I;
vcg::Point3i _c; vcg::Point3i _c;
PToIP(p,_c); this->PToIP(p,_c);
Grid(_c,first,last); Grid(_c,first,last);
} }