songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*correct bad parenthesis replacement: && is evaluated before || 

*correct locate function (reported by a segfault in lookup on cgal-discuss)
This commit is contained in:
Sébastien Loriot 2010-08-25 09:09:01 +00:00
parent 89ceb05acc
commit 95ffb9dde3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Convex_hull_d/include/CGAL/Delaunay_d.h
View File

@ -212,9 +212,9 @@ public:
// I hope I got the logic right. // I hope I got the logic right.
// Note: I have add a new pair of parentheses. Laurent Rineau, 2010/08/20 // Note: I have add a new pair of parentheses. Laurent Rineau, 2010/08/20
while ( base() != DT->simplices_end() && while ( base() != DT->simplices_end() &&
!( ( ( cocirc && DT->is_bounded_simplex(base()) ) || !( ( cocirc && DT->is_bounded_simplex(base()) ) ||
( !cocirc && DT->is_unbounded_simplex(base()) ) ) ( ( !cocirc && DT->is_unbounded_simplex(base()) ) &&
&& DT->type_of(base()) == tf ) ) { DT->type_of(base()) == tf ) ) ) {
Base_iterator::operator++(); Base_iterator::operator++();
} }
} }
@ -232,9 +232,9 @@ public:
// I hope I got the logic right. // I hope I got the logic right.
// Note: I have add a new pair of parentheses. Laurent Rineau, 2010/08/20 // Note: I have add a new pair of parentheses. Laurent Rineau, 2010/08/20
} while ( base() != DT->simplices_end() && } while ( base() != DT->simplices_end() &&
!( ( ( cocirc && DT->is_bounded_simplex(base()) ) || !( ( cocirc && DT->is_bounded_simplex(base()) ) ||
( !cocirc && DT->is_unbounded_simplex(base()) ) ( ( !cocirc && DT->is_unbounded_simplex(base()) ) &&
) && DT->type_of(base()) == tf ) ); DT->type_of(base()) == tf ) ) );
return *this; return *this;
} }
Simplex_iterator operator++(int) Simplex_iterator operator++(int)
@ -832,10 +832,16 @@ locate(const Point_d& x) const
Simplex_handle f; Simplex_handle f;
this -> visibility_search(origin_simplex_,lp,candidates,dummy1,loc,f); this -> visibility_search(origin_simplex_,lp,candidates,dummy1,loc,f);
this -> clear_visited_marks(origin_simplex_); this -> clear_visited_marks(origin_simplex_);
if ( f != Simplex_handle() ) return f; //f and simplices in candidates are unbounded simplices only
typename std::list<Simplex_handle>::iterator it; if ( f != Simplex_handle() ){
for(it = candidates.begin(); it != candidates.end(); ++it) CGAL_precondition(is_unbounded_simplex(f));
if ( contains(*it,x) ) return *it; return opposite_simplex(f,0);
}
//SL: candidates contains only unbounded simplices, according
//to the documentation locate must return Simplex_handle()
//typename std::list<Simplex_handle>::iterator it;
//for(it = candidates.begin(); it != candidates.end(); ++it)
// if ( contains(*it,x) ) return *it;
return Simplex_handle(); return Simplex_handle();
} }