rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.

This commit is contained in:
Werner Lemberg 2017-08-01 12:44:35 +02:00
parent e6b9b6bafc
commit 7e50824288
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2017-08-01 Werner Lemberg <wl@gnu.org>
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.
2017-08-01 Behdad Esfahbod <behdad@behdad.org>
[truetype] Fix loading of named instances.

3
include/freetype/ftmm.h
View File

@ -178,7 +178,8 @@ FT_BEGIN_HEADER
/* strid :: The entry in `name' table identifying this instance. */
/* */
/* psid :: The entry in `name' table identifying a PostScript name */
/* for this instance. Value 0 indicates a missing entry. */
/* for this instance. Value 0xFFFF indicates a missing */
/* entry. */
/* */
typedef struct FT_Var_Named_Style_
{

4
src/truetype/ttgxvar.c
View File

@ -2165,9 +2165,11 @@
for ( j = 0; j < fvar_head.axisCount; j++, c++ )
*c = FT_GET_LONG();
/* valid psid values are 6 and [256;32767] */
/* valid psid values are 6, [256;32767], and 0xFFFF */
if ( usePsName )
ns->psid = FT_GET_USHORT();
else
ns->psid = 0xFFFF;
ft_var_to_normalized( face,
fvar_head.axisCount,