ref: 1ede3674cbb61888cccaf30a83536654b1c9d4e8
parent: 4c1b5dc152d2bd8e63431c9e708e3b851835d8d6
author: Werner Lemberg <[email protected]>
date: Wed Mar 29 20:26:31 EDT 2017
[truetype] Fix thinko related to PS name of default named instance. * src/truetype/ttgxvar.c (TT_Get_MM_Var): `strid' and `psid' are name ID values, not indices into the array of name entries.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-29 Werner Lemberg <[email protected]>
+
+ [truetype] Fix thinko related to PS name of default named instance.
+
+ * src/truetype/ttgxvar.c (TT_Get_MM_Var): `strid' and `psid' are
+ name ID values, not indices into the array of name entries.
+
2017-03-27 Werner Lemberg <[email protected]>
[cid, truetype] Don't use `index' as a variable name.
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -2171,7 +2171,8 @@
{SFNT_Service sfnt = (SFNT_Service)face->sfnt;
- FT_Int found, win, apple;
+ FT_Int found, dummy1, dummy2;
+ FT_UInt strid = 0xFFFFFFFFUL;
/* the default instance is missing in array the */
@@ -2178,35 +2179,35 @@
/* of named instances; try to synthesize an entry */
found = sfnt->get_name_id( face,
TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY,
- &win,
- &apple );
- if ( !found )
+ &dummy1,
+ &dummy2 );
+ if ( found )
+ strid = TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY;
+ else
+ {found = sfnt->get_name_id( face,
TT_NAME_ID_FONT_SUBFAMILY,
- &win,
- &apple );
+ &dummy1,
+ &dummy2 );
+ if ( found )
+ strid = TT_NAME_ID_FONT_SUBFAMILY;
+ }
if ( found )
{- FT_Int strid = win >= 0 ? win : apple;
-
-
found = sfnt->get_name_id( face,
TT_NAME_ID_PS_NAME,
- &win,
- &apple );
+ &dummy1,
+ &dummy2 );
if ( found )
{- FT_Int psid = win >= 0 ? win : apple;
-
-
FT_TRACE5(( "TT_Get_MM_Var:"
" Adding default instance to named instances\n" ));
ns = &mmvar->namedstyle[fvar_head.instanceCount];
- ns->strid = (FT_UInt)strid;
- ns->psid = (FT_UInt)psid;
+ ns->strid = strid;
+ ns->psid = TT_NAME_ID_PS_NAME;
a = mmvar->axis;
c = ns->coords;