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

cff-subset: fallback when parsing the charstrings in bare cff fonts fails

Browse source 
We need to parse all used charstrings in bare CFF fonts to extract the widths.
This commit is contained in:
Adrian Johnson 2011-08-21 18:27:07 +09:30
parent c3e990ea7d
commit 23dfd92b29
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cairo-cff-subset.c
View file

@ -1592,9 +1592,9 @@ cairo_cff_parse_charstring (cairo_cff_font_t *font,
}
static cairo_status_t
cairo_cff_find_subroutines_used (cairo_cff_font_t *font,
unsigned char *charstring, int length,
int glyph_id, int subset_id)
cairo_cff_find_width_and_subroutines_used (cairo_cff_font_t *font,
unsigned char *charstring, int length,
int glyph_id, int subset_id)
{
cairo_status_t status;
int width;
@ -1612,6 +1612,8 @@ cairo_cff_find_subroutines_used (cairo_cff_font_t *font,
font->type2_width = 0;
status = cairo_cff_parse_charstring (font, charstring, length, glyph_id, TRUE);
if (status)
return status;
if (!font->is_opentype) {
if (font->is_cid) {
@ -1629,7 +1631,7 @@ cairo_cff_find_subroutines_used (cairo_cff_font_t *font,
font->widths[subset_id] = width;
}
return status;
return CAIRO_STATUS_SUCCESS;
}
static cairo_int_status_t
@ -1651,11 +1653,20 @@ cairo_cff_font_subset_charstrings_and_subroutines (cairo_cff_font_t *font)
return status;
if (font->subset_subroutines) {
status = cairo_cff_find_subroutines_used (font, element->data, element->length, glyph, i);
status = cairo_cff_find_width_and_subroutines_used (font,
element->data, element->length,
glyph, i);
if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
/* If parsing the charstrings fails we embed all the
* subroutines. But if the font is not opentype we
* need to successfully parse all charstrings to get
* the widths. */
font->subset_subroutines = FALSE;
} else if (unlikely (status))
if (!font->is_opentype)
return status;
} else if (unlikely (status)) {
return status;
}
}
}