diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-07-07 15:14:12 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-07-08 17:21:23 +0200 |
| commit | 84ae15f2c4c8fec4f4c67b5ef6a609ef0451c5bd (patch) | |
| tree | 38a18aca61868aee83370c112e43fc2728a199a4 /source/pdf | |
| parent | 9afbc5e8f030e749395548df891217c38aa1261e (diff) | |
| download | mupdf-84ae15f2c4c8fec4f4c67b5ef6a609ef0451c5bd.tar.xz | |
Slim pdf_xobject struct: Rename me to obj.
Diffstat (limited to 'source/pdf')
| -rw-r--r-- | source/pdf/pdf-op-run.c | 4 | ||||
| -rw-r--r-- | source/pdf/pdf-xobject.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c index ca21508e..de3e8bdc 100644 --- a/source/pdf/pdf-op-run.c +++ b/source/pdf/pdf-op-run.c @@ -1220,7 +1220,7 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf pdf_obj *resources; /* Avoid infinite recursion */ - if (xobj == NULL || pdf_mark_obj(ctx, xobj->me)) + if (xobj == NULL || pdf_mark_obj(ctx, xobj->obj)) return; fz_var(cleanup_state); @@ -1333,7 +1333,7 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf pdf_grestore(ctx, pr); } - pdf_unmark_obj(ctx, xobj->me); + pdf_unmark_obj(ctx, xobj->obj); } fz_catch(ctx) { diff --git a/source/pdf/pdf-xobject.c b/source/pdf/pdf-xobject.c index cd8418bd..d684ee90 100644 --- a/source/pdf/pdf-xobject.c +++ b/source/pdf/pdf-xobject.c @@ -21,7 +21,7 @@ pdf_drop_xobject_imp(fz_context *ctx, fz_storable *xobj_) fz_drop_colorspace(ctx, xobj->colorspace); pdf_drop_obj(ctx, xobj->resources); pdf_drop_obj(ctx, xobj->contents); - pdf_drop_obj(ctx, xobj->me); + pdf_drop_obj(ctx, xobj->obj); fz_free(ctx, xobj); } @@ -50,7 +50,7 @@ pdf_load_xobject(fz_context *ctx, pdf_document *doc, pdf_obj *dict) form->resources = NULL; form->contents = NULL; form->colorspace = NULL; - form->me = NULL; + form->obj = NULL; form->iteration = 0; /* Store item immediately, to avoid possible recursion if objects refer back to this one */ @@ -109,7 +109,7 @@ pdf_load_xobject(fz_context *ctx, pdf_document *doc, pdf_obj *dict) pdf_drop_xobject(ctx, form); fz_rethrow(ctx); } - form->me = pdf_keep_obj(ctx, dict); + form->obj = pdf_keep_obj(ctx, dict); return form; } @@ -154,7 +154,7 @@ pdf_new_xobject(fz_context *ctx, pdf_document *doc, const fz_rect *bbox, const f form->resources = NULL; form->contents = NULL; form->colorspace = NULL; - form->me = NULL; + form->obj = NULL; form->iteration = 0; form->bbox = *bbox; @@ -177,7 +177,7 @@ pdf_new_xobject(fz_context *ctx, pdf_document *doc, const fz_rect *bbox, const f pdf_store_item(ctx, idict, form, pdf_xobject_size(form)); form->contents = pdf_keep_obj(ctx, idict); - form->me = pdf_keep_obj(ctx, idict); + form->obj = pdf_keep_obj(ctx, idict); pdf_drop_xobject(ctx, form); form = NULL; |