summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Watts <Robin.Watts@artifex.com>2021-06-18 12:56:34 +0100
committerRobin Watts <Robin.Watts@artifex.com>2021-06-18 13:18:36 +0100
commit44274c6d561826a1456acc5187c44ede29c30e5a (patch)
treea8ea0eb9f78cd805d954261039304791a7182e11
parentbec912881e7e280c1047bd78c740c6994c8dd858 (diff)
downloadghostpdl-44274c6d561826a1456acc5187c44ede29c30e5a.tar.gz
Strip out map_rgb_alpha_color.
No longer used.
-rw-r--r--base/gdevbbox.c1
-rw-r--r--base/gdevdflt.c2
-rw-r--r--base/gdevhit.c1
-rw-r--r--base/gdevmem.c1
-rw-r--r--base/gdevnfwd.c17
-rw-r--r--base/gdevprn.c1
-rw-r--r--base/gdevrops.c1
-rw-r--r--base/gdevsclass.c10
-rw-r--r--base/gdevsclass.h1
-rw-r--r--base/gxclip.c1
-rw-r--r--base/gxclip2.c1
-rw-r--r--base/gxclipm.c1
-rw-r--r--base/gxclist.c1
-rw-r--r--base/gxcmap.c12
-rw-r--r--base/gxcmap.h3
-rw-r--r--base/gxdevcli.h10
-rw-r--r--base/gxdevice.h2
-rw-r--r--devices/gdevdsp.c1
-rw-r--r--devices/gdevtrac.c10
-rw-r--r--devices/gdevxalt.c16
20 files changed, 4 insertions, 89 deletions
diff --git a/base/gdevbbox.c b/base/gdevbbox.c
index bea6728a8..d93a00837 100644
--- a/base/gdevbbox.c
+++ b/base/gdevbbox.c
@@ -244,7 +244,6 @@ gx_device_bbox_init(gx_device_bbox * dev, gx_device * target, gs_memory_t *mem)
set_dev_proc(dev, map_rgb_color, gx_forward_map_rgb_color);
set_dev_proc(dev, map_color_rgb, gx_forward_map_color_rgb);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_color_mapping_procs, gx_forward_get_color_mapping_procs);
set_dev_proc(dev, get_color_comp_index, gx_forward_get_color_comp_index);
set_dev_proc(dev, encode_color, gx_forward_encode_color);
diff --git a/base/gdevdflt.c b/base/gdevdflt.c
index 126716579..8d054d6a7 100644
--- a/base/gdevdflt.c
+++ b/base/gdevdflt.c
@@ -601,7 +601,6 @@ gx_device_fill_in_procs(register gx_device * dev)
fill_dev_proc(dev, get_params, gx_default_get_params);
fill_dev_proc(dev, put_params, gx_default_put_params);
/* see below for map_cmyk_color */
- fill_dev_proc(dev, map_rgb_alpha_color, gx_default_map_rgb_alpha_color);
fill_dev_proc(dev, get_page_device, gx_default_get_page_device);
fill_dev_proc(dev, get_alpha_bits, gx_default_get_alpha_bits);
fill_dev_proc(dev, copy_alpha, gx_default_copy_alpha);
@@ -1212,7 +1211,6 @@ int gx_copy_device_procs(gx_device *dest, const gx_device *src, const gx_device
set_dev_proc(dest, get_params, dev_proc(&prototype, get_params));
set_dev_proc(dest, put_params, dev_proc(&prototype, put_params));
set_dev_proc(dest, map_cmyk_color, dev_proc(&prototype, map_cmyk_color));
- set_dev_proc(dest, map_rgb_alpha_color, dev_proc(&prototype, map_rgb_alpha_color));
set_dev_proc(dest, get_page_device, dev_proc(&prototype, get_page_device));
set_dev_proc(dest, get_alpha_bits, dev_proc(&prototype, get_alpha_bits));
set_dev_proc(dest, copy_alpha, dev_proc(&prototype, copy_alpha));
diff --git a/base/gdevhit.c b/base/gdevhit.c
index d3c220a7a..d56b34723 100644
--- a/base/gdevhit.c
+++ b/base/gdevhit.c
@@ -37,7 +37,6 @@ hit_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, map_rgb_color, gx_default_map_rgb_color);
set_dev_proc(dev, map_color_rgb, gx_default_map_color_rgb);
set_dev_proc(dev, map_cmyk_color, gx_default_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_default_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_default_get_page_device);
set_dev_proc(dev, get_alpha_bits, gx_default_get_alpha_bits);
set_dev_proc(dev, fill_path, gx_default_fill_path);
diff --git a/base/gdevmem.c b/base/gdevmem.c
index 01c3a93e2..cab15c530 100644
--- a/base/gdevmem.c
+++ b/base/gdevmem.c
@@ -888,7 +888,6 @@ void mem_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, close_device, mem_close);
set_dev_proc(dev, get_params, gx_default_get_params);
set_dev_proc(dev, put_params, gx_default_put_params);
- set_dev_proc(dev, map_rgb_alpha_color, gx_default_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
set_dev_proc(dev, get_alpha_bits, gx_default_get_alpha_bits);
set_dev_proc(dev, fill_path, gx_default_fill_path);
diff --git a/base/gdevnfwd.c b/base/gdevnfwd.c
index a87be02cc..60a4735b9 100644
--- a/base/gdevnfwd.c
+++ b/base/gdevnfwd.c
@@ -68,7 +68,6 @@ gx_device_forward_fill_in_procs(register gx_device_forward * dev)
fill_dev_proc(dev, get_params, gx_forward_get_params);
fill_dev_proc(dev, put_params, gx_forward_put_params);
fill_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- fill_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
fill_dev_proc(dev, get_page_device, gx_forward_get_page_device);
fill_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits);
/* NOT copy_alpha */
@@ -118,7 +117,6 @@ gx_device_forward_color_procs(gx_device_forward * dev)
set_dev_proc(dev, map_rgb_color, gx_forward_map_rgb_color);
set_dev_proc(dev, map_color_rgb, gx_forward_map_color_rgb);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_color_mapping_procs, gx_forward_get_color_mapping_procs);
set_dev_proc(dev, get_color_comp_index, gx_forward_get_color_comp_index);
set_dev_proc(dev, encode_color, gx_forward_encode_color);
@@ -308,19 +306,6 @@ gx_forward_map_cmyk_color(gx_device * dev, const gx_color_value cv[])
dev_proc(tdev, map_cmyk_color)(tdev, cv));
}
-gx_color_index
-gx_forward_map_rgb_alpha_color(gx_device * dev, gx_color_value r,
- gx_color_value g, gx_color_value b,
- gx_color_value alpha)
-{
- gx_device_forward * const fdev = (gx_device_forward *)dev;
- gx_device *tdev = fdev->target;
-
- return (tdev == 0 ?
- gx_default_map_rgb_alpha_color(dev, r, g, b, alpha) :
- dev_proc(tdev, map_rgb_alpha_color)(tdev, r, g, b, alpha));
-}
-
gx_device *
gx_forward_get_page_device(gx_device * dev)
{
@@ -979,7 +964,6 @@ null_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, gx_forward_get_params);
set_dev_proc(dev, put_params, null_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, copy_alpha, null_copy_alpha);
set_dev_proc(dev, fill_path, null_fill_path);
set_dev_proc(dev, stroke_path, null_stroke_path);
@@ -1208,7 +1192,6 @@ void gx_forward_device_initialize_procs(gx_device *dev)
fill_dev_proc(dev, get_params, gx_forward_get_params);
fill_dev_proc(dev, put_params, gx_forward_put_params);
fill_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- fill_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
fill_dev_proc(dev, get_page_device, gx_forward_get_page_device);
fill_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits);
fill_dev_proc(dev, copy_alpha, gx_forward_copy_alpha);
diff --git a/base/gdevprn.c b/base/gdevprn.c
index 06e30cc6e..6bd2ecee3 100644
--- a/base/gdevprn.c
+++ b/base/gdevprn.c
@@ -474,7 +474,6 @@ gdev_prn_allocate(gx_device *pdev, gdev_space_params *new_space_params,
COPY_PROC(get_params);
COPY_PROC(put_params);
COPY_PROC(map_cmyk_color);
- COPY_PROC(map_rgb_alpha_color);
/* All printers are page devices, even if they didn't use the */
/* standard macros for generating their procedure vectors. */
set_dev_proc(ppdev, get_page_device, gx_page_device_get_page_device);
diff --git a/base/gdevrops.c b/base/gdevrops.c
index 2dcee430c..baad212f0 100644
--- a/base/gdevrops.c
+++ b/base/gdevrops.c
@@ -58,7 +58,6 @@ rop_texture_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, gx_forward_get_params);
set_dev_proc(dev, put_params, gx_forward_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
set_dev_proc(dev, copy_alpha, gx_no_copy_alpha);
set_dev_proc(dev, get_clipping_box, gx_forward_get_clipping_box);
diff --git a/base/gdevsclass.c b/base/gdevsclass.c
index 72b9bdce9..e83c11ea7 100644
--- a/base/gdevsclass.c
+++ b/base/gdevsclass.c
@@ -226,15 +226,6 @@ gx_color_index default_subclass_map_cmyk_color(gx_device *dev, const gx_color_va
return gx_default_map_cmyk_color(dev, cv);
}
-gx_color_index default_subclass_map_rgb_alpha_color(gx_device *dev, gx_color_value red, gx_color_value green, gx_color_value blue,
- gx_color_value alpha)
-{
- if (dev->child)
- return dev_proc(dev->child, map_rgb_alpha_color)(dev->child, red, green, blue, alpha);
- /* else */
- return gx_default_map_rgb_alpha_color(dev, red, green, blue, alpha);
-}
-
gx_device *default_subclass_get_page_device(gx_device *dev)
{
if (dev->child)
@@ -830,7 +821,6 @@ void default_subclass_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, default_subclass_get_params);
set_dev_proc(dev, put_params, default_subclass_put_params);
set_dev_proc(dev, map_cmyk_color, default_subclass_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, default_subclass_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, default_subclass_get_page_device);
set_dev_proc(dev, get_alpha_bits, default_subclass_get_alpha_bits);
set_dev_proc(dev, copy_alpha, default_subclass_copy_alpha);
diff --git a/base/gdevsclass.h b/base/gdevsclass.h
index b471f7c0a..178a794cb 100644
--- a/base/gdevsclass.h
+++ b/base/gdevsclass.h
@@ -41,7 +41,6 @@ dev_proc_copy_color(default_subclass_copy_color);
dev_proc_get_params(default_subclass_get_params);
dev_proc_put_params(default_subclass_put_params);
dev_proc_map_cmyk_color(default_subclass_map_cmyk_color);
-dev_proc_map_rgb_alpha_color(default_subclass_map_rgb_alpha_color);
dev_proc_get_page_device(default_subclass_get_page_device);
dev_proc_get_alpha_bits(default_subclass_get_alpha_bits);
dev_proc_copy_alpha(default_subclass_copy_alpha);
diff --git a/base/gxclip.c b/base/gxclip.c
index 61ff2166b..c5d19197b 100644
--- a/base/gxclip.c
+++ b/base/gxclip.c
@@ -62,7 +62,6 @@ clipper_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, gx_forward_get_params);
set_dev_proc(dev, put_params, gx_forward_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
set_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits);
set_dev_proc(dev, copy_alpha, clip_copy_alpha);
diff --git a/base/gxclip2.c b/base/gxclip2.c
index 1b3424a01..80a20e447 100644
--- a/base/gxclip2.c
+++ b/base/gxclip2.c
@@ -51,7 +51,6 @@ tile_clipper_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, gx_forward_get_params);
set_dev_proc(dev, put_params, gx_forward_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
set_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits);
set_dev_proc(dev, copy_alpha, tile_clip_copy_alpha);
diff --git a/base/gxclipm.c b/base/gxclipm.c
index 34ef574cb..b741bc91b 100644
--- a/base/gxclipm.c
+++ b/base/gxclipm.c
@@ -49,7 +49,6 @@ mask_clip_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, gx_forward_get_params);
set_dev_proc(dev, put_params, gx_forward_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
set_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits);
set_dev_proc(dev, copy_alpha, mask_clip_copy_alpha);
diff --git a/base/gxclist.c b/base/gxclist.c
index b07ba20df..7a12d00af 100644
--- a/base/gxclist.c
+++ b/base/gxclist.c
@@ -142,7 +142,6 @@ clist_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, gx_forward_get_params);
set_dev_proc(dev, put_params, gx_forward_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, gx_forward_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
set_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits);
set_dev_proc(dev, copy_alpha, clist_copy_alpha);
diff --git a/base/gxcmap.c b/base/gxcmap.c
index 8e007c18a..65bdfb009 100644
--- a/base/gxcmap.c
+++ b/base/gxcmap.c
@@ -509,9 +509,6 @@ static cmap_proc_rgb(cmap_rgb_direct);
static cmap_proc_cmyk(cmap_cmyk_direct);
/* Procedure names are only guaranteed unique to 23 characters.... */
-static cmap_proc_rgb_alpha(cmap_rgb_alpha_halftoned);
-static cmap_proc_rgb_alpha(cmap_rgb_alpha_direct);
-
static cmap_proc_separation(cmap_separation_halftoned);
static cmap_proc_separation(cmap_separation_direct);
@@ -1986,15 +1983,6 @@ cmyk_16bit_map_color_cmyk(gx_device * dev, gx_color_index color,
/* Default mapping between RGB+alpha and RGB. */
-gx_color_index
-gx_default_map_rgb_alpha_color(gx_device * dev,
- gx_color_value r, gx_color_value g, gx_color_value b, gx_color_value alpha)
-{ /* Colors have been premultiplied: we don't need to do it here. */
- gx_color_value cv[3];
- cv[0] = r; cv[1] = g; cv[2] = b;
- return (*dev_proc(dev, map_rgb_color))(dev, cv);
-}
-
int
gx_default_map_color_rgb_alpha(gx_device * dev, gx_color_index color,
gx_color_value prgba[4])
diff --git a/base/gxcmap.h b/base/gxcmap.h
index 23286dbac..4197a48d3 100644
--- a/base/gxcmap.h
+++ b/base/gxcmap.h
@@ -38,9 +38,6 @@
void proc(frac, frac, frac, frac, gx_device_color *,\
const gs_gstate *, gx_device *, gs_color_select_t,\
const gs_color_space *)
-#define cmap_proc_rgb_alpha(proc)\
- void proc(frac, frac, frac, frac, gx_device_color *,\
- const gs_gstate *, gx_device *, gs_color_select_t)
#define cmap_proc_separation(proc)\
void proc(frac, gx_device_color *, const gs_gstate *,\
gx_device *, gs_color_select_t, const gs_color_space *)
diff --git a/base/gxdevcli.h b/base/gxdevcli.h
index 9000ef1c3..d1549f0c6 100644
--- a/base/gxdevcli.h
+++ b/base/gxdevcli.h
@@ -942,15 +942,6 @@ typedef enum FILTER_FLAGS {
#define dev_proc_map_cmyk_color(proc)\
dev_t_proc_map_cmyk_color(proc, gx_device)
- /* Added in release 2.7.1 */
-
-#define dev_t_proc_map_rgb_alpha_color(proc, dev_t)\
- gx_color_index proc(dev_t *dev,\
- gx_color_value red, gx_color_value green, gx_color_value blue,\
- gx_color_value alpha)
-#define dev_proc_map_rgb_alpha_color(proc)\
- dev_t_proc_map_rgb_alpha_color(proc, gx_device)
-
/* Added in release 2.8.1 */
#define dev_t_proc_get_page_device(proc, dev_t)\
@@ -1476,7 +1467,6 @@ typedef struct {
dev_t_proc_get_params((*get_params), dev_t);\
dev_t_proc_put_params((*put_params), dev_t);\
dev_t_proc_map_cmyk_color((*map_cmyk_color), dev_t);\
- dev_t_proc_map_rgb_alpha_color((*map_rgb_alpha_color), dev_t);\
dev_t_proc_get_page_device((*get_page_device), dev_t);\
dev_t_proc_get_alpha_bits((*get_alpha_bits), dev_t);\
dev_t_proc_copy_alpha((*copy_alpha), dev_t);\
diff --git a/base/gxdevice.h b/base/gxdevice.h
index 76d0198b4..06b7339e8 100644
--- a/base/gxdevice.h
+++ b/base/gxdevice.h
@@ -257,7 +257,6 @@ dev_proc_copy_color(gx_default_copy_color);
dev_proc_get_params(gx_default_get_params);
dev_proc_put_params(gx_default_put_params);
dev_proc_map_cmyk_color(gx_default_map_cmyk_color);
-dev_proc_map_rgb_alpha_color(gx_default_map_rgb_alpha_color);
dev_proc_get_page_device(gx_default_get_page_device); /* returns NULL */
dev_proc_get_page_device(gx_page_device_get_page_device); /* returns dev */
dev_proc_get_alpha_bits(gx_default_get_alpha_bits);
@@ -358,7 +357,6 @@ dev_proc_copy_color(gx_forward_copy_color);
dev_proc_get_params(gx_forward_get_params);
dev_proc_put_params(gx_forward_put_params);
dev_proc_map_cmyk_color(gx_forward_map_cmyk_color);
-dev_proc_map_rgb_alpha_color(gx_forward_map_rgb_alpha_color);
dev_proc_get_page_device(gx_forward_get_page_device);
#define gx_forward_get_alpha_bits gx_default_get_alpha_bits
dev_proc_copy_alpha(gx_forward_copy_alpha);
diff --git a/devices/gdevdsp.c b/devices/gdevdsp.c
index 11bd0f91d..13730b3da 100644
--- a/devices/gdevdsp.c
+++ b/devices/gdevdsp.c
@@ -1745,7 +1745,6 @@ display_alloc_bitmap(gx_device_display * ddev, gx_device * param_dev)
COPY_PROC(get_params);
COPY_PROC(put_params);
COPY_PROC(map_cmyk_color);
- COPY_PROC(map_rgb_alpha_color);
set_dev_proc(ddev, get_page_device, gx_page_device_get_page_device);
COPY_PROC(get_clipping_box);
COPY_PROC(map_color_rgb_alpha);
diff --git a/devices/gdevtrac.c b/devices/gdevtrac.c
index b85760c2a..c3ad6dc73 100644
--- a/devices/gdevtrac.c
+++ b/devices/gdevtrac.c
@@ -580,8 +580,7 @@ static void
tr_base_initialize_device_procs(gx_device *dev,
dev_proc_map_rgb_color((*map_rgb_color)),
dev_proc_map_color_rgb((*map_color_rgb)),
- dev_proc_map_cmyk_color((*map_cmyk_color)),
- dev_proc_map_rgb_alpha_color((*map_rgb_alpha_color)))
+ dev_proc_map_cmyk_color((*map_cmyk_color)))
{
set_dev_proc(dev, map_rgb_color, map_rgb_color);
set_dev_proc(dev, map_color_rgb, map_color_rgb);
@@ -589,7 +588,6 @@ tr_base_initialize_device_procs(gx_device *dev,
set_dev_proc(dev, copy_mono, trace_copy_mono);
set_dev_proc(dev, copy_color, trace_copy_color);
set_dev_proc(dev, map_cmyk_color, map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_page_device_get_page_device);
set_dev_proc(dev, copy_alpha, trace_copy_alpha);
set_dev_proc(dev, fill_path, trace_fill_path);
@@ -621,7 +619,7 @@ tr_mono_initialize_device_procs(gx_device *dev)
{
tr_base_initialize_device_procs(dev,
gx_default_b_w_map_rgb_color,
- gx_default_b_w_map_color_rgb, NULL, NULL);
+ gx_default_b_w_map_color_rgb, NULL);
}
@@ -634,7 +632,7 @@ tr_rgb_initialize_device_procs(gx_device *dev)
{
tr_base_initialize_device_procs(dev,
gx_default_rgb_map_rgb_color,
- gx_default_rgb_map_color_rgb, NULL, NULL);
+ gx_default_rgb_map_color_rgb, NULL);
}
const gx_device gs_tr_rgb_device = {
@@ -646,7 +644,7 @@ tr_cmyk_initialize_device_procs(gx_device *dev)
{
tr_base_initialize_device_procs(dev,
NULL, cmyk_1bit_map_color_rgb,
- cmyk_1bit_map_cmyk_color, NULL);
+ cmyk_1bit_map_cmyk_color);
}
const gx_device gs_tr_cmyk_device = {
diff --git a/devices/gdevxalt.c b/devices/gdevxalt.c
index fbc206144..816d04cf6 100644
--- a/devices/gdevxalt.c
+++ b/devices/gdevxalt.c
@@ -805,21 +805,6 @@ x_gray_alt_map_color(gx_device * dev, gx_color_index color,
/* Device procedures */
-/* We encode a complemented alpha value in the top 8 bits of the */
-/* device color. */
-static gx_color_index
-x_alpha_map_rgb_alpha_color(gx_device * dev,
- gx_color_value r, gx_color_value g, gx_color_value b, gx_color_value alpha)
-{
- gx_color_index color;
- gx_color_value cv[3];
- byte abyte = alpha >> (gx_color_value_bits - 8);
- cv[0] = r; cv[1] = g; cv[2] = b;
- color = gx_forward_map_rgb_color(dev, cv);
- return (abyte == 0 ? (gx_color_index)0xff << 24 :
- ((gx_color_index) (abyte ^ 0xff) << 24) + color);
-}
-
/* ---------------- Permuted RGB16/32 procedures ---------------- */
/* Device procedures */
@@ -846,7 +831,6 @@ rgbx_initialize_device_procs(gx_device *dev)
set_dev_proc(dev, get_params, x_wrap_get_params);
set_dev_proc(dev, put_params, x_wrap_put_params);
set_dev_proc(dev, map_cmyk_color, gx_forward_map_cmyk_color);
- set_dev_proc(dev, map_rgb_alpha_color, x_alpha_map_rgb_alpha_color);
set_dev_proc(dev, get_page_device, gx_forward_get_page_device);
}