Lines 1-51
Link Here
|
1 |
From 7554822dd0b52d33ec7898e81b59e97164b00142 Mon Sep 17 00:00:00 2001 |
|
|
2 |
From: Uli Schlachter <psychon@znc.in> |
3 |
Date: Sat, 21 Apr 2018 09:37:06 +0200 |
4 |
Subject: [PATCH] Fix assertion failure in the freetype backend |
5 |
|
6 |
Fonts are kept in a hash table, so when creating a new font, the code |
7 |
first checks the hash table for an already-existing entry and only then |
8 |
is a new instance really created. There is an assert that checks that |
9 |
the key used for the hash table lookup is the same as the instance that |
10 |
is created later has, because otherwise the hash table was checked |
11 |
incorrectly. |
12 |
|
13 |
This assert failed in some conditions. |
14 |
|
15 |
Fix this by fixing some places that initialised ft hash keys in a wrong |
16 |
way. |
17 |
|
18 |
Patch by Behdad Esfahbod and submitted via bugzilla. |
19 |
|
20 |
Source: https://bugs.freedesktop.org/show_bug.cgi?id=105746#c4 |
21 |
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=105746 |
22 |
Signed-off-by: Uli Schlachter <psychon@znc.in> |
23 |
--- |
24 |
src/cairo-ft-font.c | 4 ++-- |
25 |
1 file changed, 2 insertions(+), 2 deletions(-) |
26 |
|
27 |
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c |
28 |
index 79aef78f5b0d..9b10708988d7 100644 |
29 |
--- src/cairo-ft-font.c |
30 |
+++ src/cairo-ft-font.c |
31 |
@@ -445,7 +445,7 @@ _cairo_ft_unscaled_font_init (cairo_ft_unscaled_font_t *unscaled, |
32 |
|
33 |
if (from_face) { |
34 |
unscaled->from_face = TRUE; |
35 |
- _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, face->face_index, face); |
36 |
+ _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, id, face); |
37 |
|
38 |
|
39 |
unscaled->have_color = FT_HAS_COLOR (face) != 0; |
40 |
@@ -640,7 +640,7 @@ static cairo_status_t |
41 |
_cairo_ft_unscaled_font_create_from_face (FT_Face face, |
42 |
cairo_ft_unscaled_font_t **out) |
43 |
{ |
44 |
- return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face, out); |
45 |
+ return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, face->face_index, face, out); |
46 |
} |
47 |
|
48 |
static cairo_bool_t |
49 |
-- |
50 |
2.17.0 |
51 |
|