diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-14 16:45:54 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-14 17:00:48 +0100 |
commit | ebe665867c2ff22c098ede4d4e909d42cca8b39c (patch) | |
tree | a3f82660a8e59c5f872e09efa2e4e2d4101fec8c /src/cairo-scaled-font.c | |
parent | 507b8abcf6326bbbe8c188016043b21438256b71 (diff) |
scaled-font: Fix assertions for original font-face vs font-face
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/cairo-scaled-font.c')
-rw-r--r-- | src/cairo-scaled-font.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index 1b3cd5eb9..3f37e1c44 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -607,6 +607,7 @@ _cairo_scaled_font_init_key (cairo_scaled_font_t *scaled_font, scaled_font->status = CAIRO_STATUS_SUCCESS; scaled_font->placeholder = FALSE; scaled_font->font_face = font_face; + scaled_font->original_font_face = font_face; scaled_font->font_matrix = *font_matrix; scaled_font->ctm = *ctm; /* ignore translation values in the ctm */ @@ -639,7 +640,7 @@ _cairo_scaled_font_keys_equal (const void *abstract_key_a, if (key_a->hash_entry.hash != key_b->hash_entry.hash) return FALSE; - return key_a->font_face == key_b->font_face && + return key_a->original_font_face == key_b->original_font_face && memcmp ((unsigned char *)(&key_a->font_matrix.xx), (unsigned char *)(&key_b->font_matrix.xx), sizeof(cairo_matrix_t)) == 0 && |