1.0.6 requested changes

Author: frq-asgard-shared

src/main/java/clipper2/Clipper.java

@@ -13,7 +13,6 @@
 import clipper2.core.Rect64;
 import clipper2.core.RectD;
 import clipper2.engine.Clipper64;
-import clipper2.engine.ClipperBase;
 import clipper2.engine.ClipperD;
 import clipper2.engine.PointInPolygonResult;
 import clipper2.engine.PolyPath64;
@@ -37,7 +36,7 @@ public final class Clipper {
 	public static final Rect64 MaxInvalidRect64 = new Rect64(Long.MAX_VALUE, Long.MAX_VALUE, Long.MIN_VALUE, Long.MIN_VALUE);
 
 	public static final RectD MaxInvalidRectD = new RectD(Double.MAX_VALUE, Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE);
-	public static final String PRECISION_RANGE_ERROR = "Error: Precision is out of range.";
+	private static final String PRECISION_RANGE_ERROR = "Error: Precision is out of range.";
 
 	public static Paths64 Intersect(Paths64 subject, Paths64 clip, FillRule fillRule) {
 		return BooleanOp(ClipType.Intersection, subject, clip, fillRule);
@@ -211,7 +210,7 @@ public static Paths64 RectClip(Rect64 rect, Paths64 paths)
 		Paths64 result = new Paths64(paths.size());
 		RectClip rc = new RectClip(rect);
 		for (Path64 path : paths) {
-			Rect64 pathRec = ClipperBase.GetBounds(path);
+			Rect64 pathRec = GetBounds(path);
 			if (!rect.Intersects(pathRec))
 				continue;
 			else if (rect.Contains(pathRec))
@@ -257,7 +256,7 @@ public static PathsD RectClip(RectD rect, PathsD paths, int precision)
 		RectClip rc = new RectClip(r);
 		PathsD result = new PathsD(paths.size());
 		for (PathD p : paths) {
-			RectD pathRec = ClipperBase.GetBounds(p);
+			RectD pathRec = GetBounds(p);
 			if (!rect.Intersects(pathRec))
 				continue;
 			else if (rect.Contains(pathRec))
@@ -285,7 +284,7 @@ public static Paths64 RectClipLines(Rect64 rect, Paths64 paths)
 		if (rect.IsEmpty() || paths.size() == 0) return result;
 		RectClipLines rco = new RectClipLines(rect);
 		for (Path64 path : paths) {
-			Rect64 pathRec = ClipperBase.GetBounds(path);
+			Rect64 pathRec = GetBounds(path);
 			if (!rect.Intersects(pathRec))
 				continue;
 			else if (rect.Contains(pathRec))
@@ -331,7 +330,7 @@ public static PathsD RectClipLines(RectD rect, PathsD paths, int precision)
 		Rect64 r = ScaleRect(rect, scale);
 		RectClipLines rco = new RectClipLines(r);
 		for (PathD p : paths) {
-			RectD pathRec = ClipperBase.GetBounds(p);
+			RectD pathRec = GetBounds(p);
 			if (!rect.Intersects(pathRec))
 				continue;
 			else if (rect.Contains(pathRec))
@@ -705,6 +704,18 @@ public static Rect64 GetBounds(Path64 path)
 		return result.IsEmpty() ? new Rect64() : result;
 	}
 
+	public static RectD GetBounds(PathD path)
+	{
+		RectD result = MaxInvalidRectD;
+		for (PointD pt : path) {
+			if (pt.x < result.left) result.left = pt.x;
+			if (pt.x > result.right) result.right = pt.x;
+			if (pt.y < result.top) result.top = pt.y;
+			if (pt.y > result.bottom) result.bottom = pt.y;
+		}
+		return result.IsEmpty() ? new RectD() : result;
+	}
+
 	public static Rect64 GetBounds(Paths64 paths) {
 		Rect64 result = MaxInvalidRect64;
 		for (Path64 path : paths) {

src/main/java/clipper2/engine/ClipperBase.java

@@ -1,7 +1,5 @@
 package clipper2.engine;
 
-import static clipper2.Clipper.MaxInvalidRectD;
-
 import clipper2.Clipper;
 import clipper2.Nullable;
 import clipper2.core.ClipType;
@@ -30,7 +28,7 @@
  * calling Execute. And Execute can be called multiple times (ie with different
  * ClipTypes & FillRules) without having to reload these paths.
  */
-public abstract class ClipperBase {
+abstract class ClipperBase {
 
 	private ClipType cliptype;
 	private FillRule fillrule = FillRule.EvenOdd;
@@ -3162,18 +3160,6 @@ private boolean Path1InsidePath2(OutRec or1, OutRec or2) {
 		return result == PointInPolygonResult.IsInside;
 	}
 
-	public static RectD GetBounds(PathD path)
-	{
-		RectD result = MaxInvalidRectD;
-		for (PointD pt : path) {
-			if (pt.x < result.left) result.left = pt.x;
-			if (pt.x > result.right) result.right = pt.x;
-			if (pt.y < result.top) result.top = pt.y;
-			if (pt.y > result.bottom) result.bottom = pt.y;
-		}
-		return result.IsEmpty() ? new RectD() : result;
-	}
-
 	public static Rect64 GetBounds(Path64 path) {
 		if (path.isEmpty()) {
 			return new Rect64();

src/main/java/clipper2/rectclip/RectClip.java

@@ -1,12 +1,13 @@
 package clipper2.rectclip;
 
+import static clipper2.Clipper.GetBounds;
+
 import clipper2.Clipper;
 import clipper2.core.InternalClipper;
 import clipper2.core.Path64;
 import clipper2.core.Paths64;
 import clipper2.core.Point64;
 import clipper2.core.Rect64;
-import clipper2.engine.ClipperBase;
 import clipper2.engine.PointInPolygonResult;
 import tangible.OutObject;
 import tangible.RefObject;
@@ -19,8 +20,6 @@ protected enum Location {
 		left, top, right, bottom, inside
 	}
 
-	;
-
 	final protected Rect64 rect_;
 	final protected Point64 mp_;
 	final protected Path64 rectPath_;
@@ -393,7 +392,7 @@ public Path64 ExecuteInternal(Path64 path) {
 		if (firstCross_ == Location.inside) {
 			if (startingLoc == Location.inside)
 				return path;
-			Rect64 tmp_rect = ClipperBase.GetBounds(path);
+			Rect64 tmp_rect = GetBounds(path);
 			if (tmp_rect.Contains(rect_) &&
 					Path1ContainsPath2(path, rectPath_)
 							!= PointInPolygonResult.IsOutside)
@@ -444,7 +443,7 @@ else if (InternalClipper.CrossProduct(result.get(0), result.get(k - 1), result.g
 	private Paths64 ExecuteInternal(Paths64 paths) {
 		Paths64 result = new Paths64(paths.size());
 		for (Path64 path : paths) {
-			if (rect_.Intersects(ClipperBase.GetBounds(path)))
+			if (rect_.Intersects(GetBounds(path)))
 				result.add(ExecuteInternal(path));
 		}
 		return result;