summaryrefslogtreecommitdiff
path: root/pdf/pdf_form.c
diff options
context:
space:
mode:
authorPaul Gardiner <paul@glidos.net>2012-06-13 14:51:31 +0100
committerPaul Gardiner <paul@glidos.net>2012-06-13 14:51:31 +0100
commite6df95d476f193c7ef20c35fd4d924f788daf764 (patch)
tree6cda34f34ed9022331fe59ea932856dc39efd36e /pdf/pdf_form.c
parent69c38a0d23c39432ff19e1e20f1e398a14d8c648 (diff)
parent6fcc55dfd7bf4b25c62ca8d405b5ec0f47ee9909 (diff)
downloadmupdf-e6df95d476f193c7ef20c35fd4d924f788daf764.tar.xz
Merge branch 'master' into forms
Conflicts: fitz/fitz-internal.h fitz/stm_buffer.c pdf/mupdf-internal.h
Diffstat (limited to 'pdf/pdf_form.c')
-rw-r--r--pdf/pdf_form.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c
index 66ce4ed3..25053186 100644
--- a/pdf/pdf_form.c
+++ b/pdf/pdf_form.c
@@ -83,11 +83,6 @@ static const char *fmt_ET = "ET\n";
static const char *fmt_Q = "Q\n";
static const char *fmt_EMC = "EMC\n";
-static fz_buffer *form_contents(pdf_document *doc, pdf_xobject *form)
-{
- return pdf_get_stream(doc, pdf_to_num(form->contents));
-}
-
static void account_for_rot(fz_rect *rect, fz_matrix *mat, int rot)
{
float width = rect->x1;
@@ -240,7 +235,7 @@ static void copy_resources(pdf_obj *dst, pdf_obj *src)
pdf_obj *key = pdf_dict_get_key(src, i);
if (!pdf_dict_get(dst, key))
- fz_dict_put(dst, key, pdf_dict_get_val(src, i));
+ pdf_dict_put(dst, key, pdf_dict_get_val(src, i));
}
}
@@ -727,7 +722,7 @@ fz_buffer *create_text_appearance(pdf_document *doc, fz_rect *bbox, fz_matrix *o
variable = (info->font_rec.da_rec.font_size == 0);
fontsize = variable
? (info->multiline ? 14.0 : floor(height))
- : info->font_rec.da_rec.font_size == 0;
+ : info->font_rec.da_rec.font_size;
info->font_rec.da_rec.font_size = fontsize;
@@ -864,8 +859,7 @@ static void update_marked_content(pdf_document *doc, pdf_xobject *form, fz_buffe
int first = 1;
newbuf = fz_new_buffer(ctx, 0);
- len = fz_buffer_storage(ctx, form_contents(doc, form), &buf);
- str_outer = fz_open_memory(ctx, buf, len);
+ str_outer = pdf_open_stream(doc, pdf_to_num(form->contents), pdf_to_gen(form->contents));
len = fz_buffer_storage(ctx, fzbuf, &buf);
str_inner = fz_open_memory(ctx, buf, len);
@@ -939,8 +933,7 @@ static int get_matrix(pdf_document *doc, pdf_xobject *form, int q, fz_matrix *mt
pdf_lexbuf lbuf;
fz_stream *str;
- bufsize = fz_buffer_storage(ctx, form_contents(doc, form), &buf);
- str = fz_open_memory(ctx, buf, bufsize);
+ str = pdf_open_stream(doc, pdf_to_num(form->contents), pdf_to_gen(form->contents));
memset(lbuf.scratch, 0, sizeof(lbuf.scratch));
lbuf.size = sizeof(lbuf.scratch);