From a0b208fc71db586d3793fa4e2f4c01b275608261 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Fri, 8 Oct 2010 23:01:12 +1030 Subject: [PATCH] Don't put Type3 glyphs in latin subsets it is not yet implemented --- src/cairo-scaled-font-subsets.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c index 7bc42f851..f5e6dec2a 100644 --- a/src/cairo-scaled-font-subsets.c +++ b/src/cairo-scaled-font-subsets.c @@ -298,8 +298,13 @@ _cairo_sub_font_create (cairo_scaled_font_subsets_t *parent, sub_font->font_id = font_id; sub_font->use_latin_subset = parent->use_latin_subset; - if (_cairo_cff_scaled_font_is_cid_cff (scaled_font)) - sub_font->use_latin_subset = FALSE; /* latin subsets of CID CFF fonts are not supported */ + + /* latin subsets of Type 3 and CID CFF fonts are not supported */ + if (sub_font->is_user || sub_font->is_scaled || + _cairo_cff_scaled_font_is_cid_cff (scaled_font) ) + { + sub_font->use_latin_subset = FALSE; + } if (sub_font->use_latin_subset) sub_font->current_subset = 1; /* reserve subset 0 for latin glyphs */