summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2016-06-04 06:57:32 +0200
committerWerner Lemberg <wl@gnu.org>2016-06-04 06:57:32 +0200
commit5485a34c77b898f50ac0562bac2e859e76f95b43 (patch)
treeb7a52ebc47cf6a500efdbc8fa07d13dbb9c7a92f
parentb459882804836557bf6a8ccea45421fd87f36097 (diff)
downloadfreetype2-5485a34c77b898f50ac0562bac2e859e76f95b43.tar.gz
[truetype] Fix missed test for named instances (#48122).
* src/truetype/ftobjs.c (Mac_Read_sfnt_Resource): Implement.
-rw-r--r--ChangeLog8
-rw-r--r--src/base/ftobjs.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 332f42eec..ba4f2abb0 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 a41b77123..c2dc6183b 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 );