Attachment 2992 Details for Bug 4192 – Adjust num_open_faces before each call to _cairo_ft_unscaled_font_fini

[patch] Adjust num_open_faces before each call to _cairo_ft_unscaled_font_fini

4192.patch (text/plain), 1.09 KB, created by Carl Worth on 2005-08-22 14:44:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Worth

Created: 2005-08-22 14:44:55 UTC

Size: 1.09 KB

patch

obsolete

>Index: src/cairo-ft-font.c
>===================================================================
>RCS file: /mirrors/freedesktop/cairo/cairo/src/cairo-ft-font.c,v
>retrieving revision 1.104
>diff -u -p -r1.104 cairo-ft-font.c
>--- src/cairo-ft-font.c	21 Aug 2005 15:06:06 -0000	1.104
>+++ src/cairo-ft-font.c	22 Aug 2005 21:12:38 -0000
>@@ -206,10 +206,14 @@ _cairo_ft_unscaled_font_map_destroy (voi
> 		break;
> 	    _cairo_hash_table_remove (font_map->hash_table,
> 				      &unscaled->base.hash_entry);
>+	    if (unscaled->face)
>+		font_map->num_open_faces--;
> 	    _cairo_ft_unscaled_font_fini (unscaled);
> 	    free (unscaled);
> 	}
> 
>+	assert (font_map->num_open_faces == 0);
>+
> 	FT_Done_FreeType (font_map->ft_library);
> 
> 	_cairo_hash_table_destroy (font_map->hash_table);
>@@ -456,9 +460,11 @@ _cairo_ft_unscaled_font_destroy (void *a
> 	_cairo_hash_table_remove (font_map->hash_table,
> 				  &unscaled->base.hash_entry);
> 
>-	_cairo_ft_unscaled_font_map_unlock ();
>-
>+	if (unscaled->face)
>+	    font_map->num_open_faces--;
> 	_cairo_ft_unscaled_font_fini (unscaled);
>+
>+	_cairo_ft_unscaled_font_map_unlock ();
>     }
> }
>

Actions: View | Splinter Review

Attachments on bug 4192: 2988 | 2992 | 2997 | 3001

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.