[freetype2] master 913f436: [sfnt] Fix check for default named instance.

[Werner LEMBERG]

branch: master
commit 913f436d12dfe682c349eff8bf4cdd9065ff117d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [sfnt] Fix check for default named instance.
    
    * src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four
    bytes, not two...
---
 ChangeLog         |  7 +++++++
 src/sfnt/sfobjs.c | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f344092..a98267a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-03-23  Werner Lemberg  <address@hidden>
 
+       [sfnt] Fix check for default named instance.
+
+       * src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four
+       bytes, not two...
+
+2017-03-23  Werner Lemberg  <address@hidden>
+
        Make MM fonts work (again).
 
        * src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index d3de9fc..ac2e620 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -1013,8 +1013,8 @@
        */
 
       if ( ( face->variation_support & TT_FACE_FLAG_VAR_FVAR ) &&
-           !( FT_ALLOC( default_values, num_axes * 2 )  ||
-              FT_ALLOC( instance_values, num_axes * 2 ) )      )
+           !( FT_ALLOC( default_values, num_axes * 4 )  ||
+              FT_ALLOC( instance_values, num_axes * 4 ) )      )
       {
         /* the current stream position is 16 bytes after the table start */
         FT_ULong  array_start = FT_STREAM_POS() - 16 + offset;
@@ -1029,10 +1029,10 @@
 
         for ( i = 0; i < num_axes; i++ )
         {
-          (void)FT_STREAM_READ_AT( default_value_offset, p, 2 );
+          (void)FT_STREAM_READ_AT( default_value_offset, p, 4 );
 
           default_value_offset += axis_size;
-          p                    += 2;
+          p                    += 4;
         }
 
         instance_offset = array_start + axis_size * num_axes + 4;
@@ -1041,9 +1041,9 @@
         {
           (void)FT_STREAM_READ_AT( instance_offset,
                                    instance_values,
-                                   num_axes * 2 );
+                                   num_axes * 4 );
 
-          if ( !ft_memcmp( default_values, instance_values, num_axes * 2 ) )
+          if ( !ft_memcmp( default_values, instance_values, num_axes * 4 ) )
             break;
 
           instance_offset += instance_size;