summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/harfbuzz
diff options
context:
space:
mode:
authorJohn Tapsell <john.tapsell.ext@basyskom.com>2012-03-08 23:10:30 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-12 11:51:07 (GMT)
commit5bce44ef030a18d7ed3f6e3abf824d42ab84bf70 (patch)
treefb692b70b068b0aef340fe618e0a62767eb9952e /src/3rdparty/harfbuzz
parentc5b2e8f28c6797ede0759379f110a330e26075c1 (diff)
downloadQt-5bce44ef030a18d7ed3f6e3abf824d42ab84bf70.zip
Qt-5bce44ef030a18d7ed3f6e3abf824d42ab84bf70.tar.gz
Qt-5bce44ef030a18d7ed3f6e3abf824d42ab84bf70.tar.bz2
Harfbuzz GPOS hinting- do not consider a subtable to be invalid if it is just empty
Considering a subtable to be invalid when it was empty meant that it returned an error causing all further hinting to be aborted. This means that we get no hinting in certain cases with certain fonts. Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/3rdparty/harfbuzz')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-gpos.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
index 7bd3b3b..78f4c3a 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
@@ -1507,6 +1507,9 @@ static HB_Error Lookup_PairPos1( GPOS_Instance* gpi,
if ( index >= ppf1->PairSetCount )
return ERR(HB_Err_Invalid_SubTable);
+ if (!ppf1->PairSet[index].PairValueCount)
+ return HB_Err_Not_Covered;
+
pvr = ppf1->PairSet[index].PairValueRecord;
if ( !pvr )
return ERR(HB_Err_Invalid_SubTable);