summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTsutomu Uchino <hanya@apache.org>2015-12-25 13:29:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-27 21:30:35 +0000
commit4b57845388624251b121a3198ea9117a2b81ba14 (patch)
tree3ad659132d3c90543d8596697f0d1ff326693b72
parent0c4bd60eed821990247c1a64e1602e3a090b003d (diff)
Resolves: #i126753# fix invalid parse of GSUB table for OpenType fonts
(cherry picked from commit 9396ecb77711fb7da043f9865f9803a12d830daa) Change-Id: Ib34aa2310d83afec83b4a85f1661b763415159ed
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 5df5e2f5325c..36b967f374c9 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1403,6 +1403,7 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
}
const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset;
+ pFeatureTable += 2; // ignore FeatureParams
const sal_uInt16 nCntLookups = GetUShort( pFeatureTable+0 );
pFeatureTable += 2;
for( sal_uInt16 i = 0; i < nCntLookups; ++i )