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

fix conditions

This commit is contained in:
Sébastien Loriot 2019-07-20 05:52:02 +02:00
parent adef5eb4c4
commit 338e03ef67
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Surface_sweep_2/include/CGAL/Surface_sweep_2/Default_event_base.h
View File

@ -172,7 +172,8 @@ public:
Subcurve_iterator iter = this->right_curves_begin(); Subcurve_iterator iter = this->right_curves_begin();
for (Subcurve_iterator end = this->right_curves_end(); iter!=end; ++iter) for (Subcurve_iterator end = this->right_curves_end(); iter!=end; ++iter)
{ {
if (*iter == curve) // TODO refine the condition
if ( (*iter)->is_leaf(curve) || curve->is_leaf(*iter) || curve->has_common_leaf(*iter) )
break; break;
} }
CGAL_assertion( iter!=this->right_curves_end() ); CGAL_assertion( iter!=this->right_curves_end() );

4
Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
View File

@ -712,7 +712,9 @@ template <typename Vis>
Point_2 left_end = this->m_traits->construct_min_vertex_2_object()(icv); Point_2 left_end = this->m_traits->construct_min_vertex_2_object()(icv);
// split the x-monotone curve at current event // split the x-monotone curve at current event
if ( this->m_queueEventLess(left_end, event_for_overlap) == SMALLER) // TODO handle unbounded curves?
// TODO: check event_for_overlap is still needed
if ( this->m_queueEventLess(left_end, event_for_overlap==NULL ? this->m_currentEvent : event_for_overlap) == SMALLER)
{ {
this->m_traits->split_2_object()(icv, this->m_traits->split_2_object()(icv,
event_for_overlap->point(), event_for_overlap->point(),