diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-28 09:02:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-28 09:26:48 +0200 |
| commit | 36f2d5266a0fdea67d8868048341fb0638184756 (patch) | |
| tree | e59ac2fd8209489728e2f2d4ef74dd0a26370142 /icu | |
| parent | 422ed6bc3a7811121dea060a9e36d64de434f261 (diff) | |
icu4c.8320.freeserif.crash.patch is already in the ICU we use
It added code that already was there.
Change-Id: I766184e4996a4abcd3f2b383c1aae3b558954fbd
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c.8320.freeserif.crash.patch | 21 | ||||
| -rw-r--r-- | icu/makefile.mk | 4 |
2 files changed, 0 insertions, 25 deletions
diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch deleted file mode 100644 index 2d181d32fd41..000000000000 --- a/icu/icu4c.8320.freeserif.crash.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 -@@ -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; - } -@@ -170,6 +177,8 @@ - lookupSelectArray[i] = 0; - } - -+ lookupSelectCount = lookupListCount; -+ - le_int32 count, order = 0; - le_int32 featureReferences = 0; - const FeatureTable *featureTable = NULL; diff --git a/icu/makefile.mk b/icu/makefile.mk index 82139b4b2c10..58b31e86de9f 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -39,9 +39,6 @@ TARFILE_NAME=icu4c-49_1_1-src TARFILE_MD5=7c53f83e0327343f4060c0eb83842daf TARFILE_ROOTDIR=icu -#icu4c.8320.freeserif.crash.patch, see -#http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif - #icu4c.7601.Indic-ccmp.patch #http://bugs.icu-project.org/trac/ticket/7601 ccmp feature for Indic Languages @@ -51,7 +48,6 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-bsd.patch \ icu4c-build.patch \ - icu4c.8320.freeserif.crash.patch \ icu4c.8198.revert.icu5431.patch \ icu4c.7601.Indic-ccmp.patch \ icu4c-aix.patch \ |