fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-07 06:18:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'reinstate-font-map-for-placeholders' into 'master'

Browse source 
_cairo_scaled_font_keys_equal: Also check implementation font-face

Closes #876

See merge request cairo/cairo!659
This commit is contained in:
Uli Schlachter 2026-04-24 14:20:15 +00:00
commit d0323d9773
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cairo-scaled-font-private.h
View file

@ -87,9 +87,8 @@ struct _cairo_scaled_font {
cairo_reference_count_t ref_count;
cairo_user_data_array_t user_data;
cairo_font_face_t *original_font_face; /* may be NULL */
/* hash key members */
cairo_font_face_t *original_font_face; /* may be NULL */
cairo_font_face_t *font_face; /* may be NULL */
cairo_matrix_t font_matrix; /* font space => user space */
cairo_matrix_t ctm; /* user space => device space */

1
src/cairo-scaled-font.c
View file

@ -692,6 +692,7 @@ _cairo_scaled_font_keys_equal (const void *abstract_key_a,
const cairo_scaled_font_t *key_b = abstract_key_b;
return key_a->original_font_face == key_b->original_font_face &&
key_a->font_face == key_b->font_face &&
memcmp ((unsigned char *)(&key_a->font_matrix.xx),
(unsigned char *)(&key_b->font_matrix.xx),
sizeof(cairo_matrix_t)) == 0 &&