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

Fix in convolution condition

This commit is contained in:
Ophir Setter 2007-04-18 15:35:01 +00:00
parent 678d5c60c0
commit b59e477ff4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_conv_2.h
View File

@ -266,11 +266,15 @@ public:
else
--next1;
if (used_labels.count (Convolution_label (k1, k2, 1)) == 0 &&
(f_ccw_in_between (dirs1[k1],
dirs2[(n2 + k2 - 1) % n2],
dirs2[k2]) ||
f_equal (dirs1[k1], dirs2[k2])))
if ((used_labels.count (Convolution_label (k1, k2, 1)) == 0 &&
(f_ccw_in_between (dirs1[k1],
dirs2[(n2 + k2 - 1) % n2],
dirs2[k2]) ||
f_equal (dirs1[k1], dirs2[k2]))) ||
(used_labels.count (Convolution_label (k1, k2, 2)) == 0 &&
f_ccw_in_between (dirs2[k2],
dirs1[(n1 + k1 - 1) % n1],
dirs1[k1])))
{
// Construct the current convolution cycle.
queue.clear();