CFF subset: fix bug with euro glyph in fallback fonts

This commit is contained in:
Adrian Johnson 2010-11-28 11:45:00 +10:30
parent 7feefc75f6
commit f238da5291

View file

@ -1255,7 +1255,7 @@ cairo_cff_font_subset_strings (cairo_cff_font_t *font)
* glyphname to the list of strings to write out.
*/
static cairo_status_t
cairo_cff_font_subset_charset_strings (cairo_cff_font_t *font)
cairo_cff_font_add_euro_charset_string (cairo_cff_font_t *font)
{
cairo_status_t status;
unsigned int i;
@ -1308,7 +1308,7 @@ cairo_cff_font_subset_font (cairo_cff_font_t *font)
return status;
if (font->scaled_font_subset->is_latin)
status = cairo_cff_font_subset_charset_strings (font);
status = cairo_cff_font_add_euro_charset_string (font);
return status;
}
@ -2517,6 +2517,9 @@ cairo_cff_font_fallback_generate (cairo_cff_font_t *font,
return status;
}
if (font->scaled_font_subset->is_latin)
status = cairo_cff_font_add_euro_charset_string (font);
status = cairo_cff_font_write_subset (font);
if (unlikely (status))
return status;