diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2023-01-27 19:08:16 +1030 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2023-01-27 20:22:18 +1030 |
| commit | c8695f050340bff1dc2b3a64cf8386c5ad19c274 (patch) | |
| tree | 226986977f2eece85eca0ce9338eb84d66bf394d /src/cairo-user-font.c | |
| parent | 055ca7fb09842caa2595cf7864fa3afd417ebd37 (diff) | |
| download | cairo-c8695f050340bff1dc2b3a64cf8386c5ad19c274.tar.gz | |
Foreground color fixes for ft, svg, colrv1
Diffstat (limited to 'src/cairo-user-font.c')
| -rw-r--r-- | src/cairo-user-font.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/cairo-user-font.c b/src/cairo-user-font.c index 913395fd9..e7a1d0211 100644 --- a/src/cairo-user-font.c +++ b/src/cairo-user-font.c @@ -381,20 +381,8 @@ _cairo_user_scaled_glyph_init (void *abstract_font, { cairo_int_status_t status = CAIRO_STATUS_SUCCESS; cairo_user_scaled_font_t *scaled_font = abstract_font; - cairo_bool_t need_recording = FALSE; - if (!scaled_glyph->recording_surface) { - need_recording = TRUE; - } else { - if ((info & (CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE|CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE)) && - scaled_glyph->recording_uses_foreground_color && - !_cairo_color_equal (foreground_color, &scaled_glyph->foreground_color)) - { - need_recording = TRUE; - } - } - - if (need_recording) { + if (!scaled_glyph->recording_surface || (info & CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE)) { status = _cairo_user_scaled_glyph_init_record_glyph (scaled_font, scaled_glyph, foreground_color); if (status) return status; @@ -598,8 +586,7 @@ _cairo_user_font_face_scaled_font_create (void *abstract_ } user_scaled_font->foreground_pattern = NULL; - user_scaled_font->foreground_marker = cairo_pattern_create_rgb (0, 0, 0); - user_scaled_font->foreground_marker->is_userfont_foreground = TRUE; + user_scaled_font->foreground_marker = _cairo_pattern_create_foreground_marker (); /* XXX metrics hinting? */ |