freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 8539915: [type1] Correctly handle missing MM axis nam


From: Werner LEMBERG
Subject: [freetype2] master 8539915: [type1] Correctly handle missing MM axis names (#46202).
Date: Tue, 13 Oct 2015 18:43:33 +0000

branch: master
commit 8539915d1873169cc419cc5931dac8dbe6e6d04c
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [type1] Correctly handle missing MM axis names (#46202).
    
    * src/type1/t1load.c (T1_Get_MM_Var): Implement it.
---
 ChangeLog          |    6 ++++++
 src/type1/t1load.c |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa5c7b5..f9615d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-13  Werner Lemberg  <address@hidden>
 
+       [type1] Correctly handle missing MM axis names (#46202).
+
+       * src/type1/t1load.c (T1_Get_MM_Var): Implement it.
+
+2015-10-13  Werner Lemberg  <address@hidden>
+
        [pcf] Quickly exit if font index < 0.
 
        Similar to other font formats, this commit makes the parser no
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 01fb60f..4ce1e35 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -336,6 +336,9 @@
       mmvar->axis[i].strid   = ~0U;                      /* Does not apply */
       mmvar->axis[i].tag     = ~0U;                      /* Does not apply */
 
+      if ( !mmvar->axis[i].name )
+        continue;
+
       if ( ft_strcmp( mmvar->axis[i].name, "Weight" ) == 0 )
         mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'g', 'h', 't' );
       else if ( ft_strcmp( mmvar->axis[i].name, "Width" ) == 0 )



reply via email to

[Prev in Thread] Current Thread [Next in Thread]