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

Add this-> for Ansi compliance (why not using??)

This commit is contained in:
Andreas Fabri 2010-05-07 12:48:44 +00:00
parent 972756d810
commit b6f7fc6b47
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
View File

@ -299,7 +299,7 @@ test_conflict(const Point &p, Face_handle fh) const
Oriented_side os = side_of_oriented_circle(fh,p,true); Oriented_side os = side_of_oriented_circle(fh,p,true);
if (os == ON_POSITIVE_SIDE) return true; if (os == ON_POSITIVE_SIDE) return true;
if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { if (os == ON_ORIENTED_BOUNDARY && this->is_infinite(fh)) {
int i = fh->index(this->infinite_vertex()); int i = fh->index(this->infinite_vertex());
return collinear_between(fh->vertex(cw(i))->point(), p, return collinear_between(fh->vertex(cw(i))->point(), p,
fh->vertex(ccw(i))->point() ); fh->vertex(ccw(i))->point() );
@ -337,7 +337,7 @@ is_valid(bool verbose, int level) const
for( Finite_faces_iterator it = this->finite_faces_begin(); for( Finite_faces_iterator it = this->finite_faces_begin();
it != this->finite_faces_end() ; it++) { it != this->finite_faces_end() ; it++) {
for(int i=0; i<3; i++) { for(int i=0; i<3; i++) {
if ( ! is_infinite( this->mirror_vertex(it,i))) { if ( ! this->is_infinite( this->mirror_vertex(it,i))) {
result = result && ON_POSITIVE_SIDE != result = result && ON_POSITIVE_SIDE !=
side_of_oriented_circle( it, this->mirror_vertex(it,i)->point(), false); side_of_oriented_circle( it, this->mirror_vertex(it,i)->point(), false);
} }
@ -377,12 +377,12 @@ nearest_vertex_2D(const Point& p, Face_handle f) const
typename Geom_traits::Compare_distance_2 typename Geom_traits::Compare_distance_2
compare_distance = this->geom_traits().compare_distance_2_object(); compare_distance = this->geom_traits().compare_distance_2_object();
Vertex_handle nn = !is_infinite(f->vertex(0)) ? f->vertex(0):f->vertex(1); Vertex_handle nn = !this->is_infinite(f->vertex(0)) ? f->vertex(0):f->vertex(1);
if ( !is_infinite(f->vertex(1)) && compare_distance(p, if ( !this->is_infinite(f->vertex(1)) && compare_distance(p,
f->vertex(1)->point(), f->vertex(1)->point(),
nn->point()) == SMALLER) nn->point()) == SMALLER)
nn=f->vertex(1); nn=f->vertex(1);
if ( !is_infinite(f->vertex(2)) && compare_distance(p, if ( !this->is_infinite(f->vertex(2)) && compare_distance(p,
f->vertex(2)->point(), f->vertex(2)->point(),
nn->point()) == SMALLER) nn->point()) == SMALLER)
nn=f->vertex(2); nn=f->vertex(2);
@ -425,7 +425,7 @@ look_nearest_neighbor(const Point& p,
typename Geom_traits::Compare_distance_2 typename Geom_traits::Compare_distance_2
compare_distance = this->geom_traits().compare_distance_2_object(); compare_distance = this->geom_traits().compare_distance_2_object();
i = ni->index(f); i = ni->index(f);
if ( !is_infinite(ni->vertex(i)) && if ( !this->is_infinite(ni->vertex(i)) &&
compare_distance(p, compare_distance(p,
ni->vertex(i)->point(), ni->vertex(i)->point(),
nn->point()) == SMALLER) nn=ni->vertex(i); nn->point()) == SMALLER) nn=ni->vertex(i);
@ -455,7 +455,7 @@ dual(const Edge &e) const
typedef typename Geom_traits::Line_2 Line; typedef typename Geom_traits::Line_2 Line;
typedef typename Geom_traits::Ray_2 Ray; typedef typename Geom_traits::Ray_2 Ray;
CGAL_triangulation_precondition (!is_infinite(e)); CGAL_triangulation_precondition (!this->is_infinite(e));
if( this->dimension()== 1 ){ if( this->dimension()== 1 ){
const Point& p = (e.first)->vertex(cw(e.second))->point(); const Point& p = (e.first)->vertex(cw(e.second))->point();
const Point& q = (e.first)->vertex(ccw(e.second))->point(); const Point& q = (e.first)->vertex(ccw(e.second))->point();
@ -464,15 +464,15 @@ dual(const Edge &e) const
} }
// dimension==2 // dimension==2
if( (!is_infinite(e.first)) && if( (!this->is_infinite(e.first)) &&
(!is_infinite(e.first->neighbor(e.second))) ) { (!this->is_infinite(e.first->neighbor(e.second))) ) {
Segment s = this->geom_traits().construct_segment_2_object() Segment s = this->geom_traits().construct_segment_2_object()
(dual(e.first),dual(e.first->neighbor(e.second))); (dual(e.first),dual(e.first->neighbor(e.second)));
return make_object(s); return make_object(s);
} }
// one of the adjacent faces is infinite // one of the adjacent faces is infinite
Face_handle f; int i; Face_handle f; int i;
if (is_infinite(e.first)) { if (this->is_infinite(e.first)) {
f=e.first->neighbor(e.second); i=f->index(e.first); f=e.first->neighbor(e.second); i=f->index(e.first);
} }
else { else {
@ -560,7 +560,7 @@ Delaunay_triangulation_2<Gt,Tds>::
remove(Vertex_handle v) remove(Vertex_handle v)
{ {
CGAL_triangulation_precondition( v != Vertex_handle()); CGAL_triangulation_precondition( v != Vertex_handle());
CGAL_triangulation_precondition( !is_infinite(v)); CGAL_triangulation_precondition( !this->is_infinite(v));
if ( this->dimension() <= 1) Triangulation::remove(v); if ( this->dimension() <= 1) Triangulation::remove(v);
else remove_2D(v); else remove_2D(v);