[cairo-commit] 2 commits - src/win32

[GitLab Mirror]

 src/win32/cairo-win32-gdi-compositor.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 71eb6396c497541118d4c85f97cb9d05aeb94a7e
Merge: 00453e9a7 b1bc11f64
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Feb 2 10:59:29 2023 +0000

    Merge branch 'bug-597' into 'master'
    
    Win32 surface compositor should support DWrite font
    
    Closes #597
    
    See merge request cairo/cairo!441

commit b1bc11f646a5345e61ebd5c58305c536bd6a4207
Author: Fujii Hironori <Hironori.Fujii at sony.com>
Date:   Mon Jan 30 11:30:56 2023 +0900

    Win32 surface compositor should support DWrite font
    
    _cairo_win32_gdi_compositor_glyphs was falling back to the default
    implementation for DWrite font because check_glyphs() returned FALSE
    for CAIRO_FONT_TYPE_DWRITE.
    
    Fixes cairo/cairo#597

diff --git a/src/win32/cairo-win32-gdi-compositor.c b/src/win32/cairo-win32-gdi-compositor.c
index 1d1d7f873..bc1f69e70 100644
--- a/src/win32/cairo-win32-gdi-compositor.c
+++ b/src/win32/cairo-win32-gdi-compositor.c
@@ -602,7 +602,8 @@ static cairo_bool_t check_glyphs (cairo_composite_rectangles_t *composite,
     if (! _cairo_clip_is_region (composite->clip))
 	return FALSE;
 
-    if (cairo_scaled_font_get_type (scaled_font) != CAIRO_FONT_TYPE_WIN32)
+    cairo_font_type_t type = cairo_scaled_font_get_type (scaled_font);
+    if (type != CAIRO_FONT_TYPE_WIN32 && type != CAIRO_FONT_TYPE_DWRITE)
 	return FALSE;
 
     if (! _cairo_pattern_is_opaque_solid (&composite->source_pattern.base))