diff options
Diffstat (limited to 'external/icu/icu4c-khmerbreakengine.patch.1')
| -rw-r--r-- | external/icu/icu4c-khmerbreakengine.patch.1 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 b/external/icu/icu4c-khmerbreakengine.patch.1 index ea8f20f443ff..605914014e96 100644 --- a/external/icu/icu4c-khmerbreakengine.patch.1 +++ b/external/icu/icu4c-khmerbreakengine.patch.1 @@ -1,6 +1,6 @@ diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp ---- icu.org/source/common/dictbe.cpp 2022-04-08 00:41:55.000000000 +0200 -+++ icu/source/common/dictbe.cpp 2022-05-16 13:56:43.426870900 +0200 +--- icu.org/source/common/dictbe.cpp 2023-06-14 06:23:55.000000000 +0900 ++++ icu/source/common/dictbe.cpp 2023-06-26 17:43:53.034173100 +0900 @@ -35,7 +35,19 @@ ****************************************************************** */ @@ -211,8 +211,8 @@ diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp int32_t start = (int32_t)utext_getNativeIndex(text); if (start != offset) { offset = start; -- count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), cuLengths, cpLengths, NULL, &prefix); -+ count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), cuLengths, cpLengths, NULL, &prefix, ignoreSet, minLength); +- count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), cuLengths, cpLengths, nullptr, &prefix); ++ count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), cuLengths, cpLengths, nullptr, &prefix, ignoreSet, minLength); // Dictionary leaves text after longest prefix, not longest word. Back up. if (count <= 0) { utext_setNativeIndex(text, start); @@ -748,8 +748,8 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h public: diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionarydata.cpp ---- icu.org/source/common/dictionarydata.cpp 2022-04-08 00:41:55.000000000 +0200 -+++ icu/source/common/dictionarydata.cpp 2022-05-16 13:49:33.821459892 +0200 +--- icu.org/source/common/dictionarydata.cpp 2023-06-14 06:23:55.000000000 +0900 ++++ icu/source/common/dictionarydata.cpp 2023-06-26 02:18:05.709454400 +0900 @@ -44,7 +44,7 @@ int32_t UCharsDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t limit, @@ -771,7 +771,7 @@ diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionaryda + continue; + } if (wordCount < limit) { - if (values != NULL) { + if (values != nullptr) { values[wordCount] = uct.getValue(); @@ -112,7 +118,7 @@ @@ -794,11 +794,12 @@ diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionaryda + continue; + } if (wordCount < limit) { - if (values != NULL) { + if (values != nullptr) { values[wordCount] = bt.getValue(); + diff -ur icu.org/source/common/dictionarydata.h icu/source/common/dictionarydata.h ---- icu.org/source/common/dictionarydata.h 2022-04-08 00:41:55.000000000 +0200 -+++ icu/source/common/dictionarydata.h 2022-05-16 13:49:33.822459891 +0200 +--- icu.org/source/common/dictionarydata.h 2023-06-14 06:23:55.000000000 +0900 ++++ icu/source/common/dictionarydata.h 2023-06-26 17:43:53.097724900 +0900 @@ -21,6 +21,7 @@ #include "unicode/utext.h" #include "unicode/udata.h" @@ -824,7 +825,7 @@ diff -ur icu.org/source/common/dictionarydata.h icu/source/common/dictionarydata + int32_t *prefix, UnicodeSet const* ignoreSet = NULL, int32_t minLength = 0) const override; virtual int32_t getType() const override; private: - const UChar *characters; + const char16_t *characters; @@ -125,7 +126,7 @@ virtual ~BytesDictionaryMatcher(); virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit, |