shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix handling of FT_CONFIG_OPTION_ADOBE_GLYPH_LIST (#54794).

* src/cff/cffcmap.c (cff_cmap_unicode_init), src/psaux/t1cmap.c
(t1_cmap_unicode_init), src/sfnt/ttcmap.c (tt_cmap_unicode_init):
Check `unicodes_init' field.

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

--- a/ChangeLog

+++ b/ChangeLog

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

+2018-10-07  Werner Lemberg  <[email protected]>

+

+	Fix handling of FT_CONFIG_OPTION_ADOBE_GLYPH_LIST (#54794).

+

+	* src/cff/cffcmap.c (cff_cmap_unicode_init), src/psaux/t1cmap.c

+	(t1_cmap_unicode_init), src/sfnt/ttcmap.c (tt_cmap_unicode_init):

+	Check `unicodes_init' field.

+

 2018-10-03  Werner Lemberg  <[email protected]>

 	[ftgrays] Fix typo in stand-alone mode (#54771).

--- a/src/cff/cffcmap.c

+++ b/src/cff/cffcmap.c

@@ -161,6 +161,9 @@

     if ( !charset->sids )

       return FT_THROW( No_Unicode_Glyph_Name );

+    if ( !psnames->unicodes_init )

+      return FT_THROW( Unimplemented_Feature );

+

     return psnames->unicodes_init( memory,

                                    unicodes,

                                    cff->num_glyphs,

--- a/src/psaux/t1cmap.c

+++ b/src/psaux/t1cmap.c

@@ -305,6 +305,9 @@

     FT_UNUSED( pointer );

+    if ( !psnames->unicodes_init )

+      return FT_THROW( Unimplemented_Feature );

+

     return psnames->unicodes_init( memory,

                                    unicodes,

                                    (FT_UInt)face->type1.num_glyphs,

--- a/src/sfnt/ttcmap.c

+++ b/src/sfnt/ttcmap.c

@@ -3681,6 +3681,9 @@

     FT_UNUSED( pointer );

+    if ( !psnames->unicodes_init )

+      return FT_THROW( Unimplemented_Feature );

+

     return psnames->unicodes_init( memory,

                                    unicodes,

                                    face->root.num_glyphs,