[cairo-commit] Branch '1.8' - src/cairo-ft-font.c

Behdad Esfahbod behdad at kemper.freedesktop.org
Wed Dec 17 13:42:36 PST 2008


 src/cairo-ft-font.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0137b9bd320783264d865a397392b0ee14fd69b3
Author: Karl Tomlinson <karlt+ at karlt.net>
Date:   Wed Dec 17 16:40:12 2008 -0500

    [ft] Don't call FT_Done_Face() on faces we did not create

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index cd11253..3675db6 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -528,7 +528,7 @@ _has_unlocked_face (void *entry)
 {
     cairo_ft_unscaled_font_t *unscaled = entry;
 
-    return (unscaled->lock_count == 0 && unscaled->face);
+    return (!unscaled->from_face && unscaled->lock_count == 0 && unscaled->face);
 }
 
 /* Ensures that an unscaled font has a face object. If we exceed


More information about the cairo-commit mailing list