diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-06-30 15:09:59 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-07-06 13:34:37 +0200 |
| commit | 74627fe0ccb279638f82472048311097b39741d5 (patch) | |
| tree | 94859ba3a1319bea0f02bee6d0b6795f7814d21a /source/tools | |
| parent | 944a6aff121475d1db07423fe97a72fa1ded3f40 (diff) | |
| download | mupdf-74627fe0ccb279638f82472048311097b39741d5.tar.xz | |
pdf: Flatten inheritable page properties when copying pages.
Affects pdfclean, pdfmerge, and pdfposter.
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/pdfmerge.c | 1 | ||||
| -rw-r--r-- | source/tools/pdfposter.c | 13 |
2 files changed, 5 insertions, 9 deletions
diff --git a/source/tools/pdfmerge.c b/source/tools/pdfmerge.c index bffcf541..bda2ffb7 100644 --- a/source/tools/pdfmerge.c +++ b/source/tools/pdfmerge.c @@ -41,6 +41,7 @@ static void page_merge(int page_from, int page_to, pdf_graft_map *graft_map) fz_try(ctx) { page_ref = pdf_lookup_page_obj(ctx, doc_src, page_from - 1); + pdf_flatten_inheritable_page_items(ctx, doc_src, page_ref); /* Make a new page object dictionary to hold the items we copy from the source page. */ page_dict = pdf_new_dict(ctx, doc_des, 4); diff --git a/source/tools/pdfposter.c b/source/tools/pdfposter.c index 92735386..81ca0d75 100644 --- a/source/tools/pdfposter.c +++ b/source/tools/pdfposter.c @@ -55,7 +55,7 @@ intersect_box(fz_context *ctx, pdf_document *doc, pdf_obj *page, pdf_obj *box_na static void decimatepages(fz_context *ctx, pdf_document *doc) { - pdf_obj *oldroot, *root, *pages, *kids, *parent; + pdf_obj *oldroot, *root, *pages, *kids; int num_pages = pdf_count_pages(ctx, doc); int page, kidcount; @@ -71,7 +71,6 @@ static void decimatepages(fz_context *ctx, pdf_document *doc) pdf_drop_obj(ctx, root); /* Create a new kids array with our new pages in */ - parent = pdf_new_indirect(ctx, doc, pdf_to_num(ctx, pages), pdf_to_gen(ctx, pages)); kids = pdf_new_array(ctx, doc, 1); kidcount = 0; @@ -102,12 +101,10 @@ static void decimatepages(fz_context *ctx, pdf_document *doc) { pdf_obj *newpageobj, *newpageref, *newmediabox; fz_rect mb; - int num; newpageobj = pdf_copy_dict(ctx, pdf_lookup_page_obj(ctx, doc, page)); - num = pdf_create_object(ctx, doc); - pdf_update_object(ctx, doc, num, newpageobj); - newpageref = pdf_new_indirect(ctx, doc, num, 0); + pdf_flatten_inheritable_page_items(ctx, doc, newpageobj); + newpageref = pdf_add_object(ctx, doc, newpageobj); newmediabox = pdf_new_array(ctx, doc, 4); @@ -127,7 +124,7 @@ static void decimatepages(fz_context *ctx, pdf_document *doc) pdf_array_push(ctx, newmediabox, pdf_new_real(ctx, doc, mb.x1)); pdf_array_push(ctx, newmediabox, pdf_new_real(ctx, doc, mb.y1)); - pdf_dict_put(ctx, newpageobj, PDF_NAME_Parent, parent); + pdf_dict_put(ctx, newpageobj, PDF_NAME_Parent, pages); pdf_dict_put_drop(ctx, newpageobj, PDF_NAME_MediaBox, newmediabox); intersect_box(ctx, doc, newpageobj, PDF_NAME_CropBox, &mb); @@ -143,8 +140,6 @@ static void decimatepages(fz_context *ctx, pdf_document *doc) } } - pdf_drop_obj(ctx, parent); - /* Update page count and kids array */ pdf_dict_put_drop(ctx, pages, PDF_NAME_Count, pdf_new_int(ctx, doc, kidcount)); pdf_dict_put_drop(ctx, pages, PDF_NAME_Kids, kids); |