Mercurial > mxe-octave

annotate src/cairo-2-static-init.patch @ 2613:d6edff1d892a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package cairo
author Hans Petter Jansson <hpj@cl.no>
date Mon, 04 Jun 2012 17:56:56 +0200
parents
children 6aaa1723e277
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
1 This file is part of MXE.
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
2 See index.html for further information.
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
3
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
4 When DllMain is not being run, we need to initialize the font face mutex before using it.
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
5
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
6 diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
7 index a65d81b..31d854d 100644
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
8 --- a/src/win32/cairo-win32-font.c
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
9 +++ b/src/win32/cairo-win32-font.c
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
10 @@ -1912,6 +1912,8 @@ _cairo_win32_font_face_hash_table_destroy (void)
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
11 {
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
12 cairo_hash_table_t *hash_table;
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
13
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
14 + CAIRO_MUTEX_INITIALIZE ();
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
15 +
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
16 /* We manually acquire the lock rather than calling
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
17 * _cairo_win32_font_face_hash_table_lock simply to avoid creating
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
18 * the table only to destroy it again. */
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
19 @@ -1927,6 +1929,8 @@ _cairo_win32_font_face_hash_table_destroy (void)
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
20 static cairo_hash_table_t *
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
21 _cairo_win32_font_face_hash_table_lock (void)
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
22 {
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
23 + CAIRO_MUTEX_INITIALIZE ();
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
24 +
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
25 CAIRO_MUTEX_LOCK (_cairo_win32_font_face_mutex);
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
26
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
27 if (unlikely (cairo_win32_font_face_hash_table == NULL))