From daa4c12b4606a7e44447bbaeca7b016cfaed60f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Thu, 20 Feb 2014 20:58:39 +0100 Subject: [PATCH] Revert bdcfb60a9a5257e77ae414c8533b6511e7116644 Since it broke the last example of BooleanOperations.html --- src/path/PathItem.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/path/PathItem.js b/src/path/PathItem.js index d3f8e00d..87f34e00 100644 --- a/src/path/PathItem.js +++ b/src/path/PathItem.js @@ -119,13 +119,16 @@ var PathItem = Item.extend(/** @lends PathItem# */{ // Check for intersections with other curves. For self intersection, // we can start at i + 1 instead of 0 for (var j = path ? 0 : i + 1; j < length2; j++) { + // Avoid end point intersections on consecutive curves whe self + // intersecting. + var excludeEnds = !path + && (j === i + 1 || j === length2 - 1 && i === 0); Curve.getIntersections(values1, values2[j], curve1, curves2[j], locations, // Avoid end point intersections on consecutive curves // when self intersecting. - !path && (j === i + 1 || j === length2 - 1 && i === 0) - ? ZERO : 0, // tMin - ONE); // tMax + excludeEnds ? ZERO : 0, // tMin + excludeEnds ? ONE : 1); // tMax } } // Now filter the locations and process _expand: