[cairo-commit] src/cairo-scaled-font.c

Chris Wilson ickle at kemper.freedesktop.org
Tue Jan 8 10:54:43 PST 2013


 src/cairo-scaled-font.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0d38518c38fec68a1fa8cf9d3ae946faa08d6c42
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 8 18:52:08 2013 +0000

    scaled-font: Remove a non-threadsafe double-freeze assert
    
    Sadly we cannot check ahead of acquiring the lock whether we hold the
    lock. Just have to rely on lockdep.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index e61c1ca..46a9c4d 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -786,7 +786,6 @@ _cairo_scaled_font_freeze_cache (cairo_scaled_font_t *scaled_font)
 {
     /* ensure we do not modify an error object */
     assert (scaled_font->status == CAIRO_STATUS_SUCCESS);
-    assert (! scaled_font->cache_frozen);
 
     CAIRO_MUTEX_LOCK (scaled_font->mutex);
     scaled_font->cache_frozen = TRUE;


More information about the cairo-commit mailing list