[cairo-commit] 2 commits - src/cairo-colr-glyph-render.c

[GitLab Mirror]

 src/cairo-colr-glyph-render.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit f133b4be1348d985e9b75a29bb42f3c74e535b82
Merge: 68ee427b6 0f8bd754a
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Jan 17 20:25:07 2023 +0000

    Merge branch 'optimize-paint-composite' into 'master'
    
    [COLRv1] Optimize paint-composite
    
    See merge request cairo/cairo!411

commit 0f8bd754ae05105cae9354ff6e0b0cfb7ecefe3f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jan 17 08:10:36 2023 -0700

    [COLRv1] Optimize paint-composite
    
    See https://github.com/googlefonts/colr-gradients-spec/issues/369

diff --git a/src/cairo-colr-glyph-render.c b/src/cairo-colr-glyph-render.c
index 2388d9e02..43fd50af0 100644
--- a/src/cairo-colr-glyph-render.c
+++ b/src/cairo-colr-glyph-render.c
@@ -1021,7 +1021,6 @@ draw_paint_composite (cairo_colr_glyph_render_t *render,
 
     cairo_save (cr);
 
-    cairo_push_group (cr);
     status = draw_paint (render, &composite->backdrop_paint, cr);
     if (unlikely (status)) {
 	cairo_pattern_destroy (cairo_pop_group (cr));
@@ -1039,9 +1038,6 @@ draw_paint_composite (cairo_colr_glyph_render_t *render,
     cairo_pop_group_to_source (cr);
     cairo_set_operator (cr, cairo_operator_from_ft_composite_mode (composite->composite_mode));
     cairo_paint (cr);
-    cairo_pop_group_to_source (cr);
-    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    cairo_paint (cr);
 
   cleanup:
     cairo_restore (cr);