ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Werner Lemberg 2017-03-30 00:26:31 +02:00
parent 4c1b5dc152
commit 1ede3674cb
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2017-03-29 Werner Lemberg <wl@gnu.org>
[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 <wl@gnu.org>
[cid, truetype] Don't use `index' as a variable name.

33
src/truetype/ttgxvar.c
View File

@ -2171,42 +2171,43 @@
{
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 */
/* 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;