Issue #1971 - Part 2: Update ICU source to 63.2.

This commit is contained in:
Job Bautista 2022-07-24 21:03:27 +08:00 committed by roytam1
commit 1e69214382
3160 changed files with 275815 additions and 234203 deletions

View file

@ -1,4 +1,4 @@
// Copyright (C) 2016 and later: Unicode, Inc. and others.
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
@ -764,9 +764,9 @@ RuleBasedCollator::internalCompareUTF8(const char *left, int32_t leftLength,
// Make sure both or neither strings have a known length.
// We do not optimize for mixed length/termination.
if(leftLength >= 0) {
if(rightLength < 0) { rightLength = uprv_strlen(right); }
if(rightLength < 0) { rightLength = static_cast<int32_t>(uprv_strlen(right)); }
} else {
if(rightLength >= 0) { leftLength = uprv_strlen(left); }
if(rightLength >= 0) { leftLength = static_cast<int32_t>(uprv_strlen(left)); }
}
return doCompare(reinterpret_cast<const uint8_t *>(left), leftLength,
reinterpret_cast<const uint8_t *>(right), rightLength, errorCode);
@ -862,9 +862,9 @@ public:
} else {
str.setTo(text, (int32_t)(spanLimit - text));
{
ReorderingBuffer buffer(nfcImpl, str);
if(buffer.init(str.length(), errorCode)) {
nfcImpl.makeFCD(spanLimit, textLimit, &buffer, errorCode);
ReorderingBuffer r_buffer(nfcImpl, str);
if(r_buffer.init(str.length(), errorCode)) {
nfcImpl.makeFCD(spanLimit, textLimit, &r_buffer, errorCode);
}
}
if(U_SUCCESS(errorCode)) {