You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-05 12:10:55 +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:
@@ -152,7 +152,7 @@ protected:
|
||||
* equivalent to newNode.
|
||||
* @param newNode Input node. The builder takes ownership.
|
||||
* @param errorCode ICU in/out UErrorCode.
|
||||
Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==NULL.
|
||||
Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==nullptr.
|
||||
* @return newNode if it is the first of its kind, or
|
||||
* an equivalent node if newNode is a duplicate.
|
||||
* @internal
|
||||
@@ -164,7 +164,7 @@ protected:
|
||||
* Avoids creating a node if the value is a duplicate.
|
||||
* @param value A final value.
|
||||
* @param errorCode ICU in/out UErrorCode.
|
||||
Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==NULL.
|
||||
Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==nullptr.
|
||||
* @return A FinalValueNode with the given value.
|
||||
* @internal
|
||||
*/
|
||||
@@ -176,11 +176,11 @@ protected:
|
||||
* registerNode() and registerFinalValue() take ownership of their input nodes,
|
||||
* and only return owned nodes.
|
||||
* If they see a failure UErrorCode, they will delete the input node.
|
||||
* If they get a NULL pointer, they will record a U_MEMORY_ALLOCATION_ERROR.
|
||||
* If there is a failure, they return NULL.
|
||||
* If they get a nullptr pointer, they will record a U_MEMORY_ALLOCATION_ERROR.
|
||||
* If there is a failure, they return nullptr.
|
||||
*
|
||||
* NULL Node pointers can be safely passed into other Nodes because
|
||||
* they call the static Node::hashCode() which checks for a NULL pointer first.
|
||||
* nullptr Node pointers can be safely passed into other Nodes because
|
||||
* they call the static Node::hashCode() which checks for a nullptr pointer first.
|
||||
*
|
||||
* Therefore, as long as builder functions register a new node,
|
||||
* they need to check for failures only before explicitly dereferencing
|
||||
@@ -201,8 +201,8 @@ protected:
|
||||
public:
|
||||
Node(int32_t initialHash) : hash(initialHash), offset(0) {}
|
||||
inline int32_t hashCode() const { return hash; }
|
||||
// Handles node==NULL.
|
||||
static inline int32_t hashCode(const Node *node) { return node==NULL ? 0 : node->hashCode(); }
|
||||
// Handles node==nullptr.
|
||||
static inline int32_t hashCode(const Node *node) { return node==nullptr ? 0 : node->hashCode(); }
|
||||
// Base class operator==() compares the actual class types.
|
||||
virtual bool operator==(const Node &other) const;
|
||||
inline bool operator!=(const Node &other) const { return !operator==(other); }
|
||||
@@ -347,7 +347,7 @@ protected:
|
||||
// Adds a unit with a final value.
|
||||
void add(int32_t c, int32_t value) {
|
||||
units[length]=(char16_t)c;
|
||||
equal[length]=NULL;
|
||||
equal[length]=nullptr;
|
||||
values[length]=value;
|
||||
++length;
|
||||
hash=(hash*37u+c)*37u+value;
|
||||
@@ -361,7 +361,7 @@ protected:
|
||||
hash=(hash*37u+c)*37u+hashCode(node);
|
||||
}
|
||||
protected:
|
||||
Node *equal[kMaxBranchLinearSubNodeLength]; // NULL means "has final value".
|
||||
Node *equal[kMaxBranchLinearSubNodeLength]; // nullptr means "has final value".
|
||||
int32_t length;
|
||||
int32_t values[kMaxBranchLinearSubNodeLength];
|
||||
char16_t units[kMaxBranchLinearSubNodeLength];
|
||||
|
||||
Reference in New Issue
Block a user