Hello to the zathura community! as the Subject: may suggests I have updated zathura-pdf-mupdf in order to be able to use the mupdf 1.9 API.
I have tested them for several days with mupdf-1.9a without noticing any problems. Please let me know if you find any issues! Ciao, L.
$NetBSD: patch-document.c,v 1.1 2016/02/14 14:01:49 leot Exp $ Update to mupdf-1.9 API --- document.c.orig 2016-02-14 22:49:46.000000000 +0000 +++ document.c @@ -109,12 +109,7 @@ pdf_document_save_as(zathura_document_t* } fz_try (mupdf_document->ctx) { - /* fz_write_document claims to accepts NULL as third argument but doesn't. - * pdf_write_document does not check if the third arguments is NULL for some - * options. */ - - fz_write_options opts = { 0 }; /* just use the default options */ - fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts); + pdf_save_document(mupdf_document->ctx, pdf_specifics(mupdf_document->ctx, mupdf_document->document), (char*) path, NULL); } fz_catch (mupdf_document->ctx) { return ZATHURA_ERROR_UNKNOWN; }
$NetBSD$ Update to mupdf-1.9 API. --- image.c.orig 2016-02-14 22:49:46.000000000 +0000 +++ image.c @@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t* fz_pixmap* pixmap = NULL; cairo_surface_t* surface = NULL; - pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0); + pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0); if (pixmap == NULL) { goto error_free; }
$NetBSD$ Update to mupdf-1.9 API. --- page.c.orig 2016-02-14 22:49:46.000000000 +0000 +++ page.c @@ -43,12 +43,12 @@ pdf_page_init(zathura_page_t* page) /* setup text */ mupdf_page->extracted_text = false; - mupdf_page->text = fz_new_text_page(mupdf_page->ctx); + mupdf_page->text = fz_new_stext_page(mupdf_page->ctx); if (mupdf_page->text == NULL) { goto error_free; } - mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx); + mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx); if (mupdf_page->sheet == NULL) { goto error_free; } @@ -74,11 +74,11 @@ pdf_page_clear(zathura_page_t* page, mup if (mupdf_page != NULL) { if (mupdf_page->text != NULL) { - fz_drop_text_page(mupdf_page->ctx, mupdf_page->text); + fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text); } if (mupdf_page->sheet != NULL) { - fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet); + fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet); } if (mupdf_page->page != NULL) {
$NetBSD$ Update to mupdf-1.9 API. --- plugin.h.orig 2016-02-14 22:49:46.000000000 +0000 +++ plugin.h @@ -21,8 +21,8 @@ typedef struct mupdf_page_s { fz_page* page; /**< Reference to the mupdf page */ fz_context* ctx; /**< Context */ - fz_text_sheet* sheet; /**< Text sheet */ - fz_text_page* text; /**< Page text */ + fz_stext_sheet* sheet; /**< Text sheet */ + fz_stext_page* text; /**< Page text */ fz_rect bbox; /**< Bbox */ bool extracted_text; /**< If text has already been extracted */ } mupdf_page_t;
$NetBSD$ Update to mupdf-1.9 API. --- search.c.orig 2016-02-14 22:49:46.000000000 +0000 +++ search.c @@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* pag } fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_rect)); - int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text, + int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, (char*) text, hit_bbox, N_SEARCH_RESULTS); for (int i = 0; i < num_results; i++) {
$NetBSD$ Update to mupdf-1.9 API. --- utils.c.orig 2016-02-14 22:49:46.000000000 +0000 +++ utils.c @@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t fz_device* text_device = NULL; fz_try (mupdf_page->ctx) { - text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text); + text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text); /* Disable FZ_IGNORE_IMAGE to collect image blocks */ fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);
_______________________________________________ zathura mailing list zathura@lists.pwmt.org https://lists.pwmt.org/mailman/listinfo/zathura