From 83da52b4cd4ceef835bd437d34fe5f9dcf8fed19 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 20 Dec 2003 07:30:05 +0000 Subject: [PATCH] * src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 32. For example, the Japanese Hiragino font already contains 15 subfonts. * src/cff/cffload.c (cff_font_load): Deallocate `sids' array for CID-keyed fonts. --- ChangeLog | 8 ++++++++ src/cff/cffgload.c | 2 ++ src/cff/cffload.c | 3 +++ src/cff/cfftypes.h | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7c6d220b0..3f126324d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-12-19 Werner Lemberg + + * src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 32. For + example, the Japanese Hiragino font already contains 15 subfonts. + + * src/cff/cffload.c (cff_font_load): Deallocate `sids' array for + CID-keyed fonts. + 2003-12-18 Werner Lemberg * include/freetype/ttnameid.h (TT_ADOBE_ID_LATIN_1): New macro. diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index a905b8407..4b214c48d 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -663,6 +663,8 @@ CFF_Font cff = (CFF_Font)(face->extra.data); + /* XXX: What about CID-keyed fonts? */ + bchar_index = cff_lookup_glyph_by_stdcharcode( cff, bchar ); achar_index = cff_lookup_glyph_by_stdcharcode( cff, achar ); } diff --git a/src/cff/cffload.c b/src/cff/cffload.c index f63d7fdf4..d77959d3d 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -2267,6 +2267,9 @@ if ( error ) goto Exit; } + else + /* CID-keyed fonts only need CIDs */ + FT_FREE( font->charset.sids ); } /* get the font name (/CIDFontName for CID-keyed fonts, */ diff --git a/src/cff/cfftypes.h b/src/cff/cfftypes.h index 4508d98e5..9ddc663de 100644 --- a/src/cff/cfftypes.h +++ b/src/cff/cfftypes.h @@ -199,7 +199,7 @@ FT_BEGIN_HEADER /* maximum number of sub-fonts in a CID-keyed file */ -#define CFF_MAX_CID_FONTS 16 +#define CFF_MAX_CID_FONTS 32 typedef struct CFF_FontRec_