diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2021-08-27 23:12:24 +0930 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2021-08-28 18:07:01 +0930 |
| commit | fea24631076f74a3202ba0233be85588ae28db36 (patch) | |
| tree | 1df67721f194ad6f161d5d63ddd146d05a0d0b68 /src/cairo-user-font.c | |
| parent | 5e76dd7a5c0585515eeef5099f12b273c94d3b0f (diff) | |
| download | cairo-fea24631076f74a3202ba0233be85588ae28db36.tar.gz | |
Support color fonts that use the foreground color
COLR fonts can have a layer with the same color as the current text
color. This change passes the current color (if solid) through to
the font backend where it can be used to render color fonts.
scaled_glyph_lookup checks if the foreground color has changed (for
glyph that require it) and requests a new color surface if required.
This also fixes a bug where scaled_glyph_lookup would always request a
color surface for glyphs for glyphs in color fonts that do not have
color.
Diffstat (limited to 'src/cairo-user-font.c')
| -rw-r--r-- | src/cairo-user-font.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cairo-user-font.c b/src/cairo-user-font.c index 04c9ee699..47b9f0422 100644 --- a/src/cairo-user-font.c +++ b/src/cairo-user-font.c @@ -144,7 +144,8 @@ _cairo_user_scaled_font_create_recording_context (const cairo_user_scaled_font_t static cairo_int_status_t _cairo_user_scaled_glyph_init (void *abstract_font, cairo_scaled_glyph_t *scaled_glyph, - cairo_scaled_glyph_info_t info) + cairo_scaled_glyph_info_t info, + const cairo_color_t *foreground_color) { cairo_int_status_t status = CAIRO_STATUS_SUCCESS; cairo_user_scaled_font_t *scaled_font = abstract_font; @@ -300,7 +301,8 @@ _cairo_user_scaled_glyph_init (void *abstract_font, if (scaled_glyph->has_color && (info & CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE)) { _cairo_scaled_glyph_set_color_surface (scaled_glyph, &scaled_font->base, - (cairo_image_surface_t *)surface); + (cairo_image_surface_t *)surface, + FALSE); } } |