diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-07-03 18:33:48 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-07-19 19:41:23 +0100 |
| commit | f957eae764e6dbc74401b66d6a18ba3290fdb982 (patch) | |
| tree | 224513a5080adde16386669feb0881aefe75794a /platform/java | |
| parent | 3d6cf4e4e543ce0d204db71ef8d0b9277219f250 (diff) | |
| download | mupdf-f957eae764e6dbc74401b66d6a18ba3290fdb982.tar.xz | |
Add spots to fz_pixmaps.
Update separations interface further to cope with whether spots
should be rendered separately, or as composite colors.
Diffstat (limited to 'platform/java')
| -rw-r--r-- | platform/java/mupdf_native.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 7d068d85..8adade90 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -2861,7 +2861,7 @@ newNativeAndroidDrawDevice(JNIEnv *env, jobject self, fz_context *ctx, jobject o fz_try(ctx) { - pixmap = fz_new_pixmap_with_bbox_and_data(ctx, fz_device_rgb(ctx), &bbox, 1, &dummy); + pixmap = fz_new_pixmap_with_bbox_and_data(ctx, fz_device_rgb(ctx), &bbox, NULL, 1, &dummy); pixmap->stride = width * sizeof(int32_t); ninfo = fz_malloc(ctx, sizeof(*ninfo)); ninfo->pixmap = pixmap; @@ -2973,7 +2973,7 @@ FUN(AndroidImage_newImageFromBitmap)(JNIEnv *env, jobject self, jobject jbitmap, fz_try(ctx) { - pixmap = fz_new_pixmap(ctx, fz_device_rgb(ctx), info.width, info.height, 1); + pixmap = fz_new_pixmap(ctx, fz_device_rgb(ctx), info.width, info.height, NULL, 1); if (AndroidBitmap_lockPixels(env, jbitmap, &pixels) != ANDROID_BITMAP_RESULT_SUCCESS) fz_throw(ctx, FZ_ERROR_GENERIC, "bitmap lock failed in new Image"); memcpy(pixmap->samples, pixels, info.width * info.height * 4); @@ -3170,7 +3170,7 @@ FUN(Pixmap_newNative)(JNIEnv *env, jobject self, jobject jcs, jint x, jint y, ji fz_try(ctx) { - pixmap = fz_new_pixmap(ctx, cs, w, h, alpha); + pixmap = fz_new_pixmap(ctx, cs, w, h, NULL, alpha); pixmap->x = x; pixmap->y = y; } @@ -4223,7 +4223,7 @@ FUN(Annotation_toPixmap)(JNIEnv *env, jobject self, jobject jctm, jobject jcs, j if (!ctx || !annot) return NULL; fz_try(ctx) - pixmap = fz_new_pixmap_from_annot(ctx, annot, &ctm, cs, alpha); + pixmap = fz_new_pixmap_from_annot(ctx, annot, &ctm, cs, NULL, alpha); fz_catch(ctx) { jni_rethrow(env, ctx); @@ -4774,7 +4774,7 @@ FUN(Page_toPixmap)(JNIEnv *env, jobject self, jobject jctm, jobject jcs, jboolea if (!ctx || !page) return NULL; fz_try(ctx) - pixmap = fz_new_pixmap_from_page(ctx, page, &ctm, cs, alpha); + pixmap = fz_new_pixmap_from_page(ctx, page, &ctm, cs, NULL, alpha); fz_catch(ctx) { jni_rethrow(env, ctx); @@ -5273,7 +5273,7 @@ FUN(DisplayList_toPixmap)(JNIEnv *env, jobject self, jobject jctm, jobject jcs, if (!ctx || !list) return NULL; fz_try(ctx) - pixmap = fz_new_pixmap_from_display_list(ctx, list, &ctm, cs, alpha); + pixmap = fz_new_pixmap_from_display_list(ctx, list, &ctm, cs, NULL, alpha); fz_catch(ctx) { jni_rethrow(env, ctx); |