diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-06-16 16:34:17 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-06-17 14:53:21 +0200 |
| commit | 602cc73633568beec1afe7068bb3a1040b20bba0 (patch) | |
| tree | 84cb02e9c58af4e70e36b7a0878b0de1d49f6ec4 /source/tools | |
| parent | ccaf716d6c3f20731aaed277653cf3b1be4e218b (diff) | |
| download | mupdf-602cc73633568beec1afe7068bb3a1040b20bba0.tar.xz | |
Add mediabox argument to fz_new_display_list.
To return the proper size from fz_bound_display_list, which has been
broken since the begin_page device call was removed.
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/mudraw.c | 3 | ||||
| -rw-r--r-- | source/tools/murun.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index 20a6524d..ecdadc22 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -1100,6 +1100,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) int start; fz_cookie cookie = { 0 }; int first_page = !output_append; + fz_rect bounds; fz_var(list); fz_var(dev); @@ -1116,7 +1117,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) { fz_try(ctx) { - list = fz_new_display_list(ctx); + list = fz_new_display_list(ctx, fz_bound_page(ctx, page, &bounds)); dev = fz_new_list_device(ctx, list); if (lowmemory) fz_enable_device_hints(ctx, dev, FZ_NO_CACHE); diff --git a/source/tools/murun.c b/source/tools/murun.c index e9d66742..5315a4f3 100644 --- a/source/tools/murun.c +++ b/source/tools/murun.c @@ -2035,10 +2035,11 @@ static void ffi_Path_rect(js_State *J) static void ffi_new_DisplayList(js_State *J) { fz_context *ctx = js_getcontext(J); + fz_rect mediabox = js_iscoercible(J, 1) ? ffi_torect(J, 1) : fz_empty_rect; fz_display_list *list; fz_try(ctx) - list = fz_new_display_list(ctx); + list = fz_new_display_list(ctx, &mediabox); fz_catch(ctx) rethrow(J); @@ -3322,7 +3323,7 @@ int murun_main(int argc, char **argv) jsB_propcon(J, "fz_font", "Font", ffi_new_Font, 2); jsB_propcon(J, "fz_text", "Text", ffi_new_Text, 0); jsB_propcon(J, "fz_path", "Path", ffi_new_Path, 0); - jsB_propcon(J, "fz_display_list", "DisplayList", ffi_new_DisplayList, 0); + jsB_propcon(J, "fz_display_list", "DisplayList", ffi_new_DisplayList, 1); jsB_propcon(J, "fz_device", "DrawDevice", ffi_new_DrawDevice, 2); jsB_propcon(J, "fz_device", "DisplayListDevice", ffi_new_DisplayListDevice, 1); jsB_propcon(J, "fz_document_writer", "DocumentWriter", ffi_new_DocumentWriter, 3); |