diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2007-03-07 15:51:35 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2007-03-07 16:02:08 -0500 |
| commit | 62e864e73cd1136b3c0e889dca43a1c0cc648b21 (patch) | |
| tree | a099b77bc7776816f0d773ada76a984fd5efc8ea /src/cairo-type1-fallback.c | |
| parent | ef9799d596600aea334707d2ff00fcca82280d83 (diff) | |
[Type1] Add cairo-type1-private.h that Type1 fallback and subset code share
Diffstat (limited to 'src/cairo-type1-fallback.c')
| -rw-r--r-- | src/cairo-type1-fallback.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/cairo-type1-fallback.c b/src/cairo-type1-fallback.c index 48cfaf2bf..a183b28b4 100644 --- a/src/cairo-type1-fallback.c +++ b/src/cairo-type1-fallback.c @@ -34,6 +34,7 @@ */ #include "cairoint.h" +#include "cairo-type1-private.h" #include "cairo-scaled-font-subsets-private.h" #include "cairo-path-fixed-private.h" #include "cairo-output-stream-private.h" @@ -116,11 +117,6 @@ fail: return CAIRO_STATUS_NO_MEMORY; } -/* Magic constants for the type1 eexec encryption */ -static const unsigned short encrypt_c1 = 52845, encrypt_c2 = 22719; -static const unsigned short private_dict_key = 55665; -static const unsigned short charstring_key = 4330; - /* Charstring commands. If the high byte is 0 the command is encoded * with a single byte. */ #define CHARSTRING_sbw 0x0c07 @@ -301,13 +297,13 @@ charstring_encrypt (cairo_array_t *data) unsigned char *d, *end; uint16_t c, p, r; - r = charstring_key; + r = CAIRO_TYPE1_CHARSTRING_KEY; d = (unsigned char *) _cairo_array_index (data, 0); end = d + _cairo_array_num_elements (data); while (d < end) { p = *d; c = p ^ (r >> 8); - r = (c + r) * encrypt_c1 + encrypt_c2; + r = (c + r) * CAIRO_TYPE1_ENCRYPT_C1 + CAIRO_TYPE1_ENCRYPT_C2; *d++ = c; } } @@ -534,7 +530,7 @@ cairo_type1_write_stream_encrypted (void *closure, while (in < end) { p = *in++; c = p ^ (font->eexec_key >> 8); - font->eexec_key = (c + font->eexec_key) * encrypt_c1 + encrypt_c2; + font->eexec_key = (c + font->eexec_key) * CAIRO_TYPE1_ENCRYPT_C1 + CAIRO_TYPE1_ENCRYPT_C2; if (font->hex_encode) { digits[0] = hex_digits[c >> 4]; @@ -564,7 +560,7 @@ cairo_type1_font_write_private_dict (cairo_type1_font_t *font, cairo_int_status_t status; cairo_output_stream_t *encrypted_output; - font->eexec_key = private_dict_key; + font->eexec_key = CAIRO_TYPE1_PRIVATE_DICT_KEY; font->hex_column = 0; encrypted_output = _cairo_output_stream_create ( cairo_type1_write_stream_encrypted, |