diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2021-06-30 14:26:29 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2021-07-01 00:27:57 +0100 |
| commit | 6f683c37cfbd872980c4ba03f2eb8776642166e7 (patch) | |
| tree | 27d62f37498f3a200b3b4a2919e53705e4dcb52c | |
| parent | 8e1859c5fa8ff7af476e8317f8efc3f762c935cc (diff) | |
| download | ghostpdl-6f683c37cfbd872980c4ba03f2eb8776642166e7.tar.gz | |
Fix decode_color for gdev_prn_initialize_device_procs_cmyk1.
Also, remove lots of unnecessary setting of encode/decode to the
values that they have already been set to.
| -rw-r--r-- | base/gdevprn.c | 2 | ||||
| -rw-r--r-- | devices/gdevbmp.c | 12 | ||||
| -rw-r--r-- | devices/gdevpcx.c | 6 | ||||
| -rw-r--r-- | devices/gdevpdfimg.c | 6 |
4 files changed, 1 insertions, 25 deletions
diff --git a/base/gdevprn.c b/base/gdevprn.c index 07980c959..dcffd96a2 100644 --- a/base/gdevprn.c +++ b/base/gdevprn.c @@ -1828,7 +1828,7 @@ void gdev_prn_initialize_device_procs_cmyk1(gx_device *dev) set_dev_proc(dev, map_cmyk_color, cmyk_1bit_map_cmyk_color); set_dev_proc(dev, map_color_rgb, cmyk_1bit_map_color_rgb); set_dev_proc(dev, encode_color, cmyk_1bit_map_cmyk_color); - set_dev_proc(dev, decode_color, cmyk_1bit_map_color_rgb); + set_dev_proc(dev, decode_color, cmyk_1bit_map_color_cmyk); } void gdev_prn_initialize_device_procs_cmyk1_bg(gx_device *dev) diff --git a/devices/gdevbmp.c b/devices/gdevbmp.c index cd95709fa..845f5bcad 100644 --- a/devices/gdevbmp.c +++ b/devices/gdevbmp.c @@ -64,12 +64,6 @@ static void bmpsep1_initialize_device_procs(gx_device *dev) { gdev_prn_initialize_device_procs_cmyk1_bg(dev); - - /* The prn macros used in previous versions of the code leave - * encode_color and decode_color set to NULL (which are then rewritten - * by the system to the default. For compatibility we do the same. */ - set_dev_proc(dev, encode_color, NULL); - set_dev_proc(dev, decode_color, NULL); } const gx_device_printer gs_bmpsep1_device = { @@ -85,12 +79,6 @@ static void bmpsep8_initialize_device_procs(gx_device *dev) { gdev_prn_initialize_device_procs_cmyk8_bg(dev); - - /* The prn macros used in previous versions of the code leave - * encode_color and decode_color set to NULL (which are then rewritten - * by the system to the default. For compatibility we do the same. */ - set_dev_proc(dev, encode_color, NULL); - set_dev_proc(dev, decode_color, NULL); } const gx_device_printer gs_bmpsep8_device = { diff --git a/devices/gdevpcx.c b/devices/gdevpcx.c index caef9703f..696b2d257 100644 --- a/devices/gdevpcx.c +++ b/devices/gdevpcx.c @@ -170,12 +170,6 @@ static void pcxcmyk_initialize_device_procs(gx_device *dev) { gdev_prn_initialize_device_procs_cmyk1_bg(dev); - - /* The prn macros used in previous versions of the code leave - * encode_color and decode_color set to NULL (which are then rewritten - * by the system to the default. For compatibility we do the same. */ - set_dev_proc(dev, encode_color, NULL); - set_dev_proc(dev, decode_color, NULL); } const gx_device_printer gs_pcxcmyk_device = diff --git a/devices/gdevpdfimg.c b/devices/gdevpdfimg.c index 6fe831e1b..74a0d69d6 100644 --- a/devices/gdevpdfimg.c +++ b/devices/gdevpdfimg.c @@ -141,12 +141,6 @@ pdfimage32_initialize_device_procs(gx_device *dev) set_dev_proc(dev, close_device, pdf_image_close); set_dev_proc(dev, get_params, pdf_image_get_params_downscale_cmyk); set_dev_proc(dev, put_params, pdf_image_put_params_downscale_cmyk); - - /* The prn macros used in previous versions of the code leave - * encode_color and decode_color set to NULL (which are then rewritten - * by the system to the default. For compatibility we do the same. */ - set_dev_proc(dev, encode_color, NULL); - set_dev_proc(dev, decode_color, NULL); } const gx_device_pdf_image gs_pdfimage32_device = { |