2 files changed, 15 insertions, 1 deletions

diff --git a/base/gdevp14.c b/base/gdevp14.c
index 1335feed6..76b76ddb2 100644
--- a/base/gdevp14.c
+++ b/base/gdevp14.c
@@ -3083,6 +3083,7 @@ pdf14_fill_path(gx_device *dev,	const gs_gstate *pgs,
                 }
             }
 #endif
+            pdf14_set_marking_params(dev, &new_pgs);
             code = pdf14_tile_pattern_fill(dev, &new_pgs, ppath,
                 params, pdcolor, pcpath);
             new_pgs.trans_device = NULL;
@@ -4039,7 +4040,8 @@ pdf14_tile_pattern_fill(gx_device * pdev, const gs_gstate * pgs,
         }
         blend_mode = ptile->blending_mode;
         memcpy(&save_pdf14_dev, p14dev, sizeof(pdf14_device));
-        code = pdf14_push_transparency_group(p14dev->ctx, &rect, 1, 0, 65535, 65535,
+        code = pdf14_push_transparency_group(p14dev->ctx, &rect, 1, 0, (uint16_t)floor(65535 * p14dev->alpha + 0.5),
+                                            (uint16_t)floor(65535 * p14dev->shape + 0.5),
                                              blend_mode, 0, 0, n_chan_tile-1,
                                              false, NULL, NULL, pgs_noconst,
                                              pdev);
diff --git a/xps/xpstile.c b/xps/xpstile.c
index 598b6e171..d278bd8fe 100644
--- a/xps/xpstile.c
+++ b/xps/xpstile.c
@@ -327,6 +327,7 @@ xps_parse_tiling_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict,
         gs_client_color gscolor;
         gs_color_space *cs;
         bool sa;
+        float opacity;
 
         closure.ctx = ctx;
         closure.base_uri = base_uri;
@@ -384,7 +385,18 @@ xps_parse_tiling_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict,
         gs_setstrokeadjust(ctx->pgs, false);
         gs_makepattern(&gscolor, &gspat, &transform, ctx->pgs, NULL);
         gs_setpattern(ctx->pgs, &gscolor);
+        /* If the tiling brush has an opacity, it was already set in the group
+           that we are filling.  Reset to 1.0 here to avoid double application
+           when the tiling actually occurs */
+        opacity = ctx->pgs->opacity.alpha;
+        gs_setopacityalpha(ctx->pgs, 1.0);
+        gs_setfillconstantalpha(ctx->pgs, 1.0);
+        gs_setstrokeconstantalpha(ctx->pgs, 1.0);
         xps_fill(ctx);
+        gs_setopacityalpha(ctx->pgs, opacity);
+        gs_setfillconstantalpha(ctx->pgs, opacity);
+        gs_setstrokeconstantalpha(ctx->pgs, opacity);
+
         gs_setstrokeadjust(ctx->pgs, sa);
         gsicc_adjust_profile_rc(cs->cmm_icc_profile_data, -1, "xps_parse_tiling_brush");