diff options
| -rw-r--r-- | platform/android/viewer/jni/mupdf.c | 15 | ||||
| -rw-r--r-- | platform/java/mupdf_native.c | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/platform/android/viewer/jni/mupdf.c b/platform/android/viewer/jni/mupdf.c index 451671c7..b70d3f1a 100644 --- a/platform/android/viewer/jni/mupdf.c +++ b/platform/android/viewer/jni/mupdf.c @@ -372,7 +372,7 @@ typedef struct buffer_state_s } buffer_state; -static int bufferStreamNext(fz_context *ctx, fz_stream *stream, int max) +static int bufferStreamNext(fz_context *ctx, fz_stream *stream, size_t max) { buffer_state *bs = (buffer_state *)stream->state; globals *glo = bs->globals; @@ -396,6 +396,7 @@ static int bufferStreamNext(fz_context *ctx, fz_stream *stream, int max) stream->pos += len; if (len == 0) return EOF; + return *stream->rp++; } @@ -754,7 +755,7 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap, if (pc->page_list == NULL) { /* Render to list */ - pc->page_list = fz_new_display_list(ctx); + pc->page_list = fz_new_display_list(ctx, NULL); dev = fz_new_list_device(ctx, pc->page_list); fz_run_page_contents(ctx, pc->page, dev, &fz_identity, cookie); fz_drop_device(ctx, dev); @@ -769,7 +770,7 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap, if (pc->annot_list == NULL) { fz_annot *annot; - pc->annot_list = fz_new_display_list(ctx); + pc->annot_list = fz_new_display_list(ctx, NULL); dev = fz_new_list_device(ctx, pc->annot_list); for (annot = fz_first_annot(ctx, pc->page); annot; annot = fz_next_annot(ctx, annot)) fz_run_annot(ctx, annot, dev, &fz_identity, cookie); @@ -809,7 +810,7 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap, fz_concat(&ctm, &ctm, fz_scale(&scale, xscale, yscale)); rect = pc->media_box; fz_transform_rect(&rect, &ctm); - dev = fz_new_draw_device(ctx, pix); + dev = fz_new_draw_device(ctx, NULL, pix); #ifdef TIME_DISPLAY_LIST { clock_t time; @@ -953,7 +954,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap, if (pc->page_list == NULL) { /* Render to list */ - pc->page_list = fz_new_display_list(ctx); + pc->page_list = fz_new_display_list(ctx, NULL); dev = fz_new_list_device(ctx, pc->page_list); fz_run_page_contents(ctx, pc->page, dev, &fz_identity, cookie); fz_drop_device(ctx, dev); @@ -967,7 +968,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap, } if (pc->annot_list == NULL) { - pc->annot_list = fz_new_display_list(ctx); + pc->annot_list = fz_new_display_list(ctx, NULL); dev = fz_new_list_device(ctx, pc->annot_list); for (annot = fz_first_annot(ctx, pc->page); annot; annot = fz_next_annot(ctx, annot)) fz_run_annot(ctx, annot, dev, &fz_identity, cookie); @@ -1016,7 +1017,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap, { LOGI("And it isn't empty"); fz_clear_pixmap_rect_with_value(ctx, pix, 0xff, &abox); - dev = fz_new_draw_device_with_bbox(ctx, pix, &abox); + dev = fz_new_draw_device_with_bbox(ctx, NULL, pix, &abox); if (pc->page_list) fz_run_display_list(ctx, pc->page_list, dev, &ctm, &arect, cookie); if (cookie != NULL && cookie->abort) diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 67465db8..0528a2fb 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -1917,7 +1917,7 @@ FUN(DrawDevice_newNative)(JNIEnv *env, jclass self, jobject pixmap_) return 0; fz_try(ctx) - device = fz_new_draw_device(ctx, pixmap); + device = fz_new_draw_device(ctx, NULL, pixmap); fz_catch(ctx) jni_rethrow(env, ctx); @@ -1991,7 +1991,7 @@ newNativeAndroidDrawDevice(JNIEnv *env, jobject self, fz_context *ctx, jobject o * match the pixels data */ pixbbox = clip; pixbbox.x1 = pixbbox.x0 + width; - pixmap = fz_new_pixmap_with_bbox_and_data(ctx, fz_device_rgb(ctx), &pixbbox, &dummy); + pixmap = fz_new_pixmap_with_bbox_and_data(ctx, fz_device_rgb(ctx), &pixbbox, 1, &dummy); ninfo = fz_malloc(ctx, sizeof(*ninfo)); ninfo->pixmap = pixmap; ninfo->lock = lock; @@ -2005,7 +2005,7 @@ newNativeAndroidDrawDevice(JNIEnv *env, jobject self, fz_context *ctx, jobject o lockNativeDevice(env,self); fz_clear_pixmap_rect_with_value(ctx, pixmap, 0xff, &clip); unlockNativeDevice(env,ninfo); - device = fz_new_draw_device_with_bbox(ctx, pixmap, &clip); + device = fz_new_draw_device_with_bbox(ctx, NULL, pixmap, &clip); } fz_catch(ctx) { @@ -3659,7 +3659,7 @@ FUN(DisplayList_newNative)(JNIEnv *env, jobject self) return 0; fz_try(ctx) - list = fz_new_display_list(ctx); + list = fz_new_display_list(ctx, NULL); fz_catch(ctx) jni_rethrow(env, ctx); |