diff options
Diffstat (limited to 'source/fitz/draw-glyph.c')
| -rw-r--r-- | source/fitz/draw-glyph.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/source/fitz/draw-glyph.c b/source/fitz/draw-glyph.c index dacee540..9c0a1b70 100644 --- a/source/fitz/draw-glyph.c +++ b/source/fitz/draw-glyph.c @@ -429,25 +429,18 @@ fz_render_glyph_pixmap(fz_context *ctx, fz_font *font, int gid, fz_matrix *ctm, return NULL; } - fz_try(ctx) + if (is_ft_font) { - if (is_ft_font) - { - val = fz_render_ft_glyph_pixmap(ctx, font, gid, &subpix_ctm, aa); - } - else if (fz_font_t3_procs(ctx, font)) - { - val = fz_render_t3_glyph_pixmap(ctx, font, gid, &subpix_ctm, NULL, scissor, aa); - } - else - { - fz_warn(ctx, "assert: uninitialized font structure"); - val = NULL; - } + val = fz_render_ft_glyph_pixmap(ctx, font, gid, &subpix_ctm, aa); } - fz_catch(ctx) + else if (fz_font_t3_procs(ctx, font)) + { + val = fz_render_t3_glyph_pixmap(ctx, font, gid, &subpix_ctm, NULL, scissor, aa); + } + else { - fz_rethrow(ctx); + fz_warn(ctx, "assert: uninitialized font structure"); + val = NULL; } return val; |