From ee3f36f6b3880f7652488169dd27292c5e7c1a76 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 14 Jul 2016 10:25:20 +0200 Subject: [PATCH] [sfnt] Fix `face_index' value in `FT_Face' for named instances. * src/sfnt/sfobjc.s (sfnt_init_face): Don't strip off higher 16bits. --- ChangeLog | 6 ++++++ docs/CHANGES | 12 ++++++++++++ src/sfnt/sfobjs.c | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a2dc6131f..e42f0cb14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-07-14 Werner Lemberg + + [sfnt] Fix `face_index' value in `FT_Face' for named instances. + + * src/sfnt/sfobjc.s (sfnt_init_face): Don't strip off higher 16bits. + 2016-07-14 Werner Lemberg * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Fix tracing. diff --git a/docs/CHANGES b/docs/CHANGES index 8e472f67a..2d1b54cb8 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,4 +1,16 @@ +CHANGES BETWEEN 2.6.5 and 2.7 + + I. IMPORTANT BUG FIXES + + - After loading a named instance of a GX variation font, the + `face_index' value in the returned `FT_Face' structure now + correctly holds the named instance index in the upper 16bits as + documented. + + +====================================================================== + CHANGES BETWEEN 2.6.4 and 2.6.5 I. IMPORTANT BUG FIXES diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 2e8c1ecde..4413bbcf2 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -977,7 +977,7 @@ #endif face->root.num_faces = face->ttc_header.count; - face->root.face_index = face_index; + face->root.face_index = face_instance_index; return error; }