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

Corrected porblem with Intersect_2

This commit is contained in:
Dror Atariah 2013-05-31 15:51:22 +02:00
parent c5aec87e8a
commit a4ae33e50b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
View File

@ -1033,7 +1033,8 @@ public:
if (i1 == INVALID_INDEX) return oi;
if (equal(max_vertex(cv1[i1]), min_vertex(cv2[i2]))) {
if ((i1 == n1-1) || (i1 == 0)){
if (((dir1 == SMALLER) && (i1 == n1-1)) ||
((dir1 == LARGER) && (i1 == 0))){
// cv1's right endpoint equals cv2's left endpoint
// Thus we can return this single(!) intersection point
std::pair<Point_2,Multiplicity> p(max_vertex(cv1[i1]), 0);
@ -1052,7 +1053,8 @@ public:
if (i2 == INVALID_INDEX) return oi;
if (equal(max_vertex(cv2[i2]), min_vertex(cv1[i1]))) {
if ((i2 == n2-1) || (i2 == 0)){
if (((dir2 == SMALLER) && (i2 == n2-1)) ||
((dir2 == LARGER) && (i2 == 0))){
// cv2's right endpoint equals cv1's left endpoint
// Thus we can return this single(!) intersection point
std::pair<Point_2,Multiplicity> p(max_vertex(cv2[i2]), 0);
@ -1061,7 +1063,6 @@ public:
}
dir2 == SMALLER ? ++i2 : --i2;
std::cout << "i2 = " << i2 << "\n";
left_res = EQUAL;
}
}