1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/cairo/fix-win32-font-assertion.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,27 @@
1.4 +From: Jonathan Kew <jkew@mozilla.com>
1.5 +bug 838617 - don't assert equality with the key's hash unless it was actually initialized. r=roc
1.6 +
1.7 +diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
1.8 +--- a/gfx/cairo/cairo/src/cairo-win32-font.c
1.9 ++++ b/gfx/cairo/cairo/src/cairo-win32-font.c
1.10 +@@ -2104,19 +2104,19 @@ cairo_win32_font_face_create_for_logfont
1.11 + font_face = malloc (sizeof (cairo_win32_font_face_t));
1.12 + if (!font_face) {
1.13 + _cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
1.14 + goto FAIL;
1.15 + }
1.16 +
1.17 + _cairo_win32_font_face_init_key (font_face, logfont, font);
1.18 + _cairo_font_face_init (&font_face->base, &_cairo_win32_font_face_backend);
1.19 +- assert (font_face->base.hash_entry.hash == key.base.hash_entry.hash);
1.20 +
1.21 + if (!font) {
1.22 ++ assert (font_face->base.hash_entry.hash == key.base.hash_entry.hash);
1.23 + status = _cairo_hash_table_insert (hash_table,
1.24 + &font_face->base.hash_entry);
1.25 + if (unlikely (status))
1.26 + goto FAIL;
1.27 + }
1.28 +
1.29 + DONE:
1.30 + if (!font) {
