From 2ead16ca89c861d96d88b40a002105d932d0caa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Sun, 12 Feb 2017 15:47:01 +0100 Subject: [PATCH] Rename Curve.getCurvesIntersections() to Curve. getIntersections() --- src/path/Curve.js | 5 ++--- src/path/PathItem.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/path/Curve.js b/src/path/Curve.js index ba58cea5..195dc084 100644 --- a/src/path/Curve.js +++ b/src/path/Curve.js @@ -2090,7 +2090,7 @@ new function() { // Scope for bezier intersection using fat-line clipping return locations; } - function getCurvesIntersections(curves1, curves2, include, matrix1, matrix2, + function getIntersections(curves1, curves2, include, matrix1, matrix2, _returnFirst) { var self = !curves2; if (self) @@ -2258,10 +2258,9 @@ new function() { // Scope for bezier intersection using fat-line clipping }, statics: /** @lends Curve */{ - getCurveIntersections: getCurveIntersections, - getCurvesIntersections: getCurvesIntersections, getOverlaps: getOverlaps, // Exposed for use in boolean offsetting + getIntersections: getIntersections, getCurveLineIntersections: getCurveLineIntersections } }; diff --git a/src/path/PathItem.js b/src/path/PathItem.js index 33d1a126..b1909cd4 100644 --- a/src/path/PathItem.js +++ b/src/path/PathItem.js @@ -331,7 +331,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{ // First check the bounds of the two paths. If they don't intersect, // we don't need to iterate through their curves. return self || this.getBounds(matrix1).touches(path.getBounds(matrix2)) - ? Curve.getCurvesIntersections( + ? Curve.getIntersections( this.getCurves(), !self && path.getCurves(), include, matrix1, matrix2, _returnFirst) : [];