summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Weilbacher <mozilla@weilbacher.org>2008-02-08 15:04:49 +0100
committerPeter Weilbacher <mozilla@weilbacher.org>2008-02-08 15:04:49 +0100
commitb4fe25d9afff5d5b0ebaa315ad0e42f36853d5d1 (patch)
tree919e8011b9dd13dd6784cd04f9ba9a0bd04849f4 /src
parent5e9cdcca00a490f3a36b4229f5353d795ca53a5d (diff)
[os2] only call FcInit/Fini when compiled with FT font backend
Diffstat (limited to 'src')
-rw-r--r--src/cairo-os2-surface.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c
index e40cdcea..7440ee9a 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,