Skip to content

Commit

Permalink
deps: ICU 58.2 bump
Browse files Browse the repository at this point in the history
Bump ICU from 58.1 to 58.2

No feature changes. Bug fixes.
* This commit contains the actual ICU source code and data.
* CLDR 30.0.3 ( was 30.0.2)
* Timezone 2016j ( was 2016g )

ICU Details:
http://site.icu-project.org/download/58#TOC-Updates-in-ICU-58.2

PR-URL: #10206
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
srl295 authored and evanlucas committed Jan 4, 2017
1 parent 80e798e commit bce0013
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion deps/icu-small/source/common/locmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr
// GetLocaleInfo() maps such LCID to "ku". However, CLDR uses "ku" for
// Northern Kurdish and "ckb" for Central Kurdish. For this reason, we cannot
// use the Windows API to resolve locale ID for this specific case.
if (hostid & 0x3FF != 0x92) {
if ((hostid & 0x3FF) != 0x92) {
int32_t tmpLen = 0;
char locName[157]; /* ULOC_FULLNAME_CAPACITY */

Expand Down
5 changes: 4 additions & 1 deletion deps/icu-small/source/common/ucasemap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ appendUChar(uint8_t *dest, int32_t destIndex, int32_t destCapacity, UChar c) {
return -1; // integer overflow
}
int32_t limit=destIndex+length;
if(limit<destCapacity) {
if(limit<=destCapacity) {
U8_APPEND_UNSAFE(dest, destIndex, c);
}
return limit;
Expand Down Expand Up @@ -422,6 +422,9 @@ ucasemap_internalUTF8ToTitle(const UCaseMap *csm,
src, &csc,
titleLimit, idx,
pErrorCode);
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
*pErrorCode=U_ZERO_ERROR;
}
if(U_FAILURE(*pErrorCode)) {
return destIndex;
}
Expand Down
6 changes: 3 additions & 3 deletions deps/icu-small/source/common/unicode/uvernum.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 1
#define U_ICU_VERSION_MINOR_NUM 2

/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
Expand Down Expand Up @@ -119,7 +119,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "58.1"
#define U_ICU_VERSION "58.2"

/** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU
Expand All @@ -131,7 +131,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "58.1"
#define U_ICU_DATA_VERSION "58.2"
#endif /* U_HIDE_INTERNAL_API */

/*===========================================================================
Expand Down
3 changes: 3 additions & 0 deletions deps/icu-small/source/common/ustrcase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ ustrcase_internalToTitle(const UCaseMap *csm,
src, &csc,
titleLimit, idx,
pErrorCode);
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
*pErrorCode=U_ZERO_ERROR;
}
if(U_FAILURE(*pErrorCode)) {
return destIndex;
}
Expand Down
Binary file modified deps/icu-small/source/data/in/icudt58l.dat
Binary file not shown.
4 changes: 2 additions & 2 deletions deps/icu-small/source/i18n/digitlst.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
# endif
#endif

#if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
# if U_PLATFORM == U_PF_CYGWIN
#if U_USE_STRTOD_L
# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
# include <locale.h>
# else
# include <xlocale.h>
Expand Down
2 changes: 1 addition & 1 deletion deps/icu-small/source/i18n/scriptset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ void ScriptSet::setScriptExtensions(UChar32 codePoint, UErrorCode& status) {

while (TRUE) {
script_count = uscript_getScriptExtensions(
codePoint, scripts.getAlias(), FIRST_GUESS_SCRIPT_CAPACITY, &internalStatus);
codePoint, scripts.getAlias(), scripts.getCapacity(), &internalStatus);
if (internalStatus == U_BUFFER_OVERFLOW_ERROR) {
// Need to allocate more space
if (scripts.resize(script_count) == NULL) {
Expand Down
7 changes: 0 additions & 7 deletions deps/icu-small/source/i18n/uspoof.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
return dest;
}

// Check that at least one of the CONFUSABLE flags is turned on. If not,
// return an error.
if ((This->fChecks & USPOOF_CONFUSABLE) == 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return dest;
}

UnicodeString nfdId;
gNfdNormalizer->normalize(id, nfdId, *status);

Expand Down

0 comments on commit bce0013

Please sign in to comment.