[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 7e50824: * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fi
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 7e50824: * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko. |
Date: |
Tue, 1 Aug 2017 08:23:22 -0400 (EDT) |
branch: master
commit 7e50824288fac5a36c2938fdb3e1c949ea53f982
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.
---
ChangeLog | 4 ++++
include/freetype/ftmm.h | 3 ++-
src/truetype/ttgxvar.c | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a04fddd..3843d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-01 Werner Lemberg <address@hidden>
+
+ * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.
+
2017-08-01 Behdad Esfahbod <address@hidden>
[truetype] Fix loading of named instances.
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index 1f48a49..b1bc1ed 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -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_
{
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index df42b3b..5a87df1 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 7e50824: * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.,
Werner LEMBERG <=