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

Fix cairo_ft_unscaled_font_t to have a lock_count again not an is_locked Boolean

Browse source 
This was inadvertently changed as part of fdffde8b9e

With the Boolean, pango-using programs that locked the same
unscaled_font multiple times would crash with a message such as:

 cairo-ft-font.c:569: _cairo_ft_unscaled_font_unlock_face: Assertion `unscaled->is_locked' failed.
This commit is contained in:
Carl Worth 2007-02-13 23:49:26 -08:00
parent 7adab2866b
commit 9966551dc7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cairo-ft-font.c
View file

@ -101,7 +101,7 @@ struct _cairo_ft_unscaled_font {
FT_Matrix Current_Shape;
cairo_mutex_t mutex;
cairo_bool_t is_locked;
int lock_count;
cairo_ft_font_face_t *faces; /* Linked list of faces for this font */
};
@ -335,7 +335,7 @@ _cairo_ft_unscaled_font_init (cairo_ft_unscaled_font_t *unscaled,
unscaled->have_scale = FALSE;
CAIRO_MUTEX_INIT (&unscaled->mutex);
unscaled->is_locked = FALSE;
unscaled->lock_count = 0;
unscaled->faces = NULL;
@ -501,7 +501,7 @@ _has_unlocked_face (void *entry)
{
cairo_ft_unscaled_font_t *unscaled = entry;
return (! unscaled->is_locked && unscaled->face);
return (unscaled->lock_count == 0 && unscaled->face);
}
/* Ensures that an unscaled font has a face object. If we exceed
@ -517,7 +517,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
FT_Face face = NULL;
CAIRO_MUTEX_LOCK (unscaled->mutex);
unscaled->is_locked = TRUE;
unscaled->lock_count++;
if (unscaled->face)
return unscaled->face;
@ -566,9 +566,9 @@ slim_hidden_def (cairo_ft_scaled_font_lock_face);
void
_cairo_ft_unscaled_font_unlock_face (cairo_ft_unscaled_font_t *unscaled)
{
assert (unscaled->is_locked);
assert (unscaled->lock_count > 0);
unscaled->is_locked = FALSE;
unscaled->lock_count--;
CAIRO_MUTEX_UNLOCK (unscaled->mutex);
}