From 0abcccc4aab4d893ac2a0ef116ff1f0c006fbc30 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 6 Jul 2018 14:20:26 +0200 Subject: Rejig pdf_update_page and pdf_update_annot. The intent is for a user to iterate over the annotations on a page calling pdf_update_annot for each one. If this function returns true, then the annotation has changed since the last time it was called, and the user needs to re-render. pdf_update_page is a simple loop over the annotations on a page, for use if you only care about page level granularity. Users should no longer look at or change the pdf_annot.has_new_ap field. --- platform/gl/gl-main.c | 7 ---- platform/java/mupdf_native.c | 38 ++++++++++++++++++--- platform/java/mupdf_native.h | 16 +++++++++ .../src/com/artifex/mupdf/fitz/PDFAnnotation.java | 2 ++ .../java/src/com/artifex/mupdf/fitz/PDFPage.java | 2 ++ platform/x11/pdfapp.c | 39 ++++------------------ 6 files changed, 61 insertions(+), 43 deletions(-) (limited to 'platform') diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c index ed1591e4..5b5ae2b8 100644 --- a/platform/gl/gl-main.c +++ b/platform/gl/gl-main.c @@ -260,13 +260,6 @@ void render_page(void) fz_gamma_pixmap(ctx, pix, 1 / 1.4f); } - if (pdf) - { - pdf_annot *annot; - for (annot = page->annots; annot; annot = annot->next) - annot->has_new_ap = 0; - } - ui_texture_from_pixmap(&page_tex, pix); fz_drop_pixmap(ctx, pix); } diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 07331db4..1af5cb1f 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -8761,6 +8761,23 @@ FUN(PDFPage_deleteAnnotation)(JNIEnv *env, jobject self, jobject jannot) jni_rethrow(env, ctx); } +JNIEXPORT jboolean JNICALL +FUN(PDFPage_update)(JNIEnv *env, jobject self) +{ + fz_context *ctx = get_context(env); + pdf_page *page = from_PDFPage(env, self); + jboolean changed = 0; + + if (!ctx || !page) return 0; + + fz_try(ctx) + changed = pdf_update_page(ctx, page); + fz_catch(ctx) + jni_rethrow(env, ctx); + + return changed; +} + /* PDFAnnotation interface */ JNIEXPORT jint JNICALL @@ -9211,15 +9228,28 @@ FUN(PDFAnnotation_updateAppearance)(JNIEnv *env, jobject self) if (!ctx || !annot) return; fz_try(ctx) - { - pdf_dict_del(ctx, annot->obj, PDF_NAME(AP)); /* nuke old AP */ pdf_update_appearance(ctx, annot); - pdf_update_annot(ctx, annot); /* ensure new AP is put into annot */ - } fz_catch(ctx) jni_rethrow(env, ctx); } +JNIEXPORT jboolean JNICALL +FUN(PDFAnnotation_update)(JNIEnv *env, jobject self) +{ + fz_context *ctx = get_context(env); + pdf_annot *annot = from_PDFAnnotation(env, self); + jboolean changed = 0; + + if (!ctx || !annot) return 0; + + fz_try(ctx) + changed = pdf_update_annot(ctx, annot); + fz_catch(ctx) + jni_rethrow(env, ctx); + + return changed; +} + JNIEXPORT jobject JNICALL FUN(PDFAnnotation_getInkList)(JNIEnv *env, jobject self) { diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h index 37ea6ed2..07eac765 100644 --- a/platform/java/mupdf_native.h +++ b/platform/java/mupdf_native.h @@ -1689,6 +1689,14 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_PDFAnnotation_setIsOpen JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_PDFAnnotation_updateAppearance (JNIEnv *, jobject); +/* + * Class: com_artifex_mupdf_fitz_PDFAnnotation + * Method: update + * Signature: ()Z + */ +JNIEXPORT jboolean JNICALL Java_com_artifex_mupdf_fitz_PDFAnnotation_update + (JNIEnv *, jobject); + #ifdef __cplusplus } #endif @@ -2469,6 +2477,14 @@ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFPage_createAnnotation JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_PDFPage_deleteAnnotation (JNIEnv *, jobject, jobject); +/* + * Class: com_artifex_mupdf_fitz_PDFPage + * Method: update + * Signature: ()Z + */ +JNIEXPORT jboolean JNICALL Java_com_artifex_mupdf_fitz_PDFPage_update + (JNIEnv *, jobject); + #ifdef __cplusplus } #endif diff --git a/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java b/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java index 2e4a83cd..93c564b6 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java +++ b/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java @@ -92,4 +92,6 @@ public class PDFAnnotation extends Annotation public native void setIsOpen(boolean open); public native void updateAppearance(); + + public native boolean update(); } diff --git a/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java b/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java index ca63d54a..ac8c6688 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java +++ b/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java @@ -10,4 +10,6 @@ public class PDFPage extends Page public native PDFAnnotation createAnnotation(int subtype); public native void deleteAnnotation(Annotation annot); + + public native boolean update(); } diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c index 01011b2b..22fb7f1b 100644 --- a/platform/x11/pdfapp.c +++ b/platform/x11/pdfapp.c @@ -799,40 +799,15 @@ static void pdfapp_runpage(pdfapp_t *app, fz_device *dev, const fz_matrix ctm, f static void pdfapp_updatepage(pdfapp_t *app) { - fz_device *idev; - fz_matrix ctm; - pdf_annot *pannot; - - pdfapp_viewctm(&ctm, app); - pdf_update_page(app->ctx, (pdf_page *)app->page); - pdfapp_recreate_annotationslist(app); - - for (pannot = pdf_first_annot(app->ctx, (pdf_page*)app->page); pannot; pannot = pdf_next_annot(app->ctx, pannot)) + if (pdf_update_page(app->ctx, (pdf_page*)app->page)) { - if (pannot->has_new_ap) - { - fz_annot *annot = (fz_annot*)pannot; - fz_rect bounds; - fz_irect ibounds; - bounds = fz_transform_rect(fz_bound_annot(app->ctx, annot), ctm); - ibounds = fz_round_rect(bounds); - bounds = fz_rect_from_irect(ibounds); - fz_clear_pixmap_rect_with_value(app->ctx, app->image, 255, ibounds); - idev = fz_new_draw_device_with_bbox(app->ctx, fz_identity, app->image, &ibounds); - fz_try(app->ctx) - { - pdfapp_runpage(app, idev, ctm, bounds, NULL); - fz_close_device(app->ctx, idev); - } - fz_always(app->ctx) - fz_drop_device(app->ctx, idev); - fz_catch(app->ctx) - fz_rethrow(app->ctx); - pannot->has_new_ap = 0; - } + pdfapp_recreate_annotationslist(app); + pdfapp_showpage(app, 0, 1, 1, 0, 0); + } + else + { + pdfapp_showpage(app, 0, 0, 1, 0, 0); } - - pdfapp_showpage(app, 0, 0, 1, 0, 0); } void pdfapp_reloadpage(pdfapp_t *app) -- cgit v1.2.3