diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2021-04-26 18:10:56 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2021-04-26 19:49:13 +0100 |
| commit | 20610dc28ee3cf7e64ad46f11e9b96fb3befba00 (patch) | |
| tree | caf1ecd133beea5ab478858fc8f022081912ab89 /devices/gdevccr.c | |
| parent | edd20b3b8c3c1a7117dd5dbee0b54cd1de7838bf (diff) | |
| download | ghostpdl-20610dc28ee3cf7e64ad46f11e9b96fb3befba00.tar.gz | |
Split initialize device proc into two.
The device initialize function currently performs 2 jobs. Firstly,
it fills out the device_procs. Secondly, it performs any minimal
initialization required by the device (typically none).
At various points in the code we want to be able to copy procs
from one 'prototype' device to another, so we call initialize
for that. This populates the device procs, but does other work
that typically requires a 'derived device' structure rather
than a vanilla gx_device to work in.
Accordingly, we split the job into two; initialize_device_procs
(the first part) and initialize_device (the second part). The
initialize_device_procs function will set up the initialize_device
function pointer along with the rest if required.
Diffstat (limited to 'devices/gdevccr.c')
| -rw-r--r-- | devices/gdevccr.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/devices/gdevccr.c b/devices/gdevccr.c index c0e05a6b8..06b375c90 100644 --- a/devices/gdevccr.c +++ b/devices/gdevccr.c @@ -96,15 +96,12 @@ static dev_proc_map_color_rgb(ccr_map_color_rgb); static dev_proc_print_page(ccr_print_page); /* The device procedures */ -static int -ccr_initialize(gx_device *dev) +static void +ccr_initialize_device_procs(gx_device *dev) { /* Since the print_page doesn't alter the device, this device can * print in the background */ - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, map_rgb_color, ccr_map_rgb_color); set_dev_proc(dev, map_color_rgb, ccr_map_color_rgb); @@ -114,13 +111,11 @@ ccr_initialize(gx_device *dev) * 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); - - return 0; } /* The device descriptors themselves */ gx_device_ccr far_data gs_ccr_device = - ccr_prn_device(ccr_initialize, "ccr", 0.2, 3, 8, 1, 1, + ccr_prn_device(ccr_initialize_device_procs, "ccr", 0.2, 3, 8, 1, 1, ccr_print_page); /* ------ Color mapping routines ------ */ |