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

Merge branch 'AOS-removal_optimisation-efifogel_sloriot' of github.com:CGAL/cgal-dev into AOS-removal_optimisation-efifogel_sloriot

This commit is contained in:
Efi Fogel 2015-09-26 14:52:55 +03:00
parent ecf346287c 9db6cc2465
commit 32cfa14f26
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h
View File

@ -1182,18 +1182,19 @@ protected:
if (h->is_flooding_on_inner_ccb())
{
CGAL_assertion(!inner_ccbs_to_remove.empty());
typename Aos_2::Dcel::Inner_ccb* inner_ccb = inner_ccbs_to_remove.back();
inner_ccbs_to_remove.pop_back();
typename Aos_2::Dcel::Inner_ccb* inner_ccb = inner_ccbs_to_remove.empty()?
arr->_dcel().new_inner_ccb():inner_ccbs_to_remove.back();
if ( !inner_ccbs_to_remove.empty() ) inner_ccbs_to_remove.pop_back();
Halfedge_handle hstart=h;
do{
get_base(h)->set_inner_ccb(inner_ccb);
h->set_new_ccb_assigned();
h=h->next();
}while(hstart!=h);
f->add_inner_ccb(inner_ccb,get_base(h));
inner_ccb->set_halfedge(get_base(h));
inner_ccb->set_face(get_base(f));
f->add_inner_ccb(inner_ccb,get_base(h));
}
else{
CGAL_assertion(!outer_ccbs_to_remove.empty());
@ -1205,9 +1206,9 @@ protected:
h->set_new_ccb_assigned();
h=h->next();
}while(hstart!=h);
f->add_outer_ccb(outer_ccb,get_base(h));
outer_ccb->set_halfedge(get_base(h));
outer_ccb->set_face(get_base(f));
f->add_outer_ccb(outer_ccb,get_base(h));
}
}
}