mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-01-07 00:50:19 +01:00
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:
commit
9ed9cfcf36
1 changed files with 6 additions and 2 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue