Commit 5485a34c77b898f50ac0562bac2e859e76f95b43

Werner Lemberg 2016-06-04T06:57:32

[truetype] Fix missed test for named instances (#48122). * src/truetype/ftobjs.c (Mac_Read_sfnt_Resource): Implement.

diff --git a/ChangeLog b/ChangeLog
index 332f42e..ba4f2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2016-05-17  Nikolaus Waxweiler  <madigens@gmail.com>
+2016-06-04  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix missed test for named instances (#48122).
+
+	* src/truetype/ftobjs.c (Mac_Read_sfnt_Resource): Implement.
+
+2016-05-31  Nikolaus Waxweiler  <madigens@gmail.com>
 
 	[truetype] Let SHPIX move points in the twilight zone in v40.
 
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index a41b771..c2dc618 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1791,8 +1791,8 @@
     FT_Long    face_index_in_resource = 0;
 
 
-    if ( face_index == -1 )
-      face_index = 0;
+    if ( face_index < 0 )
+      face_index = -face_index - 1;
     if ( face_index >= resource_cnt )
       return FT_THROW( Cannot_Open_Resource );