Use fz_quad type in structured text and selection/highlighting.

2 files changed, 77 insertions, 3 deletions

diff --git a/platform/java/src/com/artifex/mupdf/fitz/Quad.java b/platform/java/src/com/artifex/mupdf/fitz/Quad.java
new file mode 100644
index 00000000..6e69a7b1
--- /dev/null
+++ b/platform/java/src/com/artifex/mupdf/fitz/Quad.java
@@ -0,0 +1,74 @@
+package com.artifex.mupdf.fitz;
+
+public class Quad
+{
+	public float ul_x, ul_y;
+	public float ur_x, ur_y;
+	public float ll_x, ll_y;
+	public float lr_x, lr_y;
+
+	public Quad(float ul_x, float ul_y, float ur_x, float ur_y, float ll_x, float ll_y, float lr_x, float lr_y) {
+		this.ul_x = ul_x;
+		this.ul_y = ul_y;
+		this.ur_x = ur_x;
+		this.ur_y = ur_y;
+		this.ll_x = ll_x;
+		this.ll_y = ll_y;
+		this.lr_x = lr_x;
+		this.lr_y = lr_y;
+	}
+
+	public Rect toRect() {
+		float x0 = Math.min(Math.min(ul_x, ur_x), Math.min(ll_x, lr_x));
+		float y0 = Math.min(Math.min(ul_y, ur_y), Math.min(ll_y, lr_y));
+		float x1 = Math.max(Math.max(ul_x, ur_x), Math.max(ll_x, lr_x));
+		float y1 = Math.max(Math.max(ul_y, ur_y), Math.max(ll_y, lr_y));
+		return new Rect(x0, y0, x1, y1);
+	}
+
+	public Quad transformed(Matrix m) {
+		float t_ul_x = ul_x * m.a + ul_y * m.c + m.e;
+		float t_ul_y = ul_x * m.b + ul_y * m.d + m.f;
+		float t_ur_x = ur_x * m.a + ur_y * m.c + m.e;
+		float t_ur_y = ur_x * m.b + ur_y * m.d + m.f;
+		float t_ll_x = ll_x * m.a + ll_y * m.c + m.e;
+		float t_ll_y = ll_x * m.b + ll_y * m.d + m.f;
+		float t_lr_x = lr_x * m.a + lr_y * m.c + m.e;
+		float t_lr_y = lr_x * m.b + lr_y * m.d + m.f;
+		return new Quad(
+			t_ul_x, t_ul_y,
+			t_ur_x, t_ur_y,
+			t_ll_x, t_ll_y,
+			t_lr_x, t_lr_y
+		);
+	}
+
+	public Quad transform(Matrix m) {
+		float t_ul_x = ul_x * m.a + ul_y * m.c + m.e;
+		float t_ul_y = ul_x * m.b + ul_y * m.d + m.f;
+		float t_ur_x = ur_x * m.a + ur_y * m.c + m.e;
+		float t_ur_y = ur_x * m.b + ur_y * m.d + m.f;
+		float t_ll_x = ll_x * m.a + ll_y * m.c + m.e;
+		float t_ll_y = ll_x * m.b + ll_y * m.d + m.f;
+		float t_lr_x = lr_x * m.a + lr_y * m.c + m.e;
+		float t_lr_y = lr_x * m.b + lr_y * m.d + m.f;
+		ul_x = t_ul_x;
+		ul_y = t_ul_y;
+		ur_x = t_ur_x;
+		ur_y = t_ur_y;
+		ll_x = t_ll_x;
+		ll_y = t_ll_y;
+		lr_x = t_lr_x;
+		lr_y = t_lr_y;
+		return this;
+	}
+
+	public String toString() {
+		return "["
+			+ ul_x + " " + ul_y + " "
+			+ ur_x + " " + ur_y + " "
+			+ ll_x + " " + ll_y + " "
+			+ lr_x + " " + lr_y
+			+ "]";
+	}
+}
diff --git a/platform/java/src/com/artifex/mupdf/fitz/StructuredText.java b/platform/java/src/com/artifex/mupdf/fitz/StructuredText.java
index 12ec5be3..82aa55ea 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/StructuredText.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/StructuredText.java
@@ -19,8 +19,8 @@ public class StructuredText
 		pointer = p;
 	}
 
-	public native Rect[] search(String needle);
-	public native Rect[] highlight(Point a, Point b);
+	public native Quad[] search(String needle);
+	public native Quad[] highlight(Point a, Point b);
 	public native String copy(Point a, Point b);
 
 	public native TextBlock[] getBlocks();
@@ -37,7 +37,7 @@ public class StructuredText
 
 	public class TextChar {
 		public int c;
-		public Rect bbox;
+		public Quad quad;
 		public boolean isWhitespace() {
 			return Character.isWhitespace(c);
 		}