diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-29 10:58:09 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-29 10:58:09 +0100 |
| commit | 6a5b8879b3b3b2a9ef085f38c1758d62456b921b (patch) | |
| tree | f45fc1a9f32dcd31f335d27fffba75e4ceb9a23c /pdf/pdf_object.c | |
| parent | d85ad485bb64508bc59cfd4977cb5a37cf882070 (diff) | |
| parent | 25552e9f2ec3f17a0ce1cbd8d7818170d132959a (diff) | |
| download | mupdf-6a5b8879b3b3b2a9ef085f38c1758d62456b921b.tar.xz | |
Merge branch 'master' into forms
Conflicts:
cbz/mucbz.c
pdf/pdf_parse.c
pdf/pdf_form.c
xps/xps_zip.c
Diffstat (limited to 'pdf/pdf_object.c')
| -rw-r--r-- | pdf/pdf_object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pdf/pdf_object.c b/pdf/pdf_object.c index fb53d9b8..3a1e7655 100644 --- a/pdf/pdf_object.c +++ b/pdf/pdf_object.c @@ -117,7 +117,7 @@ pdf_new_string(fz_context *ctx, char *str, int len) } pdf_obj * -fz_new_name(fz_context *ctx, char *str) +pdf_new_name(fz_context *ctx, char *str) { pdf_obj *obj; obj = Memento_label(fz_malloc(ctx, offsetof(pdf_obj, u.n) + strlen(str) + 1), "pdf_obj(name)"); @@ -588,12 +588,12 @@ pdf_obj *pdf_new_rect(fz_context *ctx, fz_rect *rect) pdf_drop_obj(item); item = NULL; - item = pdf_new_real(ctx, rect->x1 - rect->x0); + item = pdf_new_real(ctx, rect->x1); pdf_array_push(arr, item); pdf_drop_obj(item); item = NULL; - item = pdf_new_real(ctx, rect->y1 - rect->y0); + item = pdf_new_real(ctx, rect->y1); pdf_array_push(arr, item); pdf_drop_obj(item); item = NULL; @@ -945,7 +945,7 @@ pdf_dict_put(pdf_obj *obj, pdf_obj *key, pdf_obj *val) void pdf_dict_puts(pdf_obj *obj, char *key, pdf_obj *val) { - pdf_obj *keyobj = fz_new_name(obj->ctx, key); + pdf_obj *keyobj = pdf_new_name(obj->ctx, key); pdf_dict_put(obj, keyobj, val); pdf_drop_obj(keyobj); } |