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

updated code in order to improve compatibility with g++ compiler.

This commit is contained in:
granzuglia 2010-04-29 10:39:07 +00:00
parent 904f0d9d3a
commit 43592cc07e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/complex/trimesh/create/advancing_front.h
View File

@ -502,7 +502,7 @@ template <class MESH> class AdvancingTest: public AdvancingFront<MESH> {
return true; return true;
} }
int Place(FrontEdge &e, ResultIterator &touch) int Place(FrontEdge &e, typename AdvancingFront<MESH>::ResultIterator &touch)
{ {
Point3f p[3]; Point3f p[3];
p[0] = this->mesh.vert[e.v0].P(); p[0] = this->mesh.vert[e.v0].P();
@ -521,7 +521,7 @@ template <class MESH> class AdvancingTest: public AdvancingFront<MESH> {
for(std::list<FrontEdge>::iterator k = this->front.begin(); k != this->front.end(); k++) for(std::list<FrontEdge>::iterator k = this->front.begin(); k != this->front.end(); k++)
if((*k).v0 == i) if((*k).v0 == i)
{ {
touch.first = FRONT; touch.first = AdvancingFront<MESH>::FRONT;
touch.second = k; touch.second = k;
} }
@ -529,7 +529,7 @@ template <class MESH> class AdvancingTest: public AdvancingFront<MESH> {
if((*k).v0 == i) if((*k).v0 == i)
if((*k).v0 == i) if((*k).v0 == i)
{ {
touch.first = DEADS; touch.first = AdvancingFront<MESH>::FRONT;
touch.second = k; touch.second = k;
} }
break; break;

6
vcg/complex/trimesh/create/ball_pivoting.h
View File

@ -200,7 +200,7 @@ template <class MESH> class BallPivoting: public AdvancingFront<MESH> {
} }
//select a new vertex, mark as Visited and mark as usedBit all neighbours (less than min_edge) //select a new vertex, mark as Visited and mark as usedBit all neighbours (less than min_edge)
int Place(FrontEdge &edge, ResultIterator &touch) { int Place(FrontEdge &edge,typename AdvancingFront<MESH>::ResultIterator &touch) {
Point3x v0 = this->mesh.vert[edge.v0].P(); Point3x v0 = this->mesh.vert[edge.v0].P();
Point3x v1 = this->mesh.vert[edge.v1].P(); Point3x v1 = this->mesh.vert[edge.v1].P();
Point3x v2 = this->mesh.vert[edge.v2].P(); Point3x v2 = this->mesh.vert[edge.v2].P();
@ -313,7 +313,7 @@ template <class MESH> class BallPivoting: public AdvancingFront<MESH> {
{ {
if((*k).v0 == id) if((*k).v0 == id)
{ {
touch.first = FRONT; touch.first = AdvancingFront<MESH>::FRONT;
touch.second = k; touch.second = k;
} }
} }
@ -321,7 +321,7 @@ template <class MESH> class BallPivoting: public AdvancingFront<MESH> {
{ {
if((*k).v0 == id) if((*k).v0 == id)
{ {
touch.first = DEADS; touch.first = AdvancingFront<MESH>::DEADS;
touch.second = k; touch.second = k;
} }
} }