summaryrefslogtreecommitdiff
path: root/xps
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2012-03-14 17:38:53 +0100
committerTor Andersson <tor.andersson@artifex.com>2012-03-14 17:40:20 +0100
commit1d9a98f81e0cb90fcce893f11cc6dcb66323b242 (patch)
treefd2627019c3f791f6ca4b5e04d7c89b95c9efc33 /xps
parentc5b8433f7c941bf56019ae9fd2db7a78a77a587f (diff)
downloadmupdf-1d9a98f81e0cb90fcce893f11cc6dcb66323b242.tar.xz
Combine Opacity attribute with alpha from #RGBA specified colors.
Diffstat (limited to 'xps')
-rw-r--r--xps/xps_glyphs.c2
-rw-r--r--xps/xps_path.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/xps/xps_glyphs.c b/xps/xps_glyphs.c
index 8a1b7fb8..f75815f0 100644
--- a/xps/xps_glyphs.c
+++ b/xps/xps_glyphs.c
@@ -589,7 +589,7 @@ xps_parse_glyphs(xps_document *doc, fz_matrix ctm,
xps_parse_color(doc, base_uri, fill_att, &colorspace, samples);
if (fill_opacity_att)
- samples[0] = fz_atof(fill_opacity_att);
+ samples[0] *= fz_atof(fill_opacity_att);
xps_set_color(doc, colorspace, samples);
fz_fill_text(doc->dev, text, ctm,
diff --git a/xps/xps_path.c b/xps/xps_path.c
index baf71bc4..e368776d 100644
--- a/xps/xps_path.c
+++ b/xps/xps_path.c
@@ -1016,7 +1016,7 @@ xps_parse_path(xps_document *doc, fz_matrix ctm, char *base_uri, xps_resource *d
{
xps_parse_color(doc, base_uri, fill_att, &colorspace, samples);
if (fill_opacity_att)
- samples[0] = fz_atof(fill_opacity_att);
+ samples[0] *= fz_atof(fill_opacity_att);
xps_set_color(doc, colorspace, samples);
fz_fill_path(doc->dev, path, fill_rule == 0, ctm,
@@ -1034,7 +1034,7 @@ xps_parse_path(xps_document *doc, fz_matrix ctm, char *base_uri, xps_resource *d
{
xps_parse_color(doc, base_uri, stroke_att, &colorspace, samples);
if (stroke_opacity_att)
- samples[0] = fz_atof(stroke_opacity_att);
+ samples[0] *= fz_atof(stroke_opacity_att);
xps_set_color(doc, colorspace, samples);
fz_stroke_path(doc->dev, stroke_path, &stroke, ctm,