Mercurial > mxe-octave
view src/cairo-2-static-init.patch @ 4613:4d39ccb64c08
nsis installer: remove jump into reg64 mode when compiled for win64
* tools/makeinst-script.sh.in: remove if ENABLE64 blocks in java detect
author | John D |
---|---|
date | Mon, 05 Mar 2018 09:05:05 -0500 |
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))