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

corrected minor compiling issues

This commit is contained in:
Nico Pietroni 2010-02-22 01:03:23 +00:00
parent de93d3d941
commit 98eba3ef33
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vcg/simplex/face/topology.h
View File

@ -157,10 +157,11 @@ bool FFCorrectness(FaceType & f, const int e)
template <class FaceType> template <class FaceType>
void FFDetachManifold(FaceType & f, const int e) void FFDetachManifold(FaceType & f, const int e)
{ {
assert(FFCorrectness(f,e)); assert(FFCorrectness<FaceType>(f,e));
assert(!IsBorder<FaceType>(f,e)); // Never try to detach a border edge! assert(!IsBorder<FaceType>(f,e)); // Never try to detach a border edge!
FaceType *ffp = f.FFp(e); FaceType *ffp = f.FFp(e);
int ffi=f.FFp(e); //int ffi=f.FFp(e);
int ffi=f.FFi(e);
f.FFp(e)=&f; f.FFp(e)=&f;
f.FFi(e)=e; f.FFi(e)=e;
@ -172,8 +173,8 @@ void FFDetachManifold(FaceType & f, const int e)
ffp->SetB(ffi); ffp->SetB(ffi);
ffp->ClearF(ffi); ffp->ClearF(ffi);
assert(FFCorrectness(f,e)); assert(FFCorrectness<FaceType>(f,e));
assert(FFCorrectness(ffp,ffi)); assert(FFCorrectness<FaceType>(*ffp,ffi));
} }
/** This function detach the face from the adjacent face via the edge e. /** This function detach the face from the adjacent face via the edge e.
@ -186,7 +187,7 @@ void FFDetachManifold(FaceType & f, const int e)
template <class FaceType> template <class FaceType>
void FFDetach(FaceType & f, const int e) void FFDetach(FaceType & f, const int e)
{ {
assert(FFCorrectness(f,e)); assert(FFCorrectness<FaceType>(f,e));
assert(!IsBorder<FaceType>(f,e)); // Never try to detach a border edge! assert(!IsBorder<FaceType>(f,e)); // Never try to detach a border edge!
int complexity; int complexity;
assert(complexity=ComplexSize(f,e)); assert(complexity=ComplexSize(f,e));
@ -224,8 +225,8 @@ void FFDetach(FaceType & f, const int e)
f.FFi(e) = e; f.FFi(e) = e;
assert(ComplexSize(f,e)==1); assert(ComplexSize(f,e)==1);
assert(FFCorrectness(*LastFace.f,LastFace.z)); assert(FFCorrectness<FaceType>(*LastFace.f,LastFace.z));
assert(FFCorrectness(f,e)); assert(FFCorrectness<FaceType>(f,e));
} }