Merge through 9673 which includes the soft mask branch changes.

git-svn-id: http://svn.ghostscript.com/ghostscript/branches/icc_work@9674 a1074d23-0009-0410-80fe-cf8c14f379e6

1 files changed, 6 insertions, 0 deletions

diff --git a/gs/base/gstparam.h b/gs/base/gstparam.h
index a99da3adc..c0bc24f27 100644
--- a/gs/base/gstparam.h
+++ b/gs/base/gstparam.h
@@ -85,6 +85,8 @@ typedef struct gs_transparency_group_params_s {
     bool image_with_SMask;
     bool idle;
     uint mask_id;
+    int group_color_numcomps;
+    gs_transparency_color_t group_color;
 } gs_transparency_group_params_t;
 
 /* Define the parameter structure for a transparency mask. */
@@ -99,6 +101,7 @@ typedef enum {
 /* See the gx_transparency_mask_params_t type below */
 /* (Update gs_trans_mask_params_init if these change.) */
 typedef struct gs_transparency_mask_params_s {
+    const gs_color_space *ColorSpace;
     gs_transparency_mask_subtype_t subtype;
     int Background_components;
     float Background[GS_CLIENT_COLOR_MAX_COMPONENTS];
@@ -113,6 +116,9 @@ typedef struct gs_transparency_mask_params_s {
 /* The post clist version of transparency mask parameters */
 typedef struct gx_transparency_mask_params_s {
     gs_transparency_mask_subtype_t subtype;
+    bool SMask_is_CIE;
+    int group_color_numcomps;
+    gs_transparency_color_t group_color;
     int Background_components;
     float Background[GS_CLIENT_COLOR_MAX_COMPONENTS];
     float GrayBackground;