diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-07-07 15:34:04 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2016-07-08 17:21:23 +0200 |
commit | 14a052d269e6a72890bb6762c093ef5f7a375b78 (patch) | |
tree | 34ef089bb61f9a31e86bbcdc395259b7f7889183 /source/pdf/pdf-appearance.c | |
parent | a7c01fa4e8b6db64e4f061197320d3dc9ad63067 (diff) | |
download | mupdf-14a052d269e6a72890bb6762c093ef5f7a375b78.tar.xz |
Slim pdf_xobject struct: remove cached bbox field.
Diffstat (limited to 'source/pdf/pdf-appearance.c')
-rw-r--r-- | source/pdf/pdf-appearance.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c index 6e03cb2b..43095351 100644 --- a/source/pdf/pdf-appearance.c +++ b/source/pdf/pdf-appearance.c @@ -1135,7 +1135,7 @@ void pdf_update_text_appearance(fz_context *ctx, pdf_document *doc, pdf_obj *obj pdf_xobject *form = NULL; fz_buffer *fzbuf = NULL; fz_matrix tm; - fz_rect rect; + fz_rect rect, form_bbox; int has_tm; char *text = NULL; @@ -1156,9 +1156,9 @@ void pdf_update_text_appearance(fz_context *ctx, pdf_document *doc, pdf_obj *obj form = load_or_create_form(ctx, doc, obj, &rect); + pdf_xobject_bbox(ctx, form, &form_bbox); has_tm = get_matrix(ctx, doc, form, info.q, &tm); - fzbuf = create_text_appearance(ctx, doc, &form->bbox, has_tm ? &tm : NULL, &info, - text?text:""); + fzbuf = create_text_appearance(ctx, doc, &form_bbox, has_tm ? &tm : NULL, &info, text?text:""); update_marked_content(ctx, doc, form, fzbuf); } fz_always(ctx) @@ -1377,7 +1377,7 @@ void pdf_update_combobox_appearance(fz_context *ctx, pdf_document *doc, pdf_obj pdf_xobject *form = NULL; fz_buffer *fzbuf = NULL; fz_matrix tm; - fz_rect rect; + fz_rect rect, form_bbox; int has_tm; pdf_obj *val; char *text; @@ -1403,8 +1403,9 @@ void pdf_update_combobox_appearance(fz_context *ctx, pdf_document *doc, pdf_obj form = load_or_create_form(ctx, doc, obj, &rect); + pdf_xobject_bbox(ctx, form, &form_bbox); has_tm = get_matrix(ctx, doc, form, info.q, &tm); - fzbuf = create_text_appearance(ctx, doc, &form->bbox, has_tm ? &tm : NULL, &info, + fzbuf = create_text_appearance(ctx, doc, &form_bbox, has_tm ? &tm : NULL, &info, text?text:""); update_marked_content(ctx, doc, form, fzbuf); } @@ -1621,7 +1622,6 @@ void pdf_set_annot_appearance(fz_context *ctx, pdf_document *doc, pdf_annot *ann if (xobj) { /* Update bounding box and matrix also in the xobject structure */ - xobj->bbox = trect; xobj->matrix = fz_identity; xobj->iteration++; pdf_drop_xobject(ctx, xobj); |