[cairo-commit] 2 commits - src/cairo-os2-surface.c

[Peter Weilbacher]

 src/cairo-os2-surface.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0626cac6dba91d0ee20458858275745b7c6a1bfd
Author: Peter Weilbacher <mozilla at weilbacher.org>
Date:   Fri Feb 8 15:09:19 2008 +0100

    [os2] fix typo in comment

diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c
index 7440ee9..276398e 100644
--- a/src/cairo-os2-surface.c
+++ b/src/cairo-os2-surface.c
@@ -136,7 +136,7 @@ cairo_os2_fini (void)
     DisableFPUException ();
 
     /* Free allocated memories! */
-    /* (Check cairo_debug_reset_static_date () for an example of this!) */
+    /* (Check cairo_debug_reset_static_data () for an example of this!) */
     _cairo_font_reset_static_data ();
 #if CAIRO_HAS_FT_FONT
     _cairo_ft_font_reset_static_data ();
commit b4fe25d9afff5d5b0ebaa315ad0e42f36853d5d1
Author: Peter Weilbacher <mozilla at weilbacher.org>
Date:   Fri Feb 8 15:04:49 2008 +0100

    [os2] only call FcInit/Fini when compiled with FT font backend

diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c
index e40cdce..7440ee9 100644
--- a/src/cairo-os2-surface.c
+++ b/src/cairo-os2-surface.c
@@ -106,8 +106,10 @@ cairo_os2_init (void)
 
     DisableFPUException ();
 
+#if CAIRO_HAS_FT_FONT
     /* Initialize FontConfig */
     FcInit ();
+#endif
 
     CAIRO_MUTEX_INITIALIZE ();
 }
@@ -136,14 +138,16 @@ cairo_os2_fini (void)
     /* Free allocated memories! */
     /* (Check cairo_debug_reset_static_date () for an example of this!) */
     _cairo_font_reset_static_data ();
-#ifdef CAIRO_HAS_FT_FONT
+#if CAIRO_HAS_FT_FONT
     _cairo_ft_font_reset_static_data ();
 #endif
 
     CAIRO_MUTEX_FINALIZE ();
 
+#if CAIRO_HAS_FT_FONT
     /* Uninitialize FontConfig */
     FcFini ();
+#endif
 
 #ifdef __WATCOMC__
     /* It can happen that the libraries we use have memory leaks,