fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-25 23:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

toy-font-face: Do not assume hash != 0

Browse source 
The assumption that no font face will hash to 0 is not correct.
Moreover, no special value is needed to mark fonts in error status, as
they can simply be detected upon lookup and destruction.
This commit is contained in:
Andrea Canciani 2011-06-15 15:27:21 +02:00
parent a06668fabe
commit a2cd83a986
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cairo-toy-font-face.c
View file

@ -148,7 +148,6 @@ _cairo_toy_font_face_init_key (cairo_toy_font_face_t *key,
hash += ((unsigned long) slant) * 1607;
hash += ((unsigned long) weight) * 1451;
assert (hash != 0);
key->base.hash_entry.hash = hash;
}
@ -312,7 +311,6 @@ cairo_toy_font_face_create (const char *family,
/* remove the bad font from the hash table */
_cairo_hash_table_remove (hash_table, &font_face->base.hash_entry);
font_face->base.hash_entry.hash = 0;
}
/* Otherwise create it and insert into hash table. */
@ -366,7 +364,12 @@ _cairo_toy_font_face_destroy (void *abstract_face)
return;
}
if (font_face->base.hash_entry.hash != 0)
/* Font faces in SUCCESS status are guaranteed to be in the
* hashtable. Font faces in an error status are removed from the
* hashtable if they are found during a lookup, thus they should
* only be removed if they are in the hashtable. */
if (likely (font_face->base.status == CAIRO_STATUS_SUCCESS) ||
_cairo_hash_table_lookup (hash_table, &font_face->base.hash_entry) == font_face)
_cairo_hash_table_remove (hash_table, &font_face->base.hash_entry);
_cairo_toy_font_face_hash_table_unlock ();