Merge branch 'fix-clear-color-glyphs' into 'master'

surface: Don't optimize away color glyphs

See merge request cairo/cairo!419
This commit is contained in:
Adrian Johnson 2023-01-26 01:07:44 +00:00
commit 9ed9cfcf36

View file

@ -2933,8 +2933,12 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
if (unlikely (status))
return status;
if (nothing_to_do (surface, op, source))
return CAIRO_STATUS_SUCCESS;
if (!(_cairo_scaled_font_has_color_glyphs (scaled_font) &&
scaled_font->options.color_mode != CAIRO_COLOR_MODE_NO_COLOR))
{
if (nothing_to_do (surface, op, source))
return CAIRO_STATUS_SUCCESS;
}
status = _cairo_surface_begin_modification (surface);
if (unlikely (status))