You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-09 12:50:35 +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:
16
thirdparty/icu4c/common/unicode/bytestrie.h
vendored
16
thirdparty/icu4c/common/unicode/bytestrie.h
vendored
@@ -69,7 +69,7 @@ public:
|
||||
* @stable ICU 4.8
|
||||
*/
|
||||
BytesTrie(const void *trieBytes)
|
||||
: ownedArray_(NULL), bytes_(static_cast<const uint8_t *>(trieBytes)),
|
||||
: ownedArray_(nullptr), bytes_(static_cast<const uint8_t *>(trieBytes)),
|
||||
pos_(bytes_), remainingMatchLength_(-1) {}
|
||||
|
||||
/**
|
||||
@@ -85,7 +85,7 @@ public:
|
||||
* @stable ICU 4.8
|
||||
*/
|
||||
BytesTrie(const BytesTrie &other)
|
||||
: ownedArray_(NULL), bytes_(other.bytes_),
|
||||
: ownedArray_(nullptr), bytes_(other.bytes_),
|
||||
pos_(other.pos_), remainingMatchLength_(other.remainingMatchLength_) {}
|
||||
|
||||
/**
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
* Constructs an empty State.
|
||||
* @stable ICU 4.8
|
||||
*/
|
||||
State() { bytes=NULL; }
|
||||
State() { bytes=nullptr; }
|
||||
private:
|
||||
friend class BytesTrie;
|
||||
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
* @stable ICU 4.8
|
||||
*/
|
||||
BytesTrie &resetToState(const State &state) {
|
||||
if(bytes_==state.bytes && bytes_!=NULL) {
|
||||
if(bytes_==state.bytes && bytes_!=nullptr) {
|
||||
pos_=state.pos;
|
||||
remainingMatchLength_=state.remainingMatchLength;
|
||||
}
|
||||
@@ -227,7 +227,7 @@ public:
|
||||
* result=next(c);
|
||||
* return result;
|
||||
* \endcode
|
||||
* @param s A string or byte sequence. Can be NULL if length is 0.
|
||||
* @param s A string or byte sequence. Can be nullptr if length is 0.
|
||||
* @param length The length of the byte sequence. Can be -1 if NUL-terminated.
|
||||
* @return The match/value Result.
|
||||
* @stable ICU 4.8
|
||||
@@ -262,7 +262,7 @@ public:
|
||||
inline UBool hasUniqueValue(int32_t &uniqueValue) const {
|
||||
const uint8_t *pos=pos_;
|
||||
// Skip the rest of a pending linear-match node.
|
||||
return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue);
|
||||
return pos!=nullptr && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -397,7 +397,7 @@ private:
|
||||
BytesTrie &operator=(const BytesTrie &other) = delete;
|
||||
|
||||
inline void stop() {
|
||||
pos_=NULL;
|
||||
pos_=nullptr;
|
||||
}
|
||||
|
||||
// Reads a compact 32-bit integer.
|
||||
@@ -555,7 +555,7 @@ private:
|
||||
|
||||
// Iterator variables.
|
||||
|
||||
// Pointer to next trie byte to read. NULL if no more matches.
|
||||
// Pointer to next trie byte to read. nullptr if no more matches.
|
||||
const uint8_t *pos_;
|
||||
// Remaining length of a linear-match node, minus 1. Negative if not in such a node.
|
||||
int32_t remainingMatchLength_;
|
||||
|
||||
Reference in New Issue
Block a user