diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-07-11 14:24:19 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-08-10 14:09:46 +0200 |
| commit | 84c0c62018110e0cbb01d30d4df96b64e0b6899f (patch) | |
| tree | eb5fa87e5fce4b7897e68e640302325bd6b20ee7 /source | |
| parent | 37ed199fcebc73954e694b44033aeca4ab8a417f (diff) | |
| download | mupdf-84c0c62018110e0cbb01d30d4df96b64e0b6899f.tar.xz | |
Respect NoRotate flag for icon-based annotations.
Diffstat (limited to 'source')
| -rw-r--r-- | source/pdf/pdf-annot.c | 19 | ||||
| -rw-r--r-- | source/pdf/pdf-run.c | 13 |
2 files changed, 29 insertions, 3 deletions
diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c index 1c17882c..85c0f28b 100644 --- a/source/pdf/pdf-annot.c +++ b/source/pdf/pdf-annot.c @@ -128,10 +128,23 @@ fz_rect pdf_bound_annot(fz_context *ctx, pdf_annot *annot) { fz_matrix page_ctm; - fz_rect annot_rect; + fz_rect rect; + int flags; + + rect = pdf_dict_get_rect(ctx, annot->obj, PDF_NAME(Rect)); pdf_page_transform(ctx, annot->page, NULL, &page_ctm); - annot_rect = pdf_dict_get_rect(ctx, annot->obj, PDF_NAME(Rect)); - return fz_transform_rect(annot_rect, page_ctm); + + flags = pdf_dict_get_int(ctx, annot->obj, PDF_NAME(F)); + if (flags & PDF_ANNOT_IS_NO_ROTATE) + { + int rotate = pdf_to_int(ctx, pdf_dict_get_inheritable(ctx, annot->page->obj, PDF_NAME(Rotate))); + fz_point tp = fz_transform_point_xy(rect.x0, rect.y1, page_ctm); + page_ctm = fz_concat(page_ctm, fz_translate(-tp.x, -tp.y)); + page_ctm = fz_concat(page_ctm, fz_rotate(-rotate)); + page_ctm = fz_concat(page_ctm, fz_translate(tp.x, tp.y)); + } + + return fz_transform_rect(rect, page_ctm); } void diff --git a/source/pdf/pdf-run.c b/source/pdf/pdf-run.c index 5e4badf3..c9e56622 100644 --- a/source/pdf/pdf-run.c +++ b/source/pdf/pdf-run.c @@ -8,6 +8,7 @@ pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf fz_rect mediabox; pdf_processor *proc = NULL; fz_default_colorspaces *default_cs; + int flags; fz_var(proc); @@ -16,6 +17,18 @@ pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf fz_set_default_colorspaces(ctx, dev, default_cs); pdf_page_transform(ctx, page, &mediabox, &page_ctm); + + flags = pdf_dict_get_int(ctx, annot->obj, PDF_NAME(F)); + if (flags & PDF_ANNOT_IS_NO_ROTATE) + { + int rotate = pdf_to_int(ctx, pdf_dict_get_inheritable(ctx, page->obj, PDF_NAME(Rotate))); + fz_rect rect = pdf_dict_get_rect(ctx, annot->obj, PDF_NAME(Rect)); + fz_point tp = fz_transform_point_xy(rect.x0, rect.y1, page_ctm); + page_ctm = fz_concat(page_ctm, fz_translate(-tp.x, -tp.y)); + page_ctm = fz_concat(page_ctm, fz_rotate(-rotate)); + page_ctm = fz_concat(page_ctm, fz_translate(tp.x, tp.y)); + } + ctm = fz_concat(page_ctm, ctm); fz_try(ctx) |