summaryrefslogtreecommitdiff
path: root/source/pdf/pdf-annot.c
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2018-07-05 14:44:48 +0200
committerTor Andersson <tor.andersson@artifex.com>2018-07-06 13:54:49 +0200
commit7cb9579804102ea39ef76d237144b57331766df1 (patch)
treebc485caac64ce1b4e36018075ea51064c3a0dd81 /source/pdf/pdf-annot.c
parentcd2ae94337aa32e54f6a89945c2069024aad6d12 (diff)
downloadmupdf-7cb9579804102ea39ef76d237144b57331766df1.tar.xz
Add pdf_dict_get_rect and pdf_dict_get_matrix helpers.
Diffstat (limited to 'source/pdf/pdf-annot.c')
-rw-r--r--source/pdf/pdf-annot.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
index e2e2392f..1c17882c 100644
--- a/source/pdf/pdf-annot.c
+++ b/source/pdf/pdf-annot.c
@@ -38,7 +38,7 @@ pdf_annot_transform(fz_context *ctx, pdf_annot *annot)
fz_matrix matrix;
float w, h, x, y;
- rect = pdf_to_rect(ctx, pdf_dict_get(ctx, annot->obj, PDF_NAME(Rect)));
+ rect = pdf_dict_get_rect(ctx, annot->obj, PDF_NAME(Rect));
bbox = pdf_xobject_bbox(ctx, annot->ap);
matrix = pdf_xobject_matrix(ctx, annot->ap);
@@ -127,9 +127,10 @@ pdf_next_annot(fz_context *ctx, pdf_annot *annot)
fz_rect
pdf_bound_annot(fz_context *ctx, pdf_annot *annot)
{
- fz_rect annot_rect = pdf_to_rect(ctx, pdf_dict_get(ctx, annot->obj, PDF_NAME(Rect)));
fz_matrix page_ctm;
+ fz_rect annot_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);
}
@@ -370,11 +371,10 @@ fz_rect
pdf_annot_rect(fz_context *ctx, pdf_annot *annot)
{
fz_matrix page_ctm;
- fz_rect rect;
+ fz_rect annot_rect;
pdf_page_transform(ctx, annot->page, NULL, &page_ctm);
- rect = pdf_to_rect(ctx, pdf_dict_get(ctx, annot->obj, PDF_NAME(Rect)));
- fz_transform_rect(rect, page_ctm);
- return rect;
+ annot_rect = pdf_dict_get_rect(ctx, annot->obj, PDF_NAME(Rect));
+ return fz_transform_rect(annot_rect, page_ctm);
}
void