diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2012-01-27 14:16:58 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2012-01-27 14:18:22 +0100 |
| commit | 03b276d3f2db3feecb522f101e0da065c4af53d4 (patch) | |
| tree | 512eabad1f8b5516003c254c5cf10439ba79a98c /fitz | |
| parent | 40575c42719566f3585c5aa67129a8a5b7285aa7 (diff) | |
| download | mupdf-03b276d3f2db3feecb522f101e0da065c4af53d4.tar.xz | |
Rename pdf_xref type to pdf_document.
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/base_object.c | 2 | ||||
| -rw-r--r-- | fitz/fitz.h | 8 | ||||
| -rw-r--r-- | fitz/res_font.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/fitz/base_object.c b/fitz/base_object.c index 4037c871..a3b38c49 100644 --- a/fitz/base_object.c +++ b/fitz/base_object.c @@ -294,7 +294,7 @@ int fz_to_gen(fz_obj *obj) return obj->u.r.gen; } -void *fz_get_indirect_xref(fz_obj *obj) +void *fz_get_indirect_document(fz_obj *obj) { if (!obj || obj->kind != FZ_INDIRECT) return NULL; diff --git a/fitz/fitz.h b/fitz/fitz.h index 49db7dc2..e156cb27 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -641,7 +641,7 @@ fz_obj *fz_new_int(fz_context *ctx, int i); fz_obj *fz_new_real(fz_context *ctx, float f); fz_obj *fz_new_name(fz_context *ctx, char *str); fz_obj *fz_new_string(fz_context *ctx, char *str, int len); -fz_obj *fz_new_indirect(fz_context *ctx, int num, int gen, void *xref); +fz_obj *fz_new_indirect(fz_context *ctx, int num, int gen, void *doc); fz_obj *fz_new_array(fz_context *ctx, int initialcap); fz_obj *fz_new_dict(fz_context *ctx, int initialcap); @@ -704,7 +704,7 @@ void fz_debug_obj(fz_obj *obj); void fz_debug_ref(fz_obj *obj); void fz_set_str_len(fz_obj *obj, int newlen); /* private */ -void *fz_get_indirect_xref(fz_obj *obj); /* private */ +void *fz_get_indirect_document(fz_obj *obj); /* private */ /* * Data buffers. @@ -1067,8 +1067,8 @@ struct fz_font_s fz_buffer **t3procs; /* has 256 entries if used */ float *t3widths; /* has 256 entries if used */ char *t3flags; /* has 256 entries if used */ - void *t3xref; /* a pdf_xref for the callback */ - void (*t3run)(void *xref, fz_obj *resources, fz_buffer *contents, + void *t3doc; /* a pdf_document for the callback */ + void (*t3run)(void *doc, fz_obj *resources, fz_buffer *contents, struct fz_device_s *dev, fz_matrix ctm, void *gstate); fz_rect bbox; /* font bbox is used only for t3 fonts */ diff --git a/fitz/res_font.c b/fitz/res_font.c index 7bc8f48b..9f1bc73b 100644 --- a/fitz/res_font.c +++ b/fitz/res_font.c @@ -37,7 +37,7 @@ fz_new_font(fz_context *ctx, char *name, int use_glyph_bbox, int glyph_count) font->t3procs = NULL; font->t3widths = NULL; font->t3flags = NULL; - font->t3xref = NULL; + font->t3doc = NULL; font->t3run = NULL; font->bbox.x0 = 0; @@ -646,7 +646,7 @@ fz_bound_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm) FZ_DEVFLAG_LINEJOIN_UNDEFINED | FZ_DEVFLAG_MITERLIMIT_UNDEFINED | FZ_DEVFLAG_LINEWIDTH_UNDEFINED; - font->t3run(font->t3xref, font->t3resources, contents, dev, ctm, NULL); + font->t3run(font->t3doc, font->t3resources, contents, dev, ctm, NULL); font->t3flags[gid] = dev->flags; fz_free_device(dev); @@ -702,7 +702,7 @@ fz_render_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, fz_co ctm = fz_concat(font->t3matrix, trm); dev = fz_new_draw_device_type3(ctx, glyph); - font->t3run(font->t3xref, font->t3resources, contents, dev, ctm, NULL); + font->t3run(font->t3doc, font->t3resources, contents, dev, ctm, NULL); /* RJW: "cannot draw type3 glyph" */ fz_free_device(dev); @@ -744,7 +744,7 @@ fz_render_t3_glyph_direct(fz_context *ctx, fz_device *dev, fz_font *font, int gi } ctm = fz_concat(font->t3matrix, trm); - font->t3run(font->t3xref, font->t3resources, contents, dev, ctm, gstate); + font->t3run(font->t3doc, font->t3resources, contents, dev, ctm, gstate); /* RJW: "cannot draw type3 glyph" */ } |