Fix Page.search() to return a Quad[], not a Rect[].

Fix DisplayList.search() to return a Quad[], not a Rect[].
Add a Rect constructor that takes a Quad.
Modify the sample Java viewer accordingly.

This is necessary to (partially) fix SmartOffice bug #700031.

3 files changed, 10 insertions, 2 deletions

diff --git a/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java b/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
index 5b64583f..f44d5321 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
@@ -32,7 +32,7 @@ public class DisplayList
 		return toStructuredText(null);
 	}
 
-	public native Rect[] search(String needle);
+	public native Quad[] search(String needle);
 
 	public native void run(Device dev, Matrix ctm, Rect scissor, Cookie cookie);
 
diff --git a/platform/java/src/com/artifex/mupdf/fitz/Page.java b/platform/java/src/com/artifex/mupdf/fitz/Page.java
index d225914a..b9218683 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/Page.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Page.java
@@ -43,7 +43,7 @@ public class Page
 		return toStructuredText(null);
 	}
 
-	public native Rect[] search(String needle);
+	public native Quad[] search(String needle);
 
 	public native byte[] textAsHtml();
 
diff --git a/platform/java/src/com/artifex/mupdf/fitz/Rect.java b/platform/java/src/com/artifex/mupdf/fitz/Rect.java
index db137490..125df06c 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/Rect.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Rect.java
@@ -24,6 +24,14 @@ public class Rect
 		this.y1 = y1;
 	}
 
+	public Rect(Quad q)
+	{
+		this.x0 = q.ll_x;
+		this.y0 = q.ll_y;
+		this.x1 = q.ur_x;
+		this.y1 = q.ur_y;
+	}
+
 	public Rect(Rect r)
 	{
 		this(r.x0, r.y0, r.x1, r.y1);