60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
--- misc/icu/source/layout/LookupProcessor.h 2011-02-03 09:20:27.657005678 +0000
|
|
+++ misc/build/icu/source/layout/LookupProcessor.h 2011-02-03 09:25:34.498396208 +0000
|
|
@@ -58,6 +58,7 @@
|
|
const FeatureListTable *featureListTable;
|
|
|
|
FeatureMask *lookupSelectArray;
|
|
+ le_uint32 lookupSelectCount;
|
|
|
|
le_uint16 *lookupOrderArray;
|
|
le_uint32 lookupOrderCount;
|
|
--- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000
|
|
+++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000
|
|
@@ -70,6 +70,10 @@
|
|
|
|
if (selectMask != 0) {
|
|
const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup);
|
|
+
|
|
+ if (!lookupTable)
|
|
+ continue;
|
|
+
|
|
le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
|
|
|
|
glyphIterator.reset(lookupFlags, selectMask);
|
|
@@ -111,6 +115,9 @@
|
|
for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) {
|
|
le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]);
|
|
|
|
+ if (lookupListIndex >= lookupSelectCount)
|
|
+ continue;
|
|
+
|
|
lookupSelectArray[lookupListIndex] |= featureMask;
|
|
lookupOrderArray[store++] = lookupListIndex;
|
|
}
|
|
@@ -124,5 +131,5 @@
|
|
LEErrorCode& success)
|
|
- : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL),
|
|
+ : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0),
|
|
lookupOrderArray(NULL), lookupOrderCount(0)
|
|
{
|
|
const ScriptListTable *scriptListTable = NULL;
|
|
@@ -170,6 +177,8 @@
|
|
lookupSelectArray[i] = 0;
|
|
}
|
|
|
|
+ lookupSelectCount = lookupListCount;
|
|
+
|
|
le_int32 count, order = 0;
|
|
le_int32 featureReferences = 0;
|
|
const FeatureTable *featureTable = NULL;
|
|
@@ -186,6 +197,10 @@
|
|
le_uint16 featureIndex = SWAPW(langSysTable->featureIndexArray[feature]);
|
|
|
|
featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag);
|
|
+
|
|
+ if (!featureTable)
|
|
+ continue;
|
|
+
|
|
featureReferences += SWAPW(featureTable->lookupCount);
|
|
}
|
|
|