summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog2
-rw-r--r--Build/source/libs/icu/icu-4.6-PATCHES/patch-05-auxParam2
-rw-r--r--Build/source/libs/icu/icu-4.6/layout/GlyphIterator.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
index f9afa564918..ee51d729ad5 100644
--- a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
@@ -2,6 +2,8 @@
* patch-81-Indic (new): IndicReordering.*: Respect array bounds.
+ * patch-05-auxParam: Fix a bug introduced when importing icu-4.6.
+
2010-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-11-CURR_FULL_DIR: Correctly handle CURR_FULL_DIR when
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/patch-05-auxParam b/Build/source/libs/icu/icu-4.6-PATCHES/patch-05-auxParam
index be0ca85c7ff..d53271578dd 100644
--- a/Build/source/libs/icu/icu-4.6-PATCHES/patch-05-auxParam
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/patch-05-auxParam
@@ -56,7 +56,7 @@ diff -ur icu-4.6.orig/source/layout/GlyphIterator.cpp icu-4.6/source/layout/Glyp
destIndex = that.destIndex;
lookupFlags = that.lookupFlags;
featureMask = newFeatureMask;
-+ featureParam = that.featureParam;
++ featureParam = newFeatureParam;
glyphGroup = 0;
glyphClassDefinitionTable = that.glyphClassDefinitionTable;
markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
diff --git a/Build/source/libs/icu/icu-4.6/layout/GlyphIterator.cpp b/Build/source/libs/icu/icu-4.6/layout/GlyphIterator.cpp
index 0772ebbe162..90e962eb2a1 100644
--- a/Build/source/libs/icu/icu-4.6/layout/GlyphIterator.cpp
+++ b/Build/source/libs/icu/icu-4.6/layout/GlyphIterator.cpp
@@ -72,7 +72,7 @@ GlyphIterator::GlyphIterator(GlyphIterator &that, FeatureMask newFeatureMask, le
destIndex = that.destIndex;
lookupFlags = that.lookupFlags;
featureMask = newFeatureMask;
- featureParam = that.featureParam;
+ featureParam = newFeatureParam;
glyphGroup = 0;
glyphClassDefinitionTable = that.glyphClassDefinitionTable;
markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;