Java - change contains() in Rect and RectI to properly handle empty rects.

2 files changed, 22 insertions, 6 deletions

diff --git a/platform/java/src/com/artifex/mupdf/fitz/Rect.java b/platform/java/src/com/artifex/mupdf/fitz/Rect.java
index 3b8983a9..f35c290e 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/Rect.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Rect.java
@@ -91,18 +91,18 @@ public class Rect
 
 	public boolean contains(float x, float y)
 	{
-		if (x >= x0 && x < x1 && y >= y0 && y < y1)
-			return true;
+		if (isEmpty())
+			return false;
 
-		return false;
+		return (x >= x0 && x < x1 && y >= y0 && y < y1);
 	}
 
 	public boolean contains(Rect r)
 	{
-		if (r.x0 >= x0 && r.x1 < x1 && r.y0 >= y0 && r.y1 < y1)
-			return true;
+		if (isEmpty() || r.isEmpty())
+			return false;
 
-		return false;
+		return (r.x0 >= x0 && r.x1 <= x1 && r.y0 >= y0 && r.y1 <= y1);
 	}
 
 	public boolean isEmpty()
diff --git a/platform/java/src/com/artifex/mupdf/fitz/RectI.java b/platform/java/src/com/artifex/mupdf/fitz/RectI.java
index 2d5e8f70..7cc9d98e 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/RectI.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/RectI.java
@@ -83,6 +83,22 @@ public class RectI
 		return this;
 	}
 
+	public boolean contains(int x, int y)
+	{
+		if (isEmpty())
+			return false;
+
+		return (x >= x0 && x < x1 && y >= y0 && y < y1);
+	}
+
+	public boolean contains(Rect r)
+	{
+		if (isEmpty() || r.isEmpty())
+			return false;
+
+		return (r.x0 >= x0 && r.x1 <= x1 && r.y0 >= y0 && r.y1 <= y1);
+	}
+
 	public boolean isEmpty()
 	{
 		return (x0 == x1 || y0 == y1);