fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 00:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

type1-subset: return unsupported on FT errors

Browse source 
and let type1-fallback handle it. This fixes the bug reported by
Peter Weilbacher in
http://lists.cairographics.org/archives/cairo/2008-October/015569.html
This commit is contained in:
Adrian Johnson 2008-11-02 11:42:33 +10:30
parent 3707178fa4
commit 540ac11113
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cairo-type1-subset.c
View file

@ -553,18 +553,14 @@ cairo_type1_font_subset_get_glyph_names_and_widths (cairo_type1_font_subset_t *f
error = FT_Load_Glyph (font->face, i,
FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP | FT_LOAD_IGNORE_TRANSFORM);
if (error != 0) {
printf ("could not load glyph %d\n", i);
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
}
if (error != 0)
return CAIRO_INT_STATUS_UNSUPPORTED;
font->glyphs[i].width = font->face->glyph->metrics.horiAdvance;
error = FT_Get_Glyph_Name(font->face, i, buffer, sizeof buffer);
if (error != 0) {
printf ("could not get glyph name for glyph %d\n", i);
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
}
if (error != 0)
return CAIRO_INT_STATUS_UNSUPPORTED;
font->glyphs[i].name = strdup (buffer);
if (font->glyphs[i].name == NULL)