|
 |
d2ed82 |
|
|
|
d2ed82 |
# erAck: resolves https://bugzilla.redhat.com/show_bug.cgi?id=1074549
|
|
|
d2ed82 |
# Based on http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/9d29c19f1de1
|
|
|
d2ed82 |
# where a/src/share/native/sun/font/layout/LookupProcessor.cpp is
|
|
|
d2ed82 |
# icu/source/layout/LookupProcessor.cpp
|
|
|
d2ed82 |
# Adapted to LayoutEngine "patch" and subsequent patches.
|
|
|
d2ed82 |
# Note that
|
|
|
d2ed82 |
#@@ -246,7 +249,7 @@
|
|
|
d2ed82 |
#- featureReferences += SWAPW(featureTable->lookupCount);
|
|
|
d2ed82 |
#+ featureReferences += SWAPW(requiredFeatureTable->lookupCount);
|
|
|
d2ed82 |
# was already applied with icu.8800.freeserif.crash.patch that also added
|
|
|
d2ed82 |
#+ if (requiredFeatureTable.isValid()) {
|
|
|
d2ed82 |
# and is a slightly enhanced version of
|
|
|
d2ed82 |
# https://ssl.icu-project.org/trac/ticket/8800 and/or
|
|
|
d2ed82 |
# https://ssl.icu-project.org/trac/ticket/8320
|
|
|
d2ed82 |
|
|
|
d2ed82 |
--- prev.icu/source/layout/LookupProcessor.cpp 2014-03-11 20:46:53.288819882 +0100
|
|
|
d2ed82 |
+++ icu/source/layout/LookupProcessor.cpp 2014-03-11 20:54:43.153370234 +0100
|
|
|
d2ed82 |
@@ -113,7 +113,7 @@
|
|
|
d2ed82 |
le_int32 LookupProcessor::selectLookups(const LEReferenceTo<FeatureTable> &featureTable, FeatureMask featureMask, le_int32 order, LEErrorCode &success)
|
|
|
d2ed82 |
{
|
|
|
d2ed82 |
le_uint16 lookupCount = featureTable.isValid()? SWAPW(featureTable->lookupCount) : 0;
|
|
|
d2ed82 |
- le_int32 store = order;
|
|
|
d2ed82 |
+ le_uint32 store = (le_uint32)order;
|
|
|
d2ed82 |
|
|
|
d2ed82 |
LEReferenceToArrayOf<le_uint16> lookupListIndexArray(featureTable, success, featureTable->lookupListIndexArray, lookupCount);
|
|
|
d2ed82 |
|
|
|
d2ed82 |
@@ -122,6 +122,9 @@
|
|
|
d2ed82 |
if (lookupListIndex >= lookupSelectCount) {
|
|
|
d2ed82 |
continue;
|
|
|
d2ed82 |
}
|
|
|
d2ed82 |
+ if (store >= lookupOrderCount) {
|
|
|
d2ed82 |
+ continue;
|
|
|
d2ed82 |
+ }
|
|
|
d2ed82 |
|
|
|
d2ed82 |
lookupSelectArray[lookupListIndex] |= featureMask;
|
|
|
d2ed82 |
lookupOrderArray[store++] = lookupListIndex;
|