diff options
author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-03-16 19:56:39 +0200 |
---|---|---|
committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-03-16 19:56:52 +0200 |
commit | b79e8c22f09456e0c0fbcc9ccc5de6b3d54f6476 (patch) | |
tree | 5d849000c9827e98645da5c58913e74c0a6a479a /thirdparty/harfbuzz/src/hb-map.cc | |
parent | 4c56fcd6cdf840b5aca05679674e24b2fea6a63c (diff) |
HarfBuzz: Update to version 2.8.0
Diffstat (limited to 'thirdparty/harfbuzz/src/hb-map.cc')
-rw-r--r-- | thirdparty/harfbuzz/src/hb-map.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/thirdparty/harfbuzz/src/hb-map.cc b/thirdparty/harfbuzz/src/hb-map.cc index f898bd8f92..f115da2bb8 100644 --- a/thirdparty/harfbuzz/src/hb-map.cc +++ b/thirdparty/harfbuzz/src/hb-map.cc @@ -117,7 +117,7 @@ hb_map_destroy (hb_map_t *map) * @map: A map * @key: The user-data key to set * @data: A pointer to the user data to set - * @destroy: (optional): A callback to call when @data is not needed anymore + * @destroy: (nullable): A callback to call when @data is not needed anymore * @replace: Whether to replace an existing data with the same key * * Attaches a user-data key/data pair to the specified map. @@ -162,7 +162,7 @@ hb_map_get_user_data (hb_map_t *map, * * Tests whether memory allocation for a set was successful. * - * Return value: %true if allocation succeeded, false otherwise + * Return value: %true if allocation succeeded, %false otherwise * * Since: 1.7.7 **/ @@ -230,7 +230,7 @@ hb_map_del (hb_map_t *map, * * Tests whether @key is an element of @map. * - * Return value: %true if @key is found in @map, false otherwise + * Return value: %true if @key is found in @map, %false otherwise * * Since: 1.7.7 **/ @@ -253,6 +253,9 @@ hb_map_has (const hb_map_t *map, void hb_map_clear (hb_map_t *map) { + if (unlikely (hb_object_is_immutable (map))) + return; + return map->clear (); } |