diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-08-03 03:13:35 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-08-03 03:13:35 +0000 |
commit | c33e272822020833a15b09bf15f59a2e078b6953 (patch) | |
tree | 48f86a0d589927b0ee388c0e24ce3185f4576774 /pango/pango-markup.c | |
parent | 98b3ff0b967c7ecb53e119e914d6e8cb65584ad3 (diff) | |
parent | 77c8408675c6e8aaded386932aad66004004060a (diff) | |
download | pango-c33e272822020833a15b09bf15f59a2e078b6953.tar.gz |
Merge branch 'parse-color-with-alpha' into 'master'
Export pango_parse_color_with_alpha
See merge request GNOME/pango!215
Diffstat (limited to 'pango/pango-markup.c')
-rw-r--r-- | pango/pango-markup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pango-markup.c b/pango/pango-markup.c index a67e10fd..b74c1ad4 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -1199,7 +1199,7 @@ span_parse_color (const char *attr_name, int line_number, GError **error) { - if (!_pango_color_parse_with_alpha (color, alpha, attr_val)) + if (!pango_color_parse_with_alpha (color, alpha, attr_val)) { g_set_error (error, G_MARKUP_ERROR, @@ -1622,7 +1622,7 @@ span_parse_func (MarkupData *md G_GNUC_UNUSED, goto error; add_attribute (tag, pango_attr_foreground_new (color.red, color.green, color.blue)); - if (alpha != 0) + if (alpha != 0xffff) add_attribute (tag, pango_attr_foreground_alpha_new (alpha)); } @@ -1635,7 +1635,7 @@ span_parse_func (MarkupData *md G_GNUC_UNUSED, goto error; add_attribute (tag, pango_attr_background_new (color.red, color.green, color.blue)); - if (alpha != 0) + if (alpha != 0xffff) add_attribute (tag, pango_attr_background_alpha_new (alpha)); } |