From 35eda6f5a51c14973794f379144edc84ef233baa Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Thu, 6 Sep 2018 23:04:26 +0800 Subject: jni: Update NativeDevice to adhere to Device interface. --- platform/java/mupdf_native.c | 5 +++-- platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 06dfc30e..30592f11 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -3224,11 +3224,12 @@ FUN(NativeDevice_endMask)(JNIEnv *env, jobject self) } JNIEXPORT void JNICALL -FUN(NativeDevice_beginGroup)(JNIEnv *env, jobject self, jobject jrect, jboolean isolated, jboolean knockout, jint blendmode, jfloat alpha) +FUN(NativeDevice_beginGroup)(JNIEnv *env, jobject self, jobject jrect, jobject jcs, jboolean isolated, jboolean knockout, jint blendmode, jfloat alpha) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); fz_rect rect = from_Rect(env, jrect); + fz_colorspace *cs = from_ColorSpace(env, self); NativeDeviceInfo *info; int err; @@ -3238,7 +3239,7 @@ FUN(NativeDevice_beginGroup)(JNIEnv *env, jobject self, jobject jrect, jboolean if (err) return; fz_try(ctx) - fz_begin_group(ctx, dev, rect, NULL, isolated, knockout, blendmode, alpha); + fz_begin_group(ctx, dev, rect, cs, isolated, knockout, blendmode, alpha); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) diff --git a/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java index 820b7949..177bea05 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java +++ b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java @@ -44,7 +44,7 @@ public class NativeDevice extends Device public native final void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float bc[], int cp); public native final void endMask(); - public native final void beginGroup(Rect rect, boolean isolated, boolean knockout, int blendmode, float alpha); + public native final void beginGroup(Rect rect, ColorSpace cs, boolean isolated, boolean knockout, int blendmode, float alpha); public native final void endGroup(); public native final int beginTile(Rect area, Rect view, float xstep, float ystep, Matrix ctm, int id); -- cgit v1.2.3