[cairo-commit] Branch '1.10' - src/cairo-type1-subset.c

[Adrian Johnson]

 src/cairo-type1-subset.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a1b36ad521ba9ec1509fa32ce4a4e51fe5f623d4
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Feb 8 21:40:08 2011 +1030

    Type1-subset: Fallback if font contains more than one /Encoding
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641704

diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
index 9650699..c07d854 100644
--- a/src/cairo-type1-subset.c
+++ b/src/cairo-type1-subset.c
@@ -406,6 +406,10 @@ cairo_type1_font_subset_write_header (cairo_type1_font_subset_t *font,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     end += 3;
 
+    /* There are some buggy fonts that contain more than one /Encoding */
+    if (find_token (end, segment_end, "/Encoding"))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
     _cairo_output_stream_write (font->output, end, segment_end - end);
 
     return font->output->status;