diff options
Diffstat (limited to 'extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch')
| -rw-r--r-- | extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch deleted file mode 100644 index e43a10312..000000000 --- a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f1d6b27e8b78c77346a5b603114b54400e57d83 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 07 Jun 2012 09:48:52 +0000 -Subject: cff-subsetting: Ignore charset for non cid fonts - -Fixes crash in https://bugzilla.gnome.org/show_bug.cgi?id=677422 ---- -diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c -index db6fdf7..6f0cd66 100644 ---- a/src/cairo-cff-subset.c -+++ b/src/cairo-cff-subset.c -@@ -1178,14 +1178,16 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font) - goto fail; - font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index); - -- operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); -- if (font->is_cid && !operand) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ if (font->is_cid) { -+ operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); -+ if (!operand) -+ return CAIRO_INT_STATUS_UNSUPPORTED; - -- decode_integer (operand, &offset); -- font->charset = font->data + offset; -- if (font->charset >= font->data_end) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ decode_integer (operand, &offset); -+ font->charset = font->data + offset; -+ if (font->charset >= font->data_end) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ } - - if (!font->is_opentype) - cairo_cff_font_read_font_metrics (font, font->top_dict); --- -cgit v0.9.0.2-2-gbebe |