diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2012-02-03 16:04:03 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2012-02-03 16:04:03 +0100 |
| commit | f262a8c0bfae0cd90c2cd29acd409baf2157c241 (patch) | |
| tree | 1a9f3a8c483e16c5d3d435d7c7143a6aa73b58e1 /pdf | |
| parent | 139d80bd65a164accf9d36d244d3d6a4c555aa47 (diff) | |
| download | mupdf-f262a8c0bfae0cd90c2cd29acd409baf2157c241.tar.xz | |
Be consistent about passing a fz_context in path/text/shade functions.
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/pdf_interpret.c | 9 | ||||
| -rw-r--r-- | pdf/pdf_type3.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pdf/pdf_interpret.c b/pdf/pdf_interpret.c index cdab98a1..3a32b693 100644 --- a/pdf/pdf_interpret.c +++ b/pdf/pdf_interpret.c @@ -345,13 +345,14 @@ pdf_end_group(pdf_csi *csi) static void pdf_show_shade(pdf_csi *csi, fz_shade *shd) { + fz_context *ctx = csi->dev->ctx; pdf_gstate *gstate = csi->gstate + csi->gtop; fz_rect bbox; if (csi->in_hidden_ocg > 0) return; - bbox = fz_bound_shade(shd, gstate->ctm); + bbox = fz_bound_shade(ctx, shd, gstate->ctm); pdf_begin_group(csi, bbox); @@ -460,9 +461,9 @@ pdf_show_path(pdf_csi *csi, int doclose, int dofill, int dostroke, int even_odd) fz_closepath(ctx, path); if (dostroke) - bbox = fz_bound_path(path, &gstate->stroke_state, gstate->ctm); + bbox = fz_bound_path(ctx, path, &gstate->stroke_state, gstate->ctm); else - bbox = fz_bound_path(path, NULL, gstate->ctm); + bbox = fz_bound_path(ctx, path, NULL, gstate->ctm); if (csi->clip) { @@ -722,7 +723,7 @@ pdf_show_char(pdf_csi *csi, int cid) bbox.x1 += 1; bbox.y1 += 1; - render_direct = !fz_glyph_cacheable(fontdesc->font, gid); + render_direct = !fz_glyph_cacheable(ctx, fontdesc->font, gid); /* flush buffered text if face or matrix or rendermode has changed */ if (!csi->text || diff --git a/pdf/pdf_type3.c b/pdf/pdf_type3.c index 176bf32a..3b596cdd 100644 --- a/pdf/pdf_type3.c +++ b/pdf/pdf_type3.c @@ -45,7 +45,7 @@ pdf_load_type3_font(pdf_document *xref, fz_obj *rdb, fz_obj *dict) fontdesc->font = fz_new_type3_font(ctx, buf, matrix); fontdesc->size += sizeof(fz_font) + 256 * (sizeof(fz_buffer*) + sizeof(float)); - fz_set_font_bbox(fontdesc->font, bbox.x0, bbox.y0, bbox.x1, bbox.y1); + fz_set_font_bbox(ctx, fontdesc->font, bbox.x0, bbox.y0, bbox.x1, bbox.y1); /* Encoding */ |