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

type1: lenIV support

Browse source 
http://lists.cairographics.org/archives/cairo/2012-October/023557.html
This commit is contained in:
David Maxwell 2012-10-02 16:16:28 -08:00 • committed by Adrian Johnson
parent cffbdf50ce
commit 599e78ea2e
1 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,8 @@ typedef struct _cairo_type1_font_subset {
const char *rd, *nd, *np; const char *rd, *nd, *np;
int lenIV;
char *type1_data; char *type1_data;
unsigned int type1_length; unsigned int type1_length;
char *type1_end; char *type1_end;
@ -754,7 +756,7 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
charstring); charstring);
end = charstring + encrypted_charstring_length; end = charstring + encrypted_charstring_length;
p = charstring + 4; p = charstring + font->lenIV;
last_op_was_integer = FALSE; last_op_was_integer = FALSE;
@ -1138,9 +1140,9 @@ cairo_type1_font_subset_write_private_dict (cairo_type1_font_subset_t *font,
{ {
cairo_status_t status; cairo_status_t status;
const char *p, *subrs, *charstrings, *array_start, *array_end, *dict_start, *dict_end; const char *p, *subrs, *charstrings, *array_start, *array_end, *dict_start, *dict_end;
const char *closefile_token; const char *lenIV_start, *lenIV_end, *closefile_token;
char buffer[32], *subr_count_end, *glyph_count_end; char buffer[32], *lenIV_str, *subr_count_end, *glyph_count_end;
int length; int ret, lenIV, length;
const cairo_scaled_font_backend_t *backend; const cairo_scaled_font_backend_t *backend;
unsigned int i; unsigned int i;
int glyph, j; int glyph, j;
@ -1162,6 +1164,38 @@ cairo_type1_font_subset_write_private_dict (cairo_type1_font_subset_t *font,
* subroutines and charstrings not required. * subroutines and charstrings not required.
*/ */
/* Determine lenIV, the number of random characters at the start of
each encrypted charstring. The defaults is 4, but this can be
overridden in the private dict. */
font->lenIV = 4;
if ((lenIV_start = find_token (font->cleartext, font->cleartext_end, "/lenIV")) != NULL) {
lenIV_start += 6;
lenIV_end = find_token (lenIV_start, font->cleartext_end, "def");
if (lenIV_end == NULL)
return CAIRO_INT_STATUS_UNSUPPORTED;
lenIV_str = malloc (lenIV_end - lenIV_start + 1);
if (unlikely (lenIV_str == NULL))
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
strncpy (lenIV_str, lenIV_start, lenIV_end - lenIV_start);
lenIV_str[lenIV_end - lenIV_start] = 0;
ret = sscanf(lenIV_str, "%d", &lenIV);
free(lenIV_str);
if (unlikely (ret <= 0))
return CAIRO_INT_STATUS_UNSUPPORTED;
/* Apparently some fonts signal unencrypted charstrings with a negative lenIV,
though this is not part of the Type 1 Font Format specification. See, e.g.
http://lists.gnu.org/archive/html/freetype-devel/2000-06/msg00064.html. */
if (unlikely (lenIV < 0))
return CAIRO_INT_STATUS_UNSUPPORTED;
font->lenIV = lenIV;
}
/* Find start of Subrs */ /* Find start of Subrs */
subrs = find_token (font->cleartext, font->cleartext_end, "/Subrs"); subrs = find_token (font->cleartext, font->cleartext_end, "/Subrs");
if (subrs == NULL) { if (subrs == NULL) {