diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-08-22 11:58:23 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2018-08-22 19:38:10 +0800 |
| commit | a1feb3abb2821a0f8e00d146e6426ecdb9922b94 (patch) | |
| tree | 1db9ccd42ad4b8b01155a687b6759aa6e7322147 /source/fitz | |
| parent | 61574870c0fbe0bb76ea143f8b1ff38800fcdec7 (diff) | |
| download | mupdf-a1feb3abb2821a0f8e00d146e6426ecdb9922b94.tar.xz | |
Remove the old 'nested depth' tracking.
This was used to prevent infinite cycles in the Type3 font CharProcs,
but the previous commits forbids all cycles in order to prevent memory
leaks due to cyclic reference counts.
Diffstat (limited to 'source/fitz')
| -rw-r--r-- | source/fitz/font-imp.h | 2 | ||||
| -rw-r--r-- | source/fitz/font.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/fitz/font-imp.h b/source/fitz/font-imp.h index 383d7d21..9a167792 100644 --- a/source/fitz/font-imp.h +++ b/source/fitz/font-imp.h @@ -19,7 +19,7 @@ struct fz_font_s float *t3widths; /* has 256 entries if used */ unsigned short *t3flags; /* has 256 entries if used */ void *t3doc; /* a pdf_document for the callback */ - void (*t3run)(fz_context *ctx, void *doc, void *resources, fz_buffer *contents, struct fz_device_s *dev, fz_matrix ctm, void *gstate, int nested_depth, fz_default_colorspaces *default_cs); + void (*t3run)(fz_context *ctx, void *doc, void *resources, fz_buffer *contents, struct fz_device_s *dev, fz_matrix ctm, void *gstate, fz_default_colorspaces *default_cs); void (*t3freeres)(fz_context *ctx, void *doc, void *resources); fz_rect bbox; /* font bbox is used only for t3 fonts */ diff --git a/source/fitz/font.c b/source/fitz/font.c index 97c5347e..f9609aec 100644 --- a/source/fitz/font.c +++ b/source/fitz/font.c @@ -1325,7 +1325,7 @@ fz_bound_t3_glyph(fz_context *ctx, fz_font *font, int gid) } void -fz_prepare_t3_glyph(fz_context *ctx, fz_font *font, int gid, int nested_depth) +fz_prepare_t3_glyph(fz_context *ctx, fz_font *font, int gid) { fz_buffer *contents; fz_device *dev; @@ -1351,7 +1351,7 @@ fz_prepare_t3_glyph(fz_context *ctx, fz_font *font, int gid, int nested_depth) FZ_DEVFLAG_LINEWIDTH_UNDEFINED; fz_try(ctx) { - font->t3run(ctx, font->t3doc, font->t3resources, contents, dev, fz_identity, NULL, 0, NULL); + font->t3run(ctx, font->t3doc, font->t3resources, contents, dev, fz_identity, NULL, NULL); fz_close_device(ctx, dev); font->t3flags[gid] = dev->flags; d1_rect = dev->d1_rect; @@ -1492,7 +1492,7 @@ fz_render_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, fz_co } void -fz_render_t3_glyph_direct(fz_context *ctx, fz_device *dev, fz_font *font, int gid, fz_matrix trm, void *gstate, int nested_depth, fz_default_colorspaces *def_cs) +fz_render_t3_glyph_direct(fz_context *ctx, fz_device *dev, fz_font *font, int gid, fz_matrix trm, void *gstate, fz_default_colorspaces *def_cs) { fz_matrix ctm; void *contents; @@ -1518,7 +1518,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(ctx, font->t3doc, font->t3resources, contents, dev, ctm, gstate, nested_depth, def_cs); + font->t3run(ctx, font->t3doc, font->t3resources, contents, dev, ctm, gstate, def_cs); } fz_rect |