* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.
This commit is contained in:
parent
e6b9b6bafc
commit
7e50824288
|
@ -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>
|
2017-08-01 Behdad Esfahbod <behdad@behdad.org>
|
||||||
|
|
||||||
[truetype] Fix loading of named instances.
|
[truetype] Fix loading of named instances.
|
||||||
|
|
|
@ -178,7 +178,8 @@ FT_BEGIN_HEADER
|
||||||
/* strid :: The entry in `name' table identifying this instance. */
|
/* strid :: The entry in `name' table identifying this instance. */
|
||||||
/* */
|
/* */
|
||||||
/* psid :: The entry in `name' table identifying a PostScript name */
|
/* 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_
|
typedef struct FT_Var_Named_Style_
|
||||||
{
|
{
|
||||||
|
|
|
@ -2165,9 +2165,11 @@
|
||||||
for ( j = 0; j < fvar_head.axisCount; j++, c++ )
|
for ( j = 0; j < fvar_head.axisCount; j++, c++ )
|
||||||
*c = FT_GET_LONG();
|
*c = FT_GET_LONG();
|
||||||
|
|
||||||
/* valid psid values are 6 and [256;32767] */
|
/* valid psid values are 6, [256;32767], and 0xFFFF */
|
||||||
if ( usePsName )
|
if ( usePsName )
|
||||||
ns->psid = FT_GET_USHORT();
|
ns->psid = FT_GET_USHORT();
|
||||||
|
else
|
||||||
|
ns->psid = 0xFFFF;
|
||||||
|
|
||||||
ft_var_to_normalized( face,
|
ft_var_to_normalized( face,
|
||||||
fvar_head.axisCount,
|
fvar_head.axisCount,
|
||||||
|
|
Loading…
Reference in New Issue