shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* 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.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2003-12-19  Werner Lemberg  <[email protected]>

+

+	* 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  <[email protected]>

 	* include/freetype/ttnameid.h (TT_ADOBE_ID_LATIN_1): New macro.

--- 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 );

     }

--- 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, */

--- a/src/cff/cfftypes.h

+++ b/src/cff/cfftypes.h

@@ -199,7 +199,7 @@

   /* 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_