From 76b059cadb805df3df860be6a130ab5480cb8846 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 20 Jan 2023 16:41:47 -0700 Subject: [PATCH] [hb-cairo] Simplify foreground color fetching --- src/hb-cairo.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/hb-cairo.cc b/src/hb-cairo.cc index 5193d1eb0..71818c0c7 100644 --- a/src/hb-cairo.cc +++ b/src/hb-cairo.cc @@ -577,12 +577,9 @@ hb_cairo_render_color_glyph (cairo_scaled_font_t *scaled_font, hb_color_t color = HB_COLOR (0, 0, 0, 255); cairo_pattern_t *pattern = cairo_get_source (cr); - if (cairo_pattern_get_type (pattern) == CAIRO_PATTERN_TYPE_SOLID) - { - double r, g, b, a; - cairo_pattern_get_rgba (pattern, &r, &g, &b, &a); + double r, g, b, a; + if (cairo_pattern_get_rgba (pattern, &r, &g, &b, &a) == CAIRO_STATUS_SUCCESS) color = HB_COLOR ((int)(b * 255.), (int)(g * 255.), (int) (r * 255.), (int)(a * 255.)); - } hb_position_t x_scale, y_scale; hb_font_get_scale (font, &x_scale, &y_scale);