You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-07 12:30:27 +00:00
Update HarfBuzz, ICU and FreeType
HarfBuzz: Update to version 7.3.0 ICU4C: Update to version 73.1 FreeType: Update to version 2.13.0
This commit is contained in:
30
thirdparty/icu4c/common/util.cpp
vendored
30
thirdparty/icu4c/common/util.cpp
vendored
@@ -15,16 +15,16 @@
|
||||
#include "patternprops.h"
|
||||
#include "util.h"
|
||||
|
||||
// Define UChar constants using hex for EBCDIC compatibility
|
||||
// Define char16_t constants using hex for EBCDIC compatibility
|
||||
|
||||
static const UChar BACKSLASH = 0x005C; /*\*/
|
||||
static const UChar UPPER_U = 0x0055; /*U*/
|
||||
static const UChar LOWER_U = 0x0075; /*u*/
|
||||
static const UChar APOSTROPHE = 0x0027; // '\''
|
||||
static const UChar SPACE = 0x0020; // ' '
|
||||
static const char16_t BACKSLASH = 0x005C; /*\*/
|
||||
static const char16_t UPPER_U = 0x0055; /*U*/
|
||||
static const char16_t LOWER_U = 0x0075; /*u*/
|
||||
static const char16_t APOSTROPHE = 0x0027; // '\''
|
||||
static const char16_t SPACE = 0x0020; // ' '
|
||||
|
||||
// "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
static const UChar DIGITS[] = {
|
||||
static const char16_t DIGITS[] = {
|
||||
48,49,50,51,52,53,54,55,56,57,
|
||||
65,66,67,68,69,70,71,72,73,74,
|
||||
75,76,77,78,79,80,81,82,83,84,
|
||||
@@ -37,12 +37,12 @@ UnicodeString& ICU_Utility::appendNumber(UnicodeString& result, int32_t n,
|
||||
int32_t radix, int32_t minDigits) {
|
||||
if (radix < 2 || radix > 36) {
|
||||
// Bogus radix
|
||||
return result.append((UChar)63/*?*/);
|
||||
return result.append((char16_t)63/*?*/);
|
||||
}
|
||||
// Handle negatives
|
||||
if (n < 0) {
|
||||
n = -n;
|
||||
result.append((UChar)45/*-*/);
|
||||
result.append((char16_t)45/*-*/);
|
||||
}
|
||||
// First determine the number of digits
|
||||
int32_t nn = n;
|
||||
@@ -122,9 +122,9 @@ UnicodeString &ICU_Utility::escape(UnicodeString& result, UChar32 c) {
|
||||
/*
|
||||
int32_t ICU_Utility::quotedIndexOf(const UnicodeString& text,
|
||||
int32_t start, int32_t limit,
|
||||
UChar charToFind) {
|
||||
char16_t charToFind) {
|
||||
for (int32_t i=start; i<limit; ++i) {
|
||||
UChar c = text.charAt(i);
|
||||
char16_t c = text.charAt(i);
|
||||
if (c == BACKSLASH) {
|
||||
++i;
|
||||
} else if (c == APOSTROPHE) {
|
||||
@@ -149,7 +149,7 @@ int32_t ICU_Utility::quotedIndexOf(const UnicodeString& text,
|
||||
int32_t ICU_Utility::skipWhitespace(const UnicodeString& str, int32_t& pos,
|
||||
UBool advance) {
|
||||
int32_t p = pos;
|
||||
const UChar* s = str.getBuffer();
|
||||
const char16_t* s = str.getBuffer();
|
||||
p = (int32_t)(PatternProps::skipWhiteSpace(s + p, str.length() - p) - s);
|
||||
if (advance) {
|
||||
pos = p;
|
||||
@@ -212,7 +212,7 @@ int32_t ICU_Utility::skipWhitespace(const UnicodeString& str, int32_t& pos,
|
||||
* @return true if 'ch' is seen preceded by zero or more
|
||||
* whitespace characters.
|
||||
*/
|
||||
UBool ICU_Utility::parseChar(const UnicodeString& id, int32_t& pos, UChar ch) {
|
||||
UBool ICU_Utility::parseChar(const UnicodeString& id, int32_t& pos, char16_t ch) {
|
||||
int32_t start = pos;
|
||||
skipWhitespace(id, pos, true);
|
||||
if (pos == id.length() ||
|
||||
@@ -292,7 +292,7 @@ int32_t ICU_Utility::parsePattern(const UnicodeString& pat,
|
||||
|
||||
int32_t ICU_Utility::parseAsciiInteger(const UnicodeString& str, int32_t& pos) {
|
||||
int32_t result = 0;
|
||||
UChar c;
|
||||
char16_t c;
|
||||
while (pos < str.length() && (c = str.charAt(pos)) >= u'0' && c <= u'9') {
|
||||
result = result * 10 + (c - u'0');
|
||||
pos++;
|
||||
@@ -425,7 +425,7 @@ void ICU_Utility::appendToRule(UnicodeString& rule,
|
||||
const UnicodeMatcher* matcher,
|
||||
UBool escapeUnprintable,
|
||||
UnicodeString& quoteBuf) {
|
||||
if (matcher != NULL) {
|
||||
if (matcher != nullptr) {
|
||||
UnicodeString pat;
|
||||
appendToRule(rule, matcher->toPattern(pat, escapeUnprintable),
|
||||
true, escapeUnprintable, quoteBuf);
|
||||
|
||||
Reference in New Issue
Block a user