[freetype2] master 63765a8: [sfnt] Return correct number of named instances for TTCs.

[Werner LEMBERG]

branch: master
commit 63765a8f2af9d379f5571c359fb7133b35878924
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [sfnt] Return correct number of named instances for TTCs.
    
    Without this patch, requesting information for face index N returned
    the data for face index N+1 (or index 0).
    
    * src/sfnt/sfobjs.c (sfnt_init_face): Correctly adjust `face_index'
    for negative `face_instance_index' values.
---
 ChangeLog         |   10 ++++++++++
 src/sfnt/sfobjs.c |    4 ++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2738474..4f36604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-01-01  Werner Lemberg  <address@hidden>
+
+       [sfnt] Return correct number of named instances for TTCs.
+
+       Without this patch, requesting information for face index N returned
+       the data for face index N+1 (or index 0).
+
+       * src/sfnt/sfobjs.c (sfnt_init_face): Correctly adjust `face_index'
+       for negative `face_instance_index' values.
+
 2016-12-31  Werner Lemberg  <address@hidden>
 
        */*: Use hex numbers for errors in tracing messages.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 818009e..5e7380b 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -909,6 +909,10 @@
 
     face_index = FT_ABS( face_instance_index ) & 0xFFFF;
 
+    /* value -(N+1) requests information on index N */
+    if ( face_instance_index < 0 )
+      face_index--;
+
     if ( face_index >= face->ttc_header.count )
     {
       if ( face_instance_index >= 0 )