[cairo-commit] src/cairo-debug.c src/cairoint.h src/cairo-scaled-font.c

[Behdad Esfahbod]

 src/cairo-debug.c       |    2 ++
 src/cairo-scaled-font.c |    4 +---
 src/cairoint.h          |    3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5c201ef5cfdfdd4e19db7e0995b85fbb3f2e6090
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Dec 26 00:05:19 2008 -0500

    [scaled-font] Make cairo_debug_reset_static_data() work again
    
    I broke it in a5983929f8f07f384f78e0b604e22037cf5ed716

diff --git a/src/cairo-debug.c b/src/cairo-debug.c
index 3fe6cae..5100a85 100644
--- a/src/cairo-debug.c
+++ b/src/cairo-debug.c
@@ -61,6 +61,8 @@ cairo_debug_reset_static_data (void)
 {
     CAIRO_MUTEX_INITIALIZE ();
 
+    _cairo_scaled_font_map_destroy ();
+
     _cairo_toy_font_face_reset_static_data ();
 
 #if CAIRO_HAS_FT_FONT
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 8df6d91..8ffbcb4 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -352,7 +352,7 @@ _cairo_scaled_font_map_unlock (void)
    CAIRO_MUTEX_UNLOCK (_cairo_scaled_font_map_mutex);
 }
 
-static void
+void
 _cairo_scaled_font_map_destroy (void)
 {
     cairo_scaled_font_map_t *font_map;
@@ -957,8 +957,6 @@ _cairo_scaled_font_reset_static_data (void)
 {
     int status;
 
-    _cairo_scaled_font_map_destroy ();
-
     CAIRO_MUTEX_LOCK (_cairo_scaled_font_error_mutex);
     for (status = CAIRO_STATUS_SUCCESS;
 	 status <= CAIRO_STATUS_LAST_STATUS;
diff --git a/src/cairoint.h b/src/cairoint.h
index 882cfe4..f72c5cc 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1706,6 +1706,9 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
 cairo_private double
 _cairo_scaled_font_get_max_scale (cairo_scaled_font_t *scaled_font);
 
+cairo_private void
+_cairo_scaled_font_map_destroy (void);
+
 /* cairo-stroke-style.c */
 
 cairo_private void