summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Tapsell <john.tapsell.ext@basyskom.com>2012-03-08 23:10:30 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-12 13:14:05 +0100
commit4c0de07a0e555c52680c5a45aef0121721f242ea (patch)
treeb1d6a430742391f8555d0545d4397f6cf003ee2a
parent21c98e52c5aab6f063457729ac8344134071f0c5 (diff)
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>
-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 2a86cb21e9..8247875714 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
@@ -1595,6 +1595,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);