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

Fix a bug with overlapping identical segments with opposite directions (Ron's fix).

This commit is contained in:
Shai Hirsch 2001-12-19 10:46:42 +00:00
parent 9270077031
commit 2aeefa0bfd
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Packages/Arrangement/include/CGAL/Segment_circle_2.h
View File

@ -679,10 +679,30 @@ class Segment_circle_2
// If the two arcs are completely equal, return one of them as the
// overlapping arc.
bool same_or = (_conic.orientation() == arc._conic.orientation());
int orient1 = _conic.orientation();
int orient2 = arc._conic.orientation();
bool same_or = (orient1 == orient2);
bool identical = false;
if ((same_or && _source == arc._source && _target == arc._target) ||
(!same_or && _source == arc._target && _target == arc._source))
if (orient1 == 0)
{
// That mean both arcs are really segments, so they are identical
// if their endpoints are the same.
if ((_source == arc._source && _target == arc._target) ||
(_source == arc._target && _target == arc._source))
identical = true;
}
else
{
// If those are really curves of degree 2, than the points curves
// are identical only if their source and target are the same and the
// orientation is the same, or vice-versa if the orientation is opposite.
if ((same_or && _source == arc._source && _target == arc._target) ||
(!same_or && _source == arc._target && _target == arc._source))
identical = true;
}
if (identical)
{
ovlp_arcs[0] = arc;
return (1);
@ -704,8 +724,6 @@ class Segment_circle_2
// and target.
const Point *arc_sourceP;
const Point *arc_targetP;
int orient1 = _conic.orientation();
int orient2 = arc._conic.orientation();
if (orient1 == 0)
orient1 = (compare_lexicographically_xy (_source, _target)