[cairo-commit] 2 commits - src/cairo-ft-font.c

[GitLab Mirror]

 src/cairo-ft-font.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d68eb3c8df22694e9f25bb62b9cfa28b488f5a29
Merge: 111095d9d 05c6bb4ce
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Jun 6 22:01:01 2023 +0000

    Merge branch 'fix-colrv0-handling' into 'master'
    
    Fix rendering of COLRv0 fonts
    
    See merge request cairo/cairo!482

commit 05c6bb4ce1e67c1b4da68a3c7c915168739ba1ae
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Jun 6 14:44:52 2023 -0400

    Fix rendering of COLRv0 fonts
    
    This was found while debugging why The Twemoji Mozilla
    font renders a white-on-while in pango.
    
    We need to call _render_glyph_bitmap, since we want
    FT_Render_Glyph to handle the COLRv0 layers for us.

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 59dba1867..bc0d5485f 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2653,8 +2653,7 @@ _cairo_ft_scaled_glyph_init_surface (cairo_ft_scaled_font_t     *scaled_font,
 
     glyph = face->glyph;
 
-    if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V0 ||
-	glyph_priv->format == CAIRO_FT_GLYPH_TYPE_OUTLINE) {
+    if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_OUTLINE) {
 
 	status = _render_glyph_outline (face, &scaled_font->ft_options.base,
 					    &surface);