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

cff-subset: don't easily give up parsing a charstring if we already have the width

Browse source 
The 2 byte operators can be ignored of we don't need or have already found
the width.
This commit is contained in:
Adrian Johnson 2011-08-21 20:12:42 +09:30
parent 23dfd92b29
commit cdb00dec42
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1436,9 +1436,13 @@ type2_decode_integer (unsigned char *p, int *integer)
* used.
*
* The width, if present, is the first integer in the charstring. The
* only way to confirm if an integer at the start of the charstring is
* only way to confirm if the integer at the start of the charstring is
* the width is when the first stack clearing operator is parsed,
* check if there is an extra integer left over on the stack.
*
* When the first stack clearing operator is encountered
* type2_find_width is set to FALSE and type2_found_width is set to
* TRUE if an extra argument is found, otherwise FALSE.
*/
static cairo_status_t
cairo_cff_parse_charstring (cairo_cff_font_t *font,
@ -1575,13 +1579,15 @@ cairo_cff_parse_charstring (cairo_cff_font_t *font,
} else if (*p == 12) {
/* 2 byte instruction */
/* Most of the 2 byte operators */
if (need_width && (p[1] < 0x22 || p[1] > 0x25))
/* All the 2 byte operators are either not valid before a
* stack clearing operator or they are one of the
* arithmetic, storage, or conditional operators. */
if (need_width && font->type2_find_width)
return CAIRO_INT_STATUS_UNSUPPORTED;
p += 2;
font->type2_stack_top_is_int = FALSE;
} else {
} else {
/* 1 byte instruction */
p++;
font->type2_stack_top_is_int = FALSE;