From ea7b7422894ac4f40f7d1fe6e6bf53b70512dd2e Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 14 Feb 2017 16:57:49 +0100 Subject: Fix patch drawing in AndroidDrawDevice. It can be simplified now that we support custom strides in pixmaps. --- .../artifex/mupdf/fitz/android/AndroidDrawDevice.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'platform/java/src') diff --git a/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java b/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java index b194a26c..e3afb637 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java +++ b/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java @@ -11,18 +11,19 @@ import com.artifex.mupdf.fitz.Matrix; public final class AndroidDrawDevice extends NativeDevice { - private native long newNative(Bitmap bitmap, int pageX0, int pageY0, int pageX1, int pageY1, int patchX0, int patchY0, int patchX1, int patchY1); + private native long newNative(Bitmap bitmap, int xOrigin, int yOrigin, int patchX0, int patchY0, int patchX1, int patchY1); - public AndroidDrawDevice(Bitmap bitmap, - int pageX0, int pageY0, int pageX1, int pageY1, - int patchX0, int patchY0, int patchX1, int patchY1) { + public AndroidDrawDevice (Bitmap bitmap, int xOrigin, int yOrigin, int patchX0, int patchY0, int patchX1, int patchY1) { super(0); - pointer = newNative(bitmap, pageX0, pageY0, pageX1, pageY1, patchX0, patchY0, patchX1, patchY1); + pointer = newNative(bitmap, xOrigin, yOrigin, patchX0, patchY0, patchX1, patchY1); } - public AndroidDrawDevice(Bitmap bitmap, RectI page, RectI patch) { - super(0); - pointer = newNative(bitmap, page.x0, page.y0, page.x1, page.y1, patch.x0, patch.y0, patch.x1, patch.y1); + public AndroidDrawDevice(Bitmap bitmap, int xOrigin, int yOrigin) { + this(bitmap, xOrigin, yOrigin, 0, 0, bitmap.getWidth(), bitmap.getHeight()); + } + + public AndroidDrawDevice(Bitmap bitmap) { + this(bitmap, 0, 0); } public static Bitmap drawPage(Page page, Matrix ctm) { @@ -31,7 +32,7 @@ public final class AndroidDrawDevice extends NativeDevice int w = ibox.x1 - ibox.x0; int h = ibox.y1 - ibox.y0; Bitmap bmp = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888); - AndroidDrawDevice dev = new AndroidDrawDevice(bmp, ibox, ibox); + AndroidDrawDevice dev = new AndroidDrawDevice(bmp, ibox.x0, ibox.y0); page.run(dev, ctm, null); dev.close(); dev.destroy(); -- cgit v1.2.3