diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-06-24 22:03:54 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-06-25 10:11:18 +0100 |
| commit | 997902cd2a0d46404ff4fe09a7380410d1499c5a (patch) | |
| tree | ded41aa535d7445807aea17a364f993fb8603729 /source/pdf/pdf-type3.c | |
| parent | 07dd8540ae72b0e7be64d04c38d8c19b83d184b6 (diff) | |
| download | mupdf-997902cd2a0d46404ff4fe09a7380410d1499c5a.tar.xz | |
Rid the world of "pdf_document *xref".
For historical reasons lots of the code uses "xref" when talking about
a pdf document. Now pdf_xref is a separate type this has become
confusing, so replace 'xref' with 'doc' for clarity.
Diffstat (limited to 'source/pdf/pdf-type3.c')
| -rw-r--r-- | source/pdf/pdf-type3.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/pdf/pdf-type3.c b/source/pdf/pdf-type3.c index d85d9f11..d136b6f5 100644 --- a/source/pdf/pdf-type3.c +++ b/source/pdf/pdf-type3.c @@ -14,7 +14,7 @@ pdf_t3_free_resources(void *doc, void *rdb_) } pdf_font_desc * -pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) +pdf_load_type3_font(pdf_document *doc, pdf_obj *rdb, pdf_obj *dict) { char buf[256]; char *estrings[256]; @@ -27,7 +27,7 @@ pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) int i, k, n; fz_rect bbox; fz_matrix matrix; - fz_context *ctx = xref->ctx; + fz_context *ctx = doc->ctx; fz_var(fontdesc); @@ -93,7 +93,7 @@ pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) fontdesc->encoding = pdf_new_identity_cmap(ctx, 0, 1); fontdesc->size += pdf_cmap_size(ctx, fontdesc->encoding); - pdf_load_to_unicode(xref, fontdesc, estrings, NULL, pdf_dict_gets(dict, "ToUnicode")); + pdf_load_to_unicode(doc, fontdesc, estrings, NULL, pdf_dict_gets(dict, "ToUnicode")); /* Widths */ @@ -132,7 +132,7 @@ pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) if (!fontdesc->font->t3resources) fz_warn(ctx, "no resource dictionary for type 3 font!"); - fontdesc->font->t3doc = xref; + fontdesc->font->t3doc = doc; fontdesc->font->t3run = pdf_run_glyph_func; /* CharProcs */ @@ -148,9 +148,9 @@ pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) if (estrings[i]) { obj = pdf_dict_gets(charprocs, estrings[i]); - if (pdf_is_stream(xref, pdf_to_num(obj), pdf_to_gen(obj))) + if (pdf_is_stream(doc, pdf_to_num(obj), pdf_to_gen(obj))) { - fontdesc->font->t3procs[i] = pdf_load_stream(xref, pdf_to_num(obj), pdf_to_gen(obj)); + fontdesc->font->t3procs[i] = pdf_load_stream(doc, pdf_to_num(obj), pdf_to_gen(obj)); fontdesc->size += fontdesc->font->t3procs[i]->cap; fontdesc->size += 0; // TODO: display list size calculation } @@ -166,10 +166,10 @@ pdf_load_type3_font(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict) return fontdesc; } -void pdf_load_type3_glyphs(pdf_document *xref, pdf_font_desc *fontdesc, int nested_depth) +void pdf_load_type3_glyphs(pdf_document *doc, pdf_font_desc *fontdesc, int nested_depth) { int i; - fz_context *ctx = xref->ctx; + fz_context *ctx = doc->ctx; fz_try(ctx) { |