summaryrefslogtreecommitdiff
path: root/base/gdevp14.h
diff options
context:
space:
mode:
authorMichael Vrhel <michael.vrhel@artifex.com>2020-03-27 14:46:05 -0700
committerMichael Vrhel <michael.vrhel@artifex.com>2020-03-27 14:46:05 -0700
commitd12d2085b5bd08ca1e813d97f3f7f7e630e791a0 (patch)
tree56172749b47c14c26f9f98df58e0f61f1107632f /base/gdevp14.h
parent1241ea6848d254de9a9dbcb8c8edf10a59761d1d (diff)
downloadghostpdl-d12d2085b5bd08ca1e813d97f3f7f7e630e791a0.tar.gz
Squashed commit of the opacity_shape branch
This commit removes shape.alpha and opacity.alpha from the graphic state. This involved removal of methods in the postscript based PDF interpreter, changes in the pdf14 device, changes in pdfwrite, the XPS interpreter, and the PS transparency test file that is present in examples and on the cluster. The goal of this commit was to avoid confusion and conflicts between shape.alpha opacity.alpha and the stroke and fill alpha values (CA ca). This change resulted in progressions in the XPS file. There were changes in a couple PDF files that required some investigation. In particular, the change in the dashed lines of Bug694981.pdf. Robin and I looked at this. Robin determined it was due to differences in stroke_add and stroke_fill not giving identical results. In the end, the new output looks closer the what AR provides.
Diffstat (limited to 'base/gdevp14.h')
-rw-r--r--base/gdevp14.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/gdevp14.h b/base/gdevp14.h
index e4d4dfaae..ef1fd6b58 100644
--- a/base/gdevp14.h
+++ b/base/gdevp14.h
@@ -137,6 +137,7 @@ struct pdf14_buf_s {
bool isolated;
bool knockout;
uint16_t alpha;
+ uint16_t opacity;
uint16_t shape;
gs_blend_mode_t blend_mode;
int num_spots; /* helpful when going between Gray+spots, RGB+spots, CMYK+spots */
@@ -208,6 +209,7 @@ typedef struct pdf14_device_s {
pdf14_ctx *ctx;
pdf14_smaskcolor_t *smaskcolor;
+ bool ais;
float opacity;
float shape;
float alpha; /* alpha = opacity * shape */