view src/cairo-2-static-init.patch @ 3989:cdbce8086eaa

of-ocs: new package * Makefile.in: add ocs to OCTAVE_FORGE_PACKAGES * build_packages.m: add ocs-0.1.4.tar.gz to install * dist-files.mk: add refs to of-ocs-1-cross-fixes.patch, of-ocs.mk * src/of-ocs-1-cross-fixes.patch: new file * src/of-ocs.mk: new file * index.html: add of-ocs
author John Donoghue <john.donoghue@ieee.org>
date Tue, 07 Jul 2015 20:43:46 -0400
parents 6aaa1723e277
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

When DllMain is not being run, we need to initialize the font face mutex before using it.

diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c
index a65d81b..31d854d 100644
--- a/src/win32/cairo-win32-font.c
+++ b/src/win32/cairo-win32-font.c
@@ -1912,6 +1912,10 @@ _cairo_win32_font_face_hash_table_destroy (void)
 {
     cairo_hash_table_t *hash_table;

+#ifndef DLL_EXPORT 
+    CAIRO_MUTEX_INITIALIZE ();
+#endif
+
     /* We manually acquire the lock rather than calling
      * _cairo_win32_font_face_hash_table_lock simply to avoid creating
      * the table only to destroy it again. */
@@ -1927,6 +1929,10 @@ _cairo_win32_font_face_hash_table_destroy (void)
 static cairo_hash_table_t *
 _cairo_win32_font_face_hash_table_lock (void)
 {
+#ifndef DLL_EXPORT
+    CAIRO_MUTEX_INITIALIZE ();
+#endif
+
     CAIRO_MUTEX_LOCK (_cairo_win32_font_face_mutex);
 
     if (unlikely (cairo_win32_font_face_hash_table == NULL))