summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2018-01-26 23:17:43 +0100
committerWerner Lemberg <wl@gnu.org>2018-01-26 23:17:43 +0100
commit994eb2b34934bc5face9f83b2d3b12cf7a9262ab (patch)
tree8d74eff7f25dcb75ba5f6c58f3a2d1f03faf05b0
parentb1e0209829d6def7b337700204e2adb75fb9282a (diff)
downloadfreetype2-994eb2b34934bc5face9f83b2d3b12cf7a9262ab.tar.gz
[truetype] Fix multiple calls of `FT_Get_MM_Var' (#52955).
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Set `face->blend->num_axis' in case we have to initialize the `face->blend'.
-rw-r--r--ChangeLog8
-rw-r--r--src/truetype/ttgxvar.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 20f195142..f62b67358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-26 Ben Wagner <bungeman@google.com>
+
+ [truetype] Fix multiple calls of `FT_Get_MM_Var' (#52955).
+
+ * src/truetype/ttgxvar.c (TT_Get_MM_Var): Set
+ `face->blend->num_axis' in case we have to initialize the
+ `face->blend'.
+
2018-01-23 Alexei Podtelezhnikov <apodtele@gmail.com>
[apinames] Anonymous version map for GNU linker.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 6f456cf8c..980086ce7 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -2048,7 +2048,8 @@
if ( FT_NEW( face->blend ) )
goto Exit;
- num_axes = fvar_head.axisCount;
+ num_axes = fvar_head.axisCount;
+ face->blend->num_axis = num_axes;
}
else
num_axes = face->blend->num_axis;