Changeset 33171 in osm for applications/editors/josm

Timestamp:

2017-02-27T12:30:17+01:00 (8 years ago)

Author:

upliner

Message:

splinex: limit depth in SplineHitTest

Location:

applications/editors/josm

Files:

• dist/splinex.jar (modified) ( previous)
• plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/SplineHitTest.java (modified) (2 diffs)

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/SplineHitTest.java

@@ -26 +26 @@
 
     public boolean checkCurve(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) {
+        return checkCurve(x1, y1, x2, y2, x3, y3, x4, y4, 32);
+    }
+    public boolean checkCurve(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, int depth) {
         if (Main.isDebugEnabled()) {
             Main.debug("checkCurve {0} {1} {2} {3} {4} {5} {6} {7}", x1, y1, x2, y2, x3, y3, x4, y4);
@@ -77 +80 @@
         if (checkPoint(x1234, y1234))
             return true;
-        return checkCurve(x1, y1, x12, y12, x123, y123, x1234, y1234)
-            || checkCurve(x1234, y1234, x234, y234, x34, y34, x4, y4);
+        if (depth <= 0)
+            return false;
+        return checkCurve(x1, y1, x12, y12, x123, y123, x1234, y1234, depth - 1)
+            || checkCurve(x1234, y1234, x234, y234, x34, y34, x4, y4, depth - 1);
     }
 }