diff options
author | Fujii Hironori <Hironori.Fujii@sony.com> | 2023-01-30 11:30:56 +0900 |
---|---|---|
committer | Fujii Hironori <Hironori.Fujii@sony.com> | 2023-02-02 09:40:46 +0900 |
commit | b1bc11f646a5345e61ebd5c58305c536bd6a4207 (patch) | |
tree | f39912dce681eb41f3cd43bf8ea2b53817dc10ea /src | |
parent | 365bec1f7d5c3e645fda3ad901b2f20fe0149b00 (diff) | |
download | cairo-b1bc11f646a5345e61ebd5c58305c536bd6a4207.tar.gz |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/win32/cairo-win32-gdi-compositor.c | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |