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 | |
| 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')
78 files changed, 774 insertions, 1332 deletions
diff --git a/devices/gdev3852.c b/devices/gdev3852.c index 9978ee08f..f60b399b5 100644 --- a/devices/gdev3852.c +++ b/devices/gdev3852.c @@ -39,13 +39,10 @@ Modified by L. Peter Deutsch <ghost@aladdin.com> 1999-01-10 to remove _ss /* Should = 96 (KMG) */ #define LINE_SIZE ((X_DPI * 86 / 10 + 63) / 64 * 8) -static int -jetp3852_initialize(gx_device *dev) +static void +jetp3852_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs(dev); set_dev_proc(dev, output_page, gdev_prn_bg_output_page); set_dev_proc(dev, map_rgb_color, gdev_pcl_3bit_map_rgb_color); @@ -56,15 +53,13 @@ jetp3852_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 descriptor */ static dev_proc_print_page(jetp3852_print_page); /* Since the 'print_page' does not change the device, this device can print in the background */ const gx_device_printer far_data gs_jetp3852_device = - prn_device(jetp3852_initialize, "jetp3852", + prn_device(jetp3852_initialize_device_procs, "jetp3852", 86, /* width_10ths, 8.6" (?) */ 110, /* height_10ths, 11" */ X_DPI, Y_DPI, diff --git a/devices/gdev4081.c b/devices/gdev4081.c index c33e8eccc..fd72fdff6 100644 --- a/devices/gdev4081.c +++ b/devices/gdev4081.c @@ -23,7 +23,7 @@ static dev_proc_print_page(r4081_print_page); const gx_device_printer far_data gs_r4081_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, "r4081", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "r4081", 85, /* width_10ths, 8.5" */ 110, /* height_10ths, 11" */ X_DPI, Y_DPI, diff --git a/devices/gdev4693.c b/devices/gdev4693.c index 73fc94e4f..b7d706d1e 100644 --- a/devices/gdev4693.c +++ b/devices/gdev4693.c @@ -22,13 +22,10 @@ static dev_proc_print_page(t4693d_print_page); static dev_proc_map_rgb_color(gdev_t4693d_map_rgb_color); static dev_proc_map_color_rgb(gdev_t4693d_map_color_rgb); -static int -t4693d_initialize(gx_device *dev) +static void +t4693d_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs(dev); set_dev_proc(dev, output_page, gdev_prn_bg_output_page); set_dev_proc(dev, map_rgb_color, gdev_t4693d_map_rgb_color); @@ -39,13 +36,11 @@ t4693d_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; } /* Since the print_page doesn't alter the device, this device can print in the background */ #define t4693d_prn_device(name,depth,max_rgb) {prn_device_body( \ - gx_device_printer,t4693d_initialize,name, \ + gx_device_printer,t4693d_initialize_device_procs,name, \ WIDTH_10THS, HEIGHT_10THS, X_DPI, Y_DPI, 0.25, 0.25, 0.25, 0.25, \ 3,depth,max_rgb,max_rgb,max_rgb + 1,max_rgb + 1, \ t4693d_print_page)} diff --git a/devices/gdev8510.c b/devices/gdev8510.c index f0c6620ec..534435c04 100644 --- a/devices/gdev8510.c +++ b/devices/gdev8510.c @@ -25,7 +25,7 @@ static dev_proc_print_page(m8510_print_page); const gx_device_printer far_data gs_m8510_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, "m8510", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "m8510", 85, /* width_10ths, 8.5" */ 110, /* height_10ths, 11" */ 160, /* x_dpi */ diff --git a/devices/gdevatx.c b/devices/gdevatx.c index 4cfb62d0a..b3f7497ce 100644 --- a/devices/gdevatx.c +++ b/devices/gdevatx.c @@ -43,7 +43,7 @@ static dev_proc_print_page(atx24_print_page); static dev_proc_print_page(atx38_print_page); #define ATX_DEVICE(dname, w10, h10, dpi, lrm, btm, print_page)\ - prn_device_margins(gdev_prn_initialize_mono, dname,\ + prn_device_margins(gdev_prn_initialize_device_procs_mono, dname,\ w10, h10, dpi, dpi, 0, 0,\ lrm, btm, lrm, btm, 1, print_page) diff --git a/devices/gdevbit.c b/devices/gdevbit.c index 8ad6d4393..e96b12f58 100644 --- a/devices/gdevbit.c +++ b/devices/gdevbit.c @@ -57,13 +57,10 @@ static dev_proc_put_image(bit_put_image); static dev_proc_dev_spec_op(bit_dev_spec_op); dev_proc_get_color_comp_index(gx_default_DevRGB_get_color_comp_index); -static int -bit_initialize(gx_device *dev) +static void +bit_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, map_color_rgb, bit_map_color_rgb); set_dev_proc(dev, get_params, bit_get_params); @@ -76,8 +73,6 @@ bit_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; } /* @@ -97,82 +92,64 @@ struct gx_device_bit_s { }; typedef struct gx_device_bit_s gx_device_bit; -static int -bitmono_initialize(gx_device *dev) +static void +bitmono_initialize_device_procs(gx_device *dev) { - int code = bit_initialize(dev); - - if (code < 0) - return code; + bit_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, bit_mono_map_color); set_dev_proc(dev, map_cmyk_color, bit_mono_map_color); set_dev_proc(dev, encode_color, bit_mono_map_color); - - return 0; } const gx_device_bit gs_bit_device = -{prn_device_body(gx_device_bit, bitmono_initialize, "bit", +{prn_device_body(gx_device_bit, bitmono_initialize_device_procs, "bit", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ 1, 1, 1, 0, 2, 1, bit_print_page) }; -static int -bitrgb_initialize(gx_device *dev) +static void +bitrgb_initialize_device_procs(gx_device *dev) { - int code = bit_initialize(dev); - - if (code < 0) - return code; + bit_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, bitrgb_rgb_map_rgb_color); set_dev_proc(dev, map_cmyk_color, bitrgb_rgb_map_rgb_color); set_dev_proc(dev, encode_color, bitrgb_rgb_map_rgb_color); - - return 0; } const gx_device_bit gs_bitrgb_device = -{prn_device_body(gx_device_bit, bitrgb_initialize, "bitrgb", +{prn_device_body(gx_device_bit, bitrgb_initialize_device_procs, "bitrgb", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ 3, 4, 1, 1, 2, 2, bit_print_page) }; -static int -bitcmyk_initialize(gx_device *dev) +static void +bitcmyk_initialize_device_procs(gx_device *dev) { - int code = bit_initialize(dev); - - if (code < 0) - return code; + bit_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, bit_map_cmyk_color); set_dev_proc(dev, map_cmyk_color, bit_map_cmyk_color); set_dev_proc(dev, encode_color, bit_map_cmyk_color); - - return 0; } const gx_device_bit gs_bitcmyk_device = -{prn_device_body(gx_device_bit, bitcmyk_initialize, "bitcmyk", +{prn_device_body(gx_device_bit, bitcmyk_initialize_device_procs, "bitcmyk", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ 4, 4, 1, 1, 2, 2, bit_print_page) }; -static int -bitrgbtags_initialize(gx_device *dev) +static void +bitrgbtags_initialize_device_procs(gx_device *dev) { - int code = bit_initialize(dev); - - if (code < 0) - return code; + bit_initialize_device_procs(dev); set_dev_proc(dev, open_device, bittag_open); set_dev_proc(dev, map_rgb_color, bittag_rgb_map_rgb_color); @@ -186,14 +163,12 @@ bitrgbtags_initialize(gx_device *dev) set_dev_proc(dev, decode_color, bittag_map_color_rgb); set_dev_proc(dev, fillpage, bittag_fillpage); set_dev_proc(dev, put_image, bit_put_image); - - return 0; } const gx_device_bit gs_bitrgbtags_device = { sizeof(gx_device_bit), - bitrgbtags_initialize, + bitrgbtags_initialize_device_procs, "bitrgbtags", 0, /* memory */ &st_device_printer, diff --git a/devices/gdevbj10.c b/devices/gdevbj10.c index b11cb76b8..09dd38358 100644 --- a/devices/gdevbj10.c +++ b/devices/gdevbj10.c @@ -107,21 +107,16 @@ static dev_proc_open_device(bj200_open); static dev_proc_print_page(bj10e_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -bj200_initialize(gx_device *dev) +static void +bj200_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, bj200_open); - - return 0; } const gx_device_printer far_data gs_bj200_device = - prn_device(bj200_initialize, "bj200", + prn_device(bj200_initialize_device_procs, "bj200", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 360, /* x_dpi */ @@ -152,21 +147,16 @@ const gx_device_printer far_data gs_bj200_device = static dev_proc_open_device(bj10e_open); -static int -bj10e_initialize(gx_device *dev) +static void +bj10e_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, bj10e_open); - - return 0; } const gx_device_printer far_data gs_bj10e_device = - prn_device(bj10e_initialize, "bj10e", + prn_device(bj10e_initialize_device_procs, "bj10e", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 360, /* x_dpi */ diff --git a/devices/gdevbmp.c b/devices/gdevbmp.c index 9b28f0995..cd95709fa 100644 --- a/devices/gdevbmp.c +++ b/devices/gdevbmp.c @@ -27,7 +27,7 @@ static dev_proc_print_page(bmp_cmyk_print_page); const gx_device_printer gs_bmpmono_device = /* The print_page proc is compatible with allowing bg printing */ -prn_device(gdev_prn_initialize_mono_bg, "bmpmono", +prn_device(gdev_prn_initialize_device_procs_mono_bg, "bmpmono", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -37,25 +37,20 @@ prn_device(gdev_prn_initialize_mono_bg, "bmpmono", /* (Uses a fixed palette of 256 gray levels.) */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -bmpgray_initialize(gx_device *dev) +static void +bmpgray_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_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); - - return 0; } const gx_device_printer gs_bmpgray_device = { - prn_device_body(gx_device_printer, bmpgray_initialize, "bmpgray", + prn_device_body(gx_device_printer, bmpgray_initialize_device_procs, "bmpgray", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -65,25 +60,20 @@ const gx_device_printer gs_bmpgray_device = { /* 1-bit-per-plane separated CMYK color. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -bmpsep1_initialize(gx_device *dev) +static void +bmpsep1_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk1_bg(dev); - - if (code < 0) - return code; + 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); - - return 0; } const gx_device_printer gs_bmpsep1_device = { - prn_device_body(gx_device_printer, bmpsep1_initialize, "bmpsep1", + prn_device_body(gx_device_printer, bmpsep1_initialize_device_procs, "bmpsep1", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0,0,0,0, /* margins */ @@ -91,25 +81,20 @@ const gx_device_printer gs_bmpsep1_device = { }; /* 8-bit-per-plane separated CMYK color. */ -static int -bmpsep8_initialize(gx_device *dev) +static void +bmpsep8_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8_bg(dev); - - if (code < 0) - return code; + 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); - - return 0; } const gx_device_printer gs_bmpsep8_device = { - prn_device_body(gx_device_printer, bmpsep8_initialize, "bmpsep8", + prn_device_body(gx_device_printer, bmpsep8_initialize_device_procs, "bmpsep8", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0,0,0,0, /* margins */ @@ -119,12 +104,10 @@ const gx_device_printer gs_bmpsep8_device = { /* 4-bit planar (EGA/VGA-style) color. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -bmp16_initialize(gx_device *dev) +static void +bmp16_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8_bg(dev); - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk8_bg(dev); set_dev_proc(dev, map_rgb_color, pc_4bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, pc_4bit_map_color_rgb); @@ -134,12 +117,10 @@ bmp16_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; } const gx_device_printer gs_bmp16_device = { - prn_device_body(gx_device_printer, bmp16_initialize, "bmp16", + prn_device_body(gx_device_printer, bmp16_initialize_device_procs, "bmp16", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -150,12 +131,10 @@ const gx_device_printer gs_bmp16_device = { /* (Uses a fixed palette of 3,3,2 bits.) */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -bmp256_initialize(gx_device *dev) +static void +bmp256_initialize_device_procs(gx_device *dev) { - 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, pc_8bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, pc_8bit_map_color_rgb); @@ -165,12 +144,10 @@ bmp256_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; } const gx_device_printer gs_bmp256_device = { - prn_device_body(gx_device_printer, bmp256_initialize, "bmp256", + prn_device_body(gx_device_printer, bmp256_initialize_device_procs, "bmp256", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -180,12 +157,10 @@ const gx_device_printer gs_bmp256_device = { /* 24-bit color. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -bmp16m_initialize(gx_device *dev) +static void +bmp16m_initialize_device_procs(gx_device *dev) { - 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, bmp_map_16m_rgb_color); set_dev_proc(dev, map_color_rgb, bmp_map_16m_color_rgb); @@ -195,37 +170,30 @@ bmp16m_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; } const gx_device_printer gs_bmp16m_device = -prn_device(bmp16m_initialize, "bmp16m", +prn_device(bmp16m_initialize_device_procs, "bmp16m", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ 24, bmp_print_page); /* 32-bit CMYK color (outside the BMP specification). */ -static int -bmp32b_initialize(gx_device *dev) +static void +bmp32b_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8_bg(dev); - - if (code < 0) - return code; + 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); - - return 0; } const gx_device_printer gs_bmp32b_device = -prn_device(bmp32b_initialize, "bmp32b", +prn_device(bmp32b_initialize_device_procs, "bmp32b", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ 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 ------ */ diff --git a/devices/gdevcdj.c b/devices/gdevcdj.c index dd6e8f8f1..926ff3943 100644 --- a/devices/gdevcdj.c +++ b/devices/gdevcdj.c @@ -454,13 +454,10 @@ typedef struct { } /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -hp_colour_initialize(gx_device *dev) +static void +hp_colour_initialize_device_procs(gx_device *dev) { - 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, gdev_pcl_map_rgb_color); set_dev_proc(dev, map_color_rgb, gdev_pcl_map_color_rgb); @@ -472,44 +469,29 @@ hp_colour_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; } -static int -cdj500_initialize(gx_device *dev) +static void +cdj500_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, dj500c_open); - - return 0; } -static int -cdj550_initialize(gx_device *dev) +static void +cdj550_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, dj550c_open); - - return 0; } #ifdef USE_CDJ550_CMYK -static int -cdj550cmyk_initialize(gx_device *dev) +static void +cdj550cmyk_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, dj550c_open); set_dev_proc(dev, get_params, cdj_get_params); @@ -517,102 +499,67 @@ cdj550cmyk_initialize(gx_device *dev) set_dev_proc(dev, map_cmyk_color, gdev_cmyk_map_cmyk_color); set_dev_proc(dev, encode_color, gdev_cmyk_map_cmyk_color); set_dev_proc(dev, decode_color, gdev_cmyk_map_color_cmyk); - - return 0; } #endif -static int -dj505j_initialize(gx_device *dev) +static void +dj505j_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, dj505j_open); - - return 0; } -static int -dnj650c_initialize(gx_device *dev) +static void +dnj650c_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, dnj650c_open); - - return 0; } -static int -lj4dith_initialize(gx_device *dev) +static void +lj4dith_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, lj4dith_open); - - return 0; } -static int -pj_initialize(gx_device *dev) +static void +pj_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, pj_open); set_dev_proc(dev, get_params, gdev_prn_get_params); set_dev_proc(dev, put_params, pj_put_params); - - return 0; } -static int -pjxl_initialize(gx_device *dev) +static void +pjxl_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, pjxl_open); set_dev_proc(dev, get_params, pjxl_get_params); set_dev_proc(dev, put_params, pjxl_put_params); - - return 0; } -static int -pjxl300_initialize(gx_device *dev) +static void +pjxl300_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, pjxl300_open); set_dev_proc(dev, get_params, pjxl_get_params); set_dev_proc(dev, put_params, pjxl_put_params); - - return 0; } -static int -bjc_initialize(gx_device *dev) +static void +bjc_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, bjc_open); set_dev_proc(dev, get_params, bjc_get_params); @@ -620,94 +567,87 @@ bjc_initialize(gx_device *dev) set_dev_proc(dev, map_cmyk_color, gdev_cmyk_map_cmyk_color); set_dev_proc(dev, encode_color, gdev_cmyk_map_cmyk_color); set_dev_proc(dev, decode_color, gdev_cmyk_map_color_cmyk); - - return 0; } -static int -escp_initialize(gx_device *dev) +static void +escp_initialize_device_procs(gx_device *dev) { - int code = hp_colour_initialize(dev); - - if (code < 0) - return code; + hp_colour_initialize_device_procs(dev); set_dev_proc(dev, open_device, escp_open); set_dev_proc(dev, get_params, ep_get_params); set_dev_proc(dev, put_params, ep_put_params); - - return 0; } gx_device_cdj far_data gs_cdjmono_device = -cdj_device(cdj500_initialize, "cdjmono", 300, 300, 1, +cdj_device(cdj500_initialize_device_procs, "cdjmono", 300, 300, 1, dj500c_print_page, 4, 0, 1); gx_device_cdj far_data gs_cdeskjet_device = -cdj_device(cdj500_initialize, "cdeskjet", 300, 300, 24, +cdj_device(cdj500_initialize_device_procs, "cdeskjet", 300, 300, 24, dj500c_print_page, 4, 2, 1); gx_device_cdj far_data gs_cdjcolor_device = -cdj_device(cdj500_initialize, "cdjcolor", 300, 300, 24, +cdj_device(cdj500_initialize_device_procs, "cdjcolor", 300, 300, 24, dj500c_print_page, 4, 2, 1); gx_device_cdj far_data gs_cdj500_device = -cdj_device(cdj500_initialize, "cdj500", 300, 300, BITSPERPIXEL, +cdj_device(cdj500_initialize_device_procs, "cdj500", 300, 300, BITSPERPIXEL, dj500c_print_page, 4, 2, 1); gx_device_cdj far_data gs_cdj550_device = -cdj_device(cdj550_initialize, "cdj550", 300, 300, BITSPERPIXEL, +cdj_device(cdj550_initialize_device_procs, "cdj550", 300, 300, BITSPERPIXEL, dj550c_print_page, 0, 2, 1); #ifdef USE_CDJ550_CMYK gx_device_cdj far_data gs_cdj550cmyk_device = { - prn_cmyk_colour_device(cdj550cmyk_procs, "cdj550cmyk", 300, 300, + prn_cmyk_colour_device(cdj550cmyk_initialize_device_procs, "cdj550cmyk", 300, 300, BITSPERPIXEL, dj550c_print_page, 0), 2, 1 }; #endif gx_device_cdj far_data gs_picty180_device = -cdj_device(cdj550_initialize, "picty180", 300, 300, BITSPERPIXEL, +cdj_device(cdj550_initialize_device_procs, "picty180", 300, 300, BITSPERPIXEL, picty180_print_page, 0, 2, 1); gx_device_cdj far_data gs_dj505j_device = -cdj_device(dj505j_initialize, "dj505j", 300, 300, 1, +cdj_device(dj505j_initialize_device_procs, "dj505j", 300, 300, 1, dj505j_print_page, 4, 0, 1); gx_device_pj far_data gs_declj250_device = -pj_device(pj_initialize, "declj250", 180, 180, BITSPERPIXEL, +pj_device(pj_initialize_device_procs, "declj250", 180, 180, BITSPERPIXEL, declj250_print_page); gx_device_cdj far_data gs_dnj650c_device = -cdj_device(dnj650c_initialize, "dnj650c", 300, 300, BITSPERPIXEL, +cdj_device(dnj650c_initialize_device_procs, "dnj650c", 300, 300, BITSPERPIXEL, dnj650c_print_page, 0, 2, 1); gx_device_cdj far_data gs_lj4dith_device = -cdj_device(lj4dith_initialize, "lj4dith", 600, 600, 8, +cdj_device(lj4dith_initialize_device_procs, "lj4dith", 600, 600, 8, lj4dith_print_page, 4, 0, 1); gx_device_cdj far_data gs_lj4dithp_device = -cdj_device(lj4dith_initialize, "lj4dithp", 600, 600, 8, +cdj_device(lj4dith_initialize_device_procs, "lj4dithp", 600, 600, 8, lj4dithp_print_page, 4, 0, 1); gx_device_pj far_data gs_pj_device = -pj_device(pj_initialize, "pj", 180, 180, BITSPERPIXEL, +pj_device(pj_initialize_device_procs, "pj", 180, 180, BITSPERPIXEL, pj_print_page); gx_device_pjxl far_data gs_pjxl_device = -pjxl_device(pjxl_initialize, "pjxl", 180, 180, BITSPERPIXEL, +pjxl_device(pjxl_initialize_device_procs, "pjxl", 180, 180, BITSPERPIXEL, pjxl_print_page, 0, 0); gx_device_pjxl far_data gs_pjxl300_device = -pjxl_device(pjxl300_initialize, "pjxl300", 300, 300, BITSPERPIXEL, +pjxl_device(pjxl300_initialize_device_procs, "pjxl300", 300, 300, BITSPERPIXEL, pjxl300_print_page, 0, 0); gx_device_cdj far_data gs_escp_device = -cdj_device(escp_initialize, "escp", 360, 360, 8, +cdj_device(escp_initialize_device_procs, "escp", 360, 360, 8, escp_print_page, 0, 0, 1); gx_device_cdj far_data gs_escpc_device = -cdj_device(escp_initialize, "escpc", 360, 360, 24, +cdj_device(escp_initialize_device_procs, "escpc", 360, 360, 24, escp_print_page, 0, 0, 1); /* Args of bjc drivers are manualFeed, mediaType, printQuality, printColor, @@ -715,7 +655,7 @@ cdj_device(escp_initialize, "escpc", 360, 360, 24, gx_device_bjc600 far_data gs_bjc600_device = bjc600_device( - bjc_initialize, + bjc_initialize_device_procs, BJC_BJC600, BJC600_DEFAULT_RESOLUTION, BJC600_DEFAULT_RESOLUTION, @@ -734,7 +674,7 @@ gx_device_bjc600 far_data gs_bjc600_device = gx_device_bjc800 far_data gs_bjc800_device = bjc800_device( - bjc_initialize, + bjc_initialize_device_procs, BJC_BJC800, BJC800_DEFAULT_RESOLUTION, BJC800_DEFAULT_RESOLUTION, diff --git a/devices/gdevcfax.c b/devices/gdevcfax.c index 3a6dfc68d..a8fc3bd64 100644 --- a/devices/gdevcfax.c +++ b/devices/gdevcfax.c @@ -28,23 +28,19 @@ static dev_proc_close_device(cfax_prn_close); /* an additional "end of document" signature after the last */ /* "end page" signature */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -cfax_initialize(gx_device *dev) +static void +cfax_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, close_device, cfax_prn_close); set_dev_proc(dev, get_params, gdev_fax_get_params); set_dev_proc(dev, put_params, gdev_fax_put_params); - - return 0; } const gx_device_fax gs_cfax_device = { - FAX_DEVICE_BODY(gx_device_fax, cfax_initialize, "cfax", cfax_print_page) + FAX_DEVICE_BODY(gx_device_fax, cfax_initialize_device_procs, + "cfax", cfax_print_page) }; /* ---------------- SFF output ----------------- */ diff --git a/devices/gdevchameleon.c b/devices/gdevchameleon.c index 57895c2a9..6d7ba87c1 100644 --- a/devices/gdevchameleon.c +++ b/devices/gdevchameleon.c @@ -59,13 +59,10 @@ struct gx_device_chameleon_s { }; typedef struct gx_device_chameleon_s gx_device_chameleon; -static int -chameleon_initialize(gx_device *dev) +static void +chameleon_initialize_device_procs(gx_device *dev) { - 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, chameleon_rgb_encode_color); set_dev_proc(dev, map_color_rgb, chameleon_rgb_decode_color); @@ -75,12 +72,11 @@ chameleon_initialize(gx_device *dev) set_dev_proc(dev, encode_color, chameleon_rgb_encode_color); set_dev_proc(dev, decode_color, chameleon_rgb_decode_color); set_dev_proc(dev, dev_spec_op, chameleon_spec_op); - - return 0; } const gx_device_chameleon gs_chameleon_device = -{prn_device_body(gx_device_chameleon, chameleon_initialize, "chameleon", +{prn_device_body(gx_device_chameleon, chameleon_initialize_device_procs, + "chameleon", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevcif.c b/devices/gdevcif.c index 320790907..40f8a8aa3 100644 --- a/devices/gdevcif.c +++ b/devices/gdevcif.c @@ -35,7 +35,7 @@ static dev_proc_print_page(cif_print_page); /* The print_page proc is compatible with allowing bg printing */ const gx_device_printer far_data gs_cif_device = - prn_device(gdev_prn_initialize_mono_bg, "cif", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "cif", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0,0,0,0, diff --git a/devices/gdevclj.c b/devices/gdevclj.c index 16c9a0d5c..90a6152f0 100644 --- a/devices/gdevclj.c +++ b/devices/gdevclj.c @@ -515,13 +515,10 @@ xit: } /* CLJ device methods */ -static int -clj_initialize(gx_device *dev) +static void +clj_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, get_initial_matrix, clj_get_initial_matrix); set_dev_proc(dev, map_rgb_color, gdev_pcl_3bit_map_rgb_color); @@ -532,22 +529,15 @@ clj_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; } -static int -cljet5_initialize(gx_device *dev) +static void +cljet5_initialize_device_procs(gx_device *dev) { - int code = clj_initialize(dev); - - if (code < 0) - return code; + clj_initialize_device_procs(dev); set_dev_proc(dev, get_params, clj_get_params); set_dev_proc(dev, put_params, clj_put_params); - - return 0; } /* CLJ device structure */ @@ -570,7 +560,7 @@ cljet5_initialize(gx_device *dev) rotated /* rotated - may be overridden subsequently */ gx_device_clj gs_cljet5_device = { - CLJ_DEVICE_BODY(cljet5_initialize, "cljet5", 0 /*false*/) + CLJ_DEVICE_BODY(cljet5_initialize_device_procs, "cljet5", 0 /*false*/) }; /* ---------------- Driver with page rotation ---------------- */ @@ -685,21 +675,16 @@ clj_pr_put_params( } /* CLJ device methods -- se above for CLJ_PROCS */ -static int -cljet5pr_initialize(gx_device *dev) +static void +cljet5pr_initialize_device_procs(gx_device *dev) { - int code = clj_initialize(dev); - - if (code < 0) - return code; + clj_initialize_device_procs(dev); set_dev_proc(dev, get_params, clj_pr_get_params); set_dev_proc(dev, put_params, clj_pr_put_params); - - return 0; } /* CLJ device structure -- see above for CLJ_DEVICE_BODY */ gx_device_clj gs_cljet5pr_device = { - CLJ_DEVICE_BODY(cljet5pr_initialize, "cljet5pr", 1 /*true*/) + CLJ_DEVICE_BODY(cljet5pr_initialize_device_procs, "cljet5pr", 1 /*true*/) }; diff --git a/devices/gdevcljc.c b/devices/gdevcljc.c index cd45d3f6a..0081d7561 100644 --- a/devices/gdevcljc.c +++ b/devices/gdevcljc.c @@ -83,27 +83,22 @@ out: } /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -cljet5c_initialize(gx_device *dev) +static void +cljet5c_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb_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); - - return 0; } /* the CLJ device */ const gx_device_printer gs_cljet5c_device = { - prn_device_body(gx_device_printer, cljet5c_initialize, "cljet5c", + prn_device_body(gx_device_printer, cljet5c_initialize_device_procs, "cljet5c", 85, 110, X_DPI, Y_DPI, 0.167, 0.167, 0.167, 0.167, diff --git a/devices/gdevcmykog.c b/devices/gdevcmykog.c index ccc38d63f..b2498fdfd 100644 --- a/devices/gdevcmykog.c +++ b/devices/gdevcmykog.c @@ -718,13 +718,10 @@ prn_done: /* Finally, the device definition itself */ -static int -psdcmykog_initialize(gx_device *dev) +static void +psdcmykog_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, cmykog_open); set_dev_proc(dev, close_device, cmykog_close); @@ -736,8 +733,6 @@ psdcmykog_initialize(gx_device *dev) set_dev_proc(dev, decode_color, gx_devn_prn_decode_color); set_dev_proc(dev, ret_devn_params, gx_devn_prn_ret_devn_params); set_dev_proc(dev, dev_spec_op, cmykog_dev_spec_op); - - return 0; } fixed_colorant_name DevCMYKOGComponents[] = { @@ -774,7 +769,7 @@ fixed_colorant_name DevCMYKOGComponents[] = { */ const gx_device_cmykog gs_psdcmykog_device = { - CMYKOG_DEVICE(psdcmykog_initialize, "psdcmykog", 6, GX_CINFO_POLARITY_SUBTRACTIVE, 48, 255, 255, "DeviceCMYK", 600, 600), + CMYKOG_DEVICE(psdcmykog_initialize_device_procs, "psdcmykog", 6, GX_CINFO_POLARITY_SUBTRACTIVE, 48, 255, 255, "DeviceCMYK", 600, 600), /* device specific parameters */ { 8, /* Bits per color - must match ncomp, depth, etc. above */ DevCMYKOGComponents, /* Names of color model colorants */ diff --git a/devices/gdevcslw.c b/devices/gdevcslw.c index ce74b7b07..0e178e282 100644 --- a/devices/gdevcslw.c +++ b/devices/gdevcslw.c @@ -31,7 +31,7 @@ static dev_proc_print_page(coslw_print_page); /* The print_page proc is compatible with allowing bg printing */ const gx_device_printer gs_coslw2p_device = -prn_device(gdev_prn_initialize_mono_bg, "coslw2p", +prn_device(gdev_prn_initialize_device_procs_mono_bg, "coslw2p", 200, 400, /* 2 inches wide */ 128, 128, /* 5 dots per mm */ 0, 0, 0, 0, @@ -39,7 +39,7 @@ prn_device(gdev_prn_initialize_mono_bg, "coslw2p", /* The print_page proc is compatible with allowing bg printing */ const gx_device_printer gs_coslwxl_device = -prn_device(gdev_prn_initialize_mono_bg, "coslwxl", +prn_device(gdev_prn_initialize_device_procs_mono_bg, "coslwxl", 200, 400, /* 2 inches wide */ 204, 204, /* 8 dots per mm */ 0, 0, 0, 0, diff --git a/devices/gdevdfax.c b/devices/gdevdfax.c index d5cb9cd43..99e6af353 100644 --- a/devices/gdevdfax.c +++ b/devices/gdevdfax.c @@ -42,22 +42,17 @@ struct gx_device_dfax_s { typedef struct gx_device_dfax_s gx_device_dfax; /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -dfax_initialize(gx_device *dev) +static void +dfax_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, dfax_prn_open); set_dev_proc(dev, output_page, gdev_prn_bg_output_page_seekable); - - return 0; } gx_device_dfax far_data gs_dfaxlow_device = -{ prn_device_std_body(gx_device_dfax, dfax_initialize, "dfaxlow", +{ prn_device_std_body(gx_device_dfax, dfax_initialize_device_procs, "dfaxlow", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI/2, 0,0,0,0, /* margins */ @@ -65,7 +60,7 @@ gx_device_dfax far_data gs_dfaxlow_device = }; gx_device_dfax far_data gs_dfaxhigh_device = -{ prn_device_std_body(gx_device_dfax, dfax_initialize, "dfaxhigh", +{ prn_device_std_body(gx_device_dfax, dfax_initialize_device_procs, "dfaxhigh", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0,0,0,0, /* margins */ diff --git a/devices/gdevdjet.c b/devices/gdevdjet.c index af64e6299..1ded0813e 100644 --- a/devices/gdevdjet.c +++ b/devices/gdevdjet.c @@ -115,35 +115,25 @@ static dev_proc_get_params(hpjet_get_params); static dev_proc_put_params(hpjet_put_params); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -hpjet_initialize(gx_device *dev) +static void +hpjet_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, hpjet_open); set_dev_proc(dev, close_device, hpjet_close); set_dev_proc(dev, get_params, hpjet_get_params); set_dev_proc(dev, put_params, hpjet_put_params); - - return 0; } /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -ljet4pjl_initialize(gx_device *dev) +static void +ljet4pjl_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, hpjet_open); set_dev_proc(dev, close_device, ljet4pjl_close); - - return 0; } typedef struct gx_device_hpjet_s gx_device_hpjet; @@ -165,91 +155,91 @@ struct gx_device_hpjet_s { 0, false, false, false, false } const gx_device_hpjet gs_deskjet_device = -HPJET_DEVICE(hpjet_initialize, "deskjet", +HPJET_DEVICE(hpjet_initialize_device_procs, "deskjet", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins filled in by hpjet_open */ 1, djet_print_page_copies); const gx_device_hpjet gs_djet500_device = -HPJET_DEVICE(hpjet_initialize, "djet500", +HPJET_DEVICE(hpjet_initialize_device_procs, "djet500", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins filled in by hpjet_open */ 1, djet500_print_page_copies); const gx_device_hpjet gs_fs600_device = -HPJET_DEVICE(hpjet_initialize, "fs600", +HPJET_DEVICE(hpjet_initialize_device_procs, "fs600", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI2, Y_DPI2, 0.23, 0.0, 0.23, 0.04, /* margins */ 1, fs600_print_page_copies); const gx_device_hpjet gs_laserjet_device = -HPJET_DEVICE(hpjet_initialize, "laserjet", +HPJET_DEVICE(hpjet_initialize_device_procs, "laserjet", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.05, 0.25, 0.55, 0.25, /* margins */ 1, ljet_print_page_copies); const gx_device_hpjet gs_ljetplus_device = -HPJET_DEVICE(hpjet_initialize, "ljetplus", +HPJET_DEVICE(hpjet_initialize_device_procs, "ljetplus", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.05, 0.25, 0.55, 0.25, /* margins */ 1, ljetplus_print_page_copies); const gx_device_hpjet gs_ljet2p_device = -HPJET_DEVICE(hpjet_initialize, "ljet2p", +HPJET_DEVICE(hpjet_initialize_device_procs, "ljet2p", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.25, 0.25, 0.25, 0.0, /* margins */ 1, ljet2p_print_page_copies); const gx_device_hpjet gs_ljet3_device = -HPJET_DEVICE(hpjet_initialize, "ljet3", +HPJET_DEVICE(hpjet_initialize_device_procs, "ljet3", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.20, 0.25, 0.25, 0.25, /* margins */ 1, ljet3_print_page_copies); const gx_device_hpjet gs_ljet3d_device = -HPJET_DEVICE(hpjet_initialize, "ljet3d", +HPJET_DEVICE(hpjet_initialize_device_procs, "ljet3d", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.20, 0.25, 0.25, 0.25, /* margins */ 1, ljet3d_print_page_copies); const gx_device_hpjet gs_ljet4_device = -HPJET_DEVICE(hpjet_initialize, "ljet4", +HPJET_DEVICE(hpjet_initialize_device_procs, "ljet4", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI2, Y_DPI2, 0, 0, 0, 0, /* margins */ 1, ljet4_print_page_copies); const gx_device_hpjet gs_ljet4d_device = -HPJET_DEVICE(hpjet_initialize, "ljet4d", +HPJET_DEVICE(hpjet_initialize_device_procs, "ljet4d", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI2, Y_DPI2, 0, 0, 0, 0, /* margins */ 1, ljet4d_print_page_copies); const gx_device_hpjet gs_lp2563_device = -HPJET_DEVICE(hpjet_initialize, "lp2563", +HPJET_DEVICE(hpjet_initialize_device_procs, "lp2563", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ 1, lp2563_print_page_copies); const gx_device_hpjet gs_oce9050_device = -HPJET_DEVICE(hpjet_initialize, "oce9050", +HPJET_DEVICE(hpjet_initialize_device_procs, "oce9050", 24 * 10, 24 * 10, /* 24 inch roll (can print 32" also) */ 400, 400, /* 400 dpi */ 0, 0, 0, 0, /* margins */ 1, oce9050_print_page_copies); const gx_device_printer gs_ljet4pjl_device = -prn_device_copies(ljet4pjl_initialize, "ljet4pjl", +prn_device_copies(ljet4pjl_initialize_device_procs, "ljet4pjl", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI2, Y_DPI2, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevdjtc.c b/devices/gdevdjtc.c index c1f5d5e96..09849b09d 100644 --- a/devices/gdevdjtc.c +++ b/devices/gdevdjtc.c @@ -40,13 +40,10 @@ static dev_proc_print_page(djet500c_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -djet500c_initialize(gx_device *dev) +static void +djet500c_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return 0; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, map_rgb_color, gdev_pcl_3bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, gdev_pcl_3bit_map_color_rgb); @@ -56,12 +53,10 @@ djet500c_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; } const gx_device_printer far_data gs_djet500c_device = - prn_device(djet500c_initialize, "djet500c", + prn_device(djet500c_initialize_device_procs, "djet500c", 85, /* width_10ths, 8.5" */ 120, /* height_10ths, 12" */ X_DPI, Y_DPI, diff --git a/devices/gdevdm24.c b/devices/gdevdm24.c index 4365093ea..e476514a5 100644 --- a/devices/gdevdm24.c +++ b/devices/gdevdm24.c @@ -26,7 +26,7 @@ static dev_proc_print_page (necp6_print_page); const gx_device_printer far_data gs_necp6_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device (gdev_prn_initialize_mono_bg, "necp6", + prn_device (gdev_prn_initialize_device_procs_mono_bg, "necp6", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 360, 360, 0, 0, 0.5, 0, /* margins */ @@ -37,7 +37,7 @@ const gx_device_printer far_data gs_necp6_device = static dev_proc_print_page (lq850_print_page); const gx_device_printer gs_lq850_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device (gdev_prn_initialize_mono_bg, "lq850", + prn_device (gdev_prn_initialize_device_procs_mono_bg, "lq850", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 360, 360, 0, 0, 0.5, 0, /* margins */ diff --git a/devices/gdevdsp.c b/devices/gdevdsp.c index 15ab9ec23..a4d70b53b 100644 --- a/devices/gdevdsp.c +++ b/devices/gdevdsp.c @@ -94,7 +94,7 @@ static dev_proc_copy_color(display_copy_color); static dev_proc_get_bits(display_get_bits); static dev_proc_get_params(display_get_params); static dev_proc_put_params(display_put_params); -static dev_proc_initialize(display_initialize); +static dev_proc_initialize_device_procs(display_initialize_device_procs); static dev_proc_get_color_mapping_procs(display_separation_get_color_mapping_procs); static dev_proc_get_color_comp_index(display_separation_get_color_comp_index); @@ -133,7 +133,7 @@ RELOC_PTRS_END const gx_device_display gs_display_device = { std_device_std_body_type(gx_device_display, - display_initialize, + display_initialize_device_procs, "display", &st_device_display, INITIAL_WIDTH, INITIAL_HEIGHT, @@ -1145,12 +1145,24 @@ display_put_params(gx_device * dev, gs_param_list * plist) return 0; } -/* Clean up the instance after making a copy. */ -int -display_initialize(gx_device *dev) +static int display_initialize_device(gx_device *dev) { gx_device_display *ddev = (gx_device_display *) dev; + /* Mark the new instance as closed. */ + ddev->is_open = false; + + /* Clear pointers */ + ddev->pBitmap = NULL; + ddev->zBitmapSize = 0; + + return 0; +} + +static void +display_initialize_device_procs(gx_device *dev) +{ + set_dev_proc(dev, initialize_device, display_initialize_device); set_dev_proc(dev, open_device, display_open); set_dev_proc(dev, get_initial_matrix, display_get_initial_matrix); set_dev_proc(dev, sync_output, display_sync_output); @@ -1166,15 +1178,6 @@ display_initialize(gx_device *dev) set_dev_proc(dev, update_spot_equivalent_colors, display_update_spot_equivalent_colors); set_dev_proc(dev, ret_devn_params, display_ret_devn_params); set_dev_proc(dev, dev_spec_op, display_spec_op); - - /* Mark the new instance as closed. */ - ddev->is_open = false; - - /* Clear pointers */ - ddev->pBitmap = NULL; - ddev->zBitmapSize = 0; - - return 0; } /* @@ -1553,9 +1556,9 @@ display_create_buf_device(gx_device **pbdev, gx_device *target, int y, dev_t_proc_dev_spec_op((*orig_dso), gx_device) = dev_proc(mdev, dev_spec_op); /* The following is a special hack for setting up printer devices. */ assign_dev_procs(mdev, mdproto); - mdev->initialize = mdproto->initialize; - /* This can never fail */ - (void)mdev->initialize((gx_device *)mdev); + mdev->initialize_device_procs = mdproto->initialize_device_procs; + mdev->initialize_device_procs((gx_device *)mdev); + /* We know mdev->procs.initialize_device is NULL. */ /* Do not override the dev_spec_op! */ dev_proc(mdev, dev_spec_op) = orig_dso; check_device_separable((gx_device *)mdev); @@ -1704,9 +1707,10 @@ display_alloc_bitmap(gx_device_display * ddev, gx_device * param_dev) ddev->orig_procs.dev_spec_op, MIN_BUFFER_SPACE); if (ccode >= 0) { - ddev->initialize = clist_initialize; - /* Hacky - we know this can't fail. */ - (void)ddev->initialize((gx_device *)ddev); + ddev->initialize_device_procs = clist_initialize_device_procs; + ddev->initialize_device_procs((gx_device *)ddev); + /* ddev->initialize() has already been done, and does not + * need to redone for the clist. */ gx_device_fill_in_procs((gx_device *)ddev); } } else { diff --git a/devices/gdevepsc.c b/devices/gdevepsc.c index 0307fb77f..962064f73 100644 --- a/devices/gdevepsc.c +++ b/devices/gdevepsc.c @@ -143,13 +143,10 @@ epson_map_color_rgb(gx_device * dev, gx_color_index color, static dev_proc_print_page(epsc_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -epson_initialize(gx_device *dev) +static void +epson_initialize_device_procs(gx_device *dev) { - 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, epson_map_rgb_color); set_dev_proc(dev, map_color_rgb, epson_map_color_rgb); @@ -159,12 +156,10 @@ epson_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; } const gx_device_printer far_data gs_epsonc_device = -prn_device(epson_initialize, +prn_device(epson_initialize_device_procs, "epsonc", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, diff --git a/devices/gdevepsn.c b/devices/gdevepsn.c index a3151c2bc..0c204d5e0 100644 --- a/devices/gdevepsn.c +++ b/devices/gdevepsn.c @@ -102,7 +102,7 @@ static dev_proc_print_page(ibmpro_print_page); /* Standard Epson device */ const gx_device_printer far_data gs_epson_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, + prn_device(gdev_prn_initialize_device_procs_mono_bg, "epson", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, @@ -112,7 +112,7 @@ const gx_device_printer far_data gs_epson_device = /* Mid-res (interleaved, 1 pass per line) 9-pin device */ const gx_device_printer far_data gs_eps9mid_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, + prn_device(gdev_prn_initialize_device_procs_mono_bg, "eps9mid", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, 3*Y_BASERES, @@ -122,7 +122,7 @@ const gx_device_printer far_data gs_eps9mid_device = /* High-res (interleaved) 9-pin device */ const gx_device_printer far_data gs_eps9high_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, + prn_device(gdev_prn_initialize_device_procs_mono_bg, "eps9high", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, 3*Y_BASERES, @@ -132,7 +132,7 @@ const gx_device_printer far_data gs_eps9high_device = /* IBM ProPrinter device */ const gx_device_printer far_data gs_ibmpro_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, + prn_device(gdev_prn_initialize_device_procs_mono_bg, "ibmpro", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, diff --git a/devices/gdevescp.c b/devices/gdevescp.c index 393efa27b..6c525087b 100644 --- a/devices/gdevescp.c +++ b/devices/gdevescp.c @@ -88,7 +88,7 @@ static dev_proc_print_page(escp2_print_page); /* Stylus 800 device */ const gx_device_printer far_data gs_st800_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, "st800", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "st800", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, @@ -98,7 +98,7 @@ const gx_device_printer far_data gs_st800_device = /* AP3250 device */ const gx_device_printer far_data gs_ap3250_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, "ap3250", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "ap3250", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, diff --git a/devices/gdevfax.c b/devices/gdevfax.c index 62a7f2571..0356dbba0 100644 --- a/devices/gdevfax.c +++ b/devices/gdevfax.c @@ -27,24 +27,19 @@ static dev_proc_print_page(faxg4_print_page); /* Define procedures that adjust the paper size. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -fax_initialize(gx_device *dev) +static void +fax_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, gdev_prn_open); set_dev_proc(dev, get_params, gdev_fax_get_params); set_dev_proc(dev, put_params, gdev_fax_put_params); - - return 0; } #define FAX_DEVICE(dname, print_page)\ {\ - FAX_DEVICE_BODY(gx_device_fax, fax_initialize, dname, print_page)\ + FAX_DEVICE_BODY(gx_device_fax, fax_initialize_device_procs, dname, print_page)\ } const gx_device_fax gs_faxg3_device = diff --git a/devices/gdevfpng.c b/devices/gdevfpng.c index 6a0a6676b..a885c2a5f 100644 --- a/devices/gdevfpng.c +++ b/devices/gdevfpng.c @@ -107,23 +107,18 @@ fpng_dev_spec_op(gx_device *pdev, int dev_spec_op, void *data, int size) /* 24-bit color. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -fpng_initialize(gx_device *dev) +static void +fpng_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb_bg(dev); set_dev_proc(dev, get_params, fpng_get_params); set_dev_proc(dev, put_params, fpng_put_params); set_dev_proc(dev, dev_spec_op, fpng_dev_spec_op); - - return 0; } const gx_device_fpng gs_fpng_device = -{prn_device_body(gx_device_fpng, fpng_initialize, "fpng", +{prn_device_body(gx_device_fpng, fpng_initialize_device_procs, "fpng", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevhl7x.c b/devices/gdevhl7x.c index fbf163dcc..14b640970 100644 --- a/devices/gdevhl7x.c +++ b/devices/gdevhl7x.c @@ -248,22 +248,17 @@ static dev_proc_close_device(hl7x0_close); static dev_proc_print_page(hl720_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -hl7x0_initialize(gx_device *dev) +static void +hl7x0_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, hl7x0_open); set_dev_proc(dev, close_device, hl7x0_close); - - return 0; } const gx_device_printer far_data gs_hl7x0_device = - prn_device(hl7x0_initialize, "hl7x0", + prn_device(hl7x0_initialize_device_procs, "hl7x0", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins filled in by hl7x0_open */ diff --git a/devices/gdevicov.c b/devices/gdevicov.c index d42247e94..e138cbe9d 100644 --- a/devices/gdevicov.c +++ b/devices/gdevicov.c @@ -167,14 +167,14 @@ static int cov_write_page_ink(gx_device_printer *pdev, gp_file *file) } const gx_device_printer gs_inkcov_device = prn_device( - gdev_prn_initialize_cmyk8_bg, "inkcov", + gdev_prn_initialize_device_procs_cmyk8_bg, "inkcov", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 75, 75, /* dpi */ 0, 0, 0, 0, /* margins */ 32, cov_write_page); const gx_device_printer gs_ink_cov_device = prn_device( - gdev_prn_initialize_cmyk8_bg, "ink_cov", + gdev_prn_initialize_device_procs_cmyk8_bg, "ink_cov", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 75, 75, /* dpi */ 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevifno.c b/devices/gdevifno.c index d3a8b9a3b..26e55c2db 100644 --- a/devices/gdevifno.c +++ b/devices/gdevifno.c @@ -81,13 +81,10 @@ gs_private_st_suffix_add1_final(st_inferno_device, inferno_device, "inferno_device", inferno_device_enum_ptrs, inferno_device_reloc_ptrs, gx_device_finalize, st_device_printer, p9color); -static int -inferno_initialize(gx_device *dev) +static void +inferno_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs(dev); set_dev_proc(dev, open_device, inferno_open); set_dev_proc(dev, close_device, inferno_close); @@ -99,13 +96,11 @@ inferno_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; } inferno_device far_data gs_inferno_device = -{ prn_device_stype_body(inferno_device, inferno_initialize, "inferno", - &st_inferno_device, +{ prn_device_stype_body(inferno_device, inferno_initialize_device_procs, + "inferno", &st_inferno_device, DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0,0,0,0, /* margins */ diff --git a/devices/gdevijs.c b/devices/gdevijs.c index cba8dd3db..49bc12fe5 100644 --- a/devices/gdevijs.c +++ b/devices/gdevijs.c @@ -90,7 +90,8 @@ static dev_proc_close_device(gsijs_close); static dev_proc_output_page(gsijs_output_page); static dev_proc_get_params(gsijs_get_params); static dev_proc_put_params(gsijs_put_params); -static dev_proc_initialize(gsijs_initialize); +static dev_proc_initialize_device_procs(gsijs_initialize_device_procs); +static dev_proc_initialize_device(gsijs_initialize_device); /* Following definitions are for krgb support. */ static dev_proc_create_buf_device(gsijs_create_buf_device); @@ -143,7 +144,7 @@ struct gx_device_ijs_s { gx_device_ijs gs_ijs_device = { prn_device_std_body(gx_device_ijs, - gsijs_initialize, + gsijs_initialize_device_procs, "ijs", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, DEFAULT_DPI, DEFAULT_DPI, @@ -883,24 +884,11 @@ gsijs_open(gx_device *dev) /* Finish device initialization. */ static int -gsijs_initialize(gx_device *dev) +gsijs_initialize_device(gx_device *dev) { - int code; static const char rgb[] = "DeviceRGB"; gx_device_ijs *ijsdev = (gx_device_ijs *)dev; - code = gx_default_initialize(dev); - if(code < 0) - return code; - - set_dev_proc(dev, open_device, gsijs_open); - set_dev_proc(dev, output_page, gsijs_output_page); - set_dev_proc(dev, close_device, gsijs_close); - set_dev_proc(dev, map_rgb_color, gx_default_rgb_map_rgb_color); - set_dev_proc(dev, map_color_rgb, gx_default_rgb_map_color_rgb); - set_dev_proc(dev, get_params, gsijs_get_params); - set_dev_proc(dev, put_params, gsijs_put_params); - if (!ijsdev->ColorSpace) { ijsdev->ColorSpace = gs_malloc(ijsdev->memory, sizeof(rgb), 1, "gsijs_initialize"); @@ -909,7 +897,20 @@ gsijs_initialize(gx_device *dev) ijsdev->ColorSpace_size = sizeof(rgb); memcpy(ijsdev->ColorSpace, rgb, sizeof(rgb)); } - return code; + return 0; +} + +static void +gsijs_initialize_device_procs(gx_device *dev) +{ + set_dev_proc(dev, initialize_device, gsijs_initialize_device); + set_dev_proc(dev, open_device, gsijs_open); + set_dev_proc(dev, output_page, gsijs_output_page); + set_dev_proc(dev, close_device, gsijs_close); + set_dev_proc(dev, map_rgb_color, gx_default_rgb_map_rgb_color); + set_dev_proc(dev, map_color_rgb, gx_default_rgb_map_color_rgb); + set_dev_proc(dev, get_params, gsijs_get_params); + set_dev_proc(dev, put_params, gsijs_put_params); } /* Close the gsijs driver */ diff --git a/devices/gdevimgn.c b/devices/gdevimgn.c index 717d1c386..a0a297459 100644 --- a/devices/gdevimgn.c +++ b/devices/gdevimgn.c @@ -228,25 +228,20 @@ static dev_proc_open_device(imagen_prn_open); static dev_proc_close_device(imagen_prn_close); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -imagen_initialize(gx_device *dev) +static void +imagen_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, imagen_prn_open); set_dev_proc(dev, close_device, imagen_prn_close); - - return 0; } #define ppdev ((gx_device_printer *)pdev) /*-------------------------------------------*/ const gx_device_printer far_data gs_imagen_device = - prn_device(imagen_initialize, + prn_device(imagen_initialize_device_procs, "imagen", WIDTH_10THS, HEIGHT_10THS, diff --git a/devices/gdevjpeg.c b/devices/gdevjpeg.c index 9f9d3f251..5be4b528e 100644 --- a/devices/gdevjpeg.c +++ b/devices/gdevjpeg.c @@ -63,23 +63,18 @@ static dev_proc_map_cmyk_color(jpegcmyk_map_cmyk_color); /* 24-bit color */ -static int -jpeg_initialize(gx_device *dev) +static void +jpeg_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb_bg(dev); set_dev_proc(dev, get_initial_matrix, jpeg_get_initial_matrix); set_dev_proc(dev, get_params, jpeg_get_params); set_dev_proc(dev, put_params, jpeg_put_params); - - return 0; } const gx_device_jpeg gs_jpeg_device = -{prn_device_std_body(gx_device_jpeg, jpeg_initialize, "jpeg", +{prn_device_std_body(gx_device_jpeg, jpeg_initialize_device_procs, "jpeg", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, 24, jpeg_print_page), 0, /* JPEGQ: 0 indicates not specified */ @@ -91,13 +86,10 @@ const gx_device_jpeg gs_jpeg_device = /* 8-bit gray */ -static int -jpeggray_initialize(gx_device *dev) +static void +jpeggray_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, get_initial_matrix, jpeg_get_initial_matrix); set_dev_proc(dev, get_params, jpeg_get_params); @@ -108,12 +100,10 @@ jpeggray_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; } const gx_device_jpeg gs_jpeggray_device = -{prn_device_body(gx_device_jpeg, jpeggray_initialize, "jpeggray", +{prn_device_body(gx_device_jpeg, jpeggray_initialize_device_procs, "jpeggray", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, 1, 8, 255, 0, 256, 0, @@ -127,13 +117,10 @@ const gx_device_jpeg gs_jpeggray_device = /* 32-bit CMYK */ -static int -jpegcmyk_initialize(gx_device *dev) +static void +jpegcmyk_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, get_initial_matrix, jpeg_get_initial_matrix); set_dev_proc(dev, map_color_rgb, jpegcmyk_map_color_rgb); @@ -146,12 +133,10 @@ jpegcmyk_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; } const gx_device_jpeg gs_jpegcmyk_device = -{prn_device_std_body(gx_device_jpeg, jpegcmyk_initialize, "jpegcmyk", +{prn_device_std_body(gx_device_jpeg, jpegcmyk_initialize_device_procs, "jpegcmyk", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, 32, jpeg_print_page), 0, /* JPEGQ: 0 indicates not specified */ diff --git a/devices/gdevl31s.c b/devices/gdevl31s.c index f916acfd9..8832c13ac 100644 --- a/devices/gdevl31s.c +++ b/devices/gdevl31s.c @@ -79,23 +79,18 @@ static dev_proc_print_page_copies(lj3100sw_print_page_copies); static dev_proc_close_device(lj3100sw_close); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -lj3100sw_initialize(gx_device *dev) +static void +lj3100sw_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, close_device, lj3100sw_close); - - return 0; } /* workaround to emulate the missing prn_device_margins_copies macro */ #define gx_default_print_page_copies lj3100sw_print_page_copies gx_device_printer far_data gs_lj3100sw_device = - prn_device_margins/*_copies*/(lj3100sw_initialize, "lj3100sw", + prn_device_margins/*_copies*/(lj3100sw_initialize_device_procs, "lj3100sw", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, XCORRECTION, YCORRECTION, diff --git a/devices/gdevlbp8.c b/devices/gdevlbp8.c index a90a8aaaa..fbbbf6979 100644 --- a/devices/gdevlbp8.c +++ b/devices/gdevlbp8.c @@ -49,7 +49,7 @@ static dev_proc_print_page(lips3_print_page); const gx_device_printer far_data gs_lbp8_device = /* The print_page proc is compatible with allowing bg printing */ - prn_device(gdev_prn_initialize_mono_bg, "lbp8", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "lbp8", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.16, 0.2, 0.32, 0.21, /* margins: left, bottom, right, top */ @@ -58,7 +58,7 @@ const gx_device_printer far_data gs_lbp8_device = #ifdef NOCONTRIB /* The print_page proc is compatible with allowing bg printing */ const gx_device_printer far_data gs_lips3_device = - prn_device(gdev_prn_initialize_mono_bg, "lips3", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "lips3", 82, /* width_10ths, 8.3" */ 117, /* height_10ths, 11.7" */ X_DPI, Y_DPI, diff --git a/devices/gdevlj56.c b/devices/gdevlj56.c index 3d08d3c9f..6a7d398bf 100644 --- a/devices/gdevlj56.c +++ b/devices/gdevlj56.c @@ -42,35 +42,27 @@ static dev_proc_close_device(ljet5_close); static dev_proc_print_page(ljet5_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -ljet5_initialize(gx_device *dev) +static void +ljet5_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, ljet5_open); set_dev_proc(dev, close_device, ljet5_close); - - return 0; } const gx_device_printer gs_lj5mono_device = -prn_device(ljet5_initialize, "lj5mono", +prn_device(ljet5_initialize_device_procs, "lj5mono", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, 1, ljet5_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -lj5gray_initialize(gx_device *dev) +static void +lj5gray_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, open_device, ljet5_open); set_dev_proc(dev, close_device, ljet5_close); @@ -80,12 +72,10 @@ lj5gray_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; } const gx_device_printer gs_lj5gray_device = { - prn_device_body(gx_device_printer, lj5gray_initialize, "lj5gray", + prn_device_body(gx_device_printer, lj5gray_initialize_device_procs, "lj5gray", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, diff --git a/devices/gdevlp8k.c b/devices/gdevlp8k.c index d5b33dc1f..6794e741d 100644 --- a/devices/gdevlp8k.c +++ b/devices/gdevlp8k.c @@ -170,7 +170,7 @@ static dev_proc_print_page(lp8000_print_page); /* The print_page proc is compatible with allowing bg printing */ gx_device_printer far_data gs_lp8000_device = - prn_device(gdev_prn_initialize_mono_bg, "lp8000", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "lp8000", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, diff --git a/devices/gdevlxm.c b/devices/gdevlxm.c index 13522bfe6..1e6f8e51e 100644 --- a/devices/gdevlxm.c +++ b/devices/gdevlxm.c @@ -40,18 +40,13 @@ static dev_proc_put_params(lxm_put_params); /* set up dispatch table. I follow gdevdjet in using gdev_prn_output_page */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -lxm5700m_initialize(gx_device *dev) +static void +lxm5700m_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, get_params, lxm_get_params); set_dev_proc(dev, put_params, lxm_put_params); - - return 0; } /* The device descriptors */ @@ -65,7 +60,7 @@ typedef struct lxm_device_s { /* a sub-class of gx_device_printer */ /* Standard lxm5700m device */ lxm_device far_data gs_lxm5700m_device = { - prn_device_std_body(lxm_device, lxm5700m_initialize, "lxm5700m", + prn_device_std_body(lxm_device, lxm5700m_initialize_device_procs, "lxm5700m", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* x dpi, y dpi */ 0.2, 0.0, 0.0, 0.0, /* margins */ diff --git a/devices/gdevmgr.c b/devices/gdevmgr.c index a9b4932ee..a1e6488a5 100644 --- a/devices/gdevmgr.c +++ b/devices/gdevmgr.c @@ -66,13 +66,10 @@ static dev_proc_print_page(cmgrN_print_page); /* The device procedures */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -mgr_initialize(gx_device *dev) +static void +mgr_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, gdev_mgr_open); @@ -81,17 +78,12 @@ mgr_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; } -static int -mgrN_initialize(gx_device *dev) +static void +mgrN_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, open_device, gdev_mgr_open); @@ -100,17 +92,12 @@ mgrN_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; } -static int -cmgr4_initialize(gx_device *dev) +static void +cmgr4_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, gdev_mgr_open); set_dev_proc(dev, map_rgb_color, pc_4bit_map_rgb_color); @@ -121,17 +108,12 @@ cmgr4_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; } -static int -cmgr8_initialize(gx_device *dev) +static void +cmgr8_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, gdev_mgr_open); set_dev_proc(dev, map_rgb_color, mgr_8bit_map_rgb_color); @@ -142,23 +124,21 @@ cmgr8_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_mgr far_data gs_mgrmono_device = - mgr_prn_device( mgr_initialize, "mgrmono", 1, 1, 1, 1, 0, 2, 0, mgr_print_page); + mgr_prn_device( mgr_initialize_device_procs, "mgrmono", 1, 1, 1, 1, 0, 2, 0, mgr_print_page); gx_device_mgr far_data gs_mgrgray2_device = - mgr_prn_device(mgrN_initialize, "mgrgray2",1, 8, 2, 255, 0, 4, 0, mgrN_print_page); + mgr_prn_device(mgrN_initialize_device_procs, "mgrgray2",1, 8, 2, 255, 0, 4, 0, mgrN_print_page); gx_device_mgr far_data gs_mgrgray4_device = - mgr_prn_device(mgrN_initialize, "mgrgray4",1, 8, 4, 255, 0,16, 0, mgrN_print_page); + mgr_prn_device(mgrN_initialize_device_procs, "mgrgray4",1, 8, 4, 255, 0,16, 0, mgrN_print_page); gx_device_mgr far_data gs_mgrgray8_device = - mgr_prn_device(mgrN_initialize, "mgrgray8",1, 8, 8, 255, 0, 0, 0, mgrN_print_page); + mgr_prn_device(mgrN_initialize_device_procs, "mgrgray8",1, 8, 8, 255, 0, 0, 0, mgrN_print_page); gx_device_mgr far_data gs_mgr4_device = - mgr_prn_device(cmgr4_initialize, "mgr4", 3, 8, 4, 1, 1, 2, 2, cmgrN_print_page); + mgr_prn_device(cmgr4_initialize_device_procs, "mgr4", 3, 8, 4, 1, 1, 2, 2, cmgrN_print_page); gx_device_mgr far_data gs_mgr8_device = - mgr_prn_device(cmgr8_initialize, "mgr8", 3, 8, 8, 255, 255, 6, 5, cmgrN_print_page); + mgr_prn_device(cmgr8_initialize_device_procs, "mgr8", 3, 8, 8, 255, 255, 6, 5, cmgrN_print_page); /* ------ Internal routines ------ */ diff --git a/devices/gdevmiff.c b/devices/gdevmiff.c index d7302bc30..306a5fa7d 100644 --- a/devices/gdevmiff.c +++ b/devices/gdevmiff.c @@ -27,25 +27,20 @@ static dev_proc_print_page(miff24_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -miff24_initialize(gx_device *dev) +static void +miff24_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb_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); - - return 0; } const gx_device_printer gs_miff24_device = -prn_device(miff24_initialize, "miff24", +prn_device(miff24_initialize_device_procs, "miff24", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevn533.c b/devices/gdevn533.c index 4606258a8..3ca4142e1 100644 --- a/devices/gdevn533.c +++ b/devices/gdevn533.c @@ -46,23 +46,18 @@ static dev_proc_open_device(nwp533_open); static dev_proc_print_page(nwp533_print_page); static dev_proc_close_device(nwp533_close); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -nwp533_initialize(gx_device *dev) +static void +nwp533_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, nwp533_open); set_dev_proc(dev, output_page, gdev_prn_bg_output_page_seekable); set_dev_proc(dev, close_device, nwp533_close); - - return 0; } const gx_device_printer far_data gs_nwp533_device = - prn_device(mwp533_initialize, "nwp533", + prn_device(mwp533_initialize_device_procs, "nwp533", PAPER_XDOTS * 10.0 / DPI, /* width_10ths */ PAPER_YDOTS * 10.0 / DPI, /* height_10ths */ DPI, /* x_dpi */ diff --git a/devices/gdevo182.c b/devices/gdevo182.c index 78c4ae39d..8a1000c58 100644 --- a/devices/gdevo182.c +++ b/devices/gdevo182.c @@ -65,7 +65,7 @@ static dev_proc_print_page(oki_print_page); /* The print_page proc is compatible with allowing bg printing */ const gx_device_printer far_data gs_oki182_device = - prn_device(gdev_prn_initialize_mono_bg, "oki182", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "oki182", 80, /* width_10ths, 8.0" */ 110, /* height_10ths, 11" */ 72, /* x_dpi */ diff --git a/devices/gdevocr.c b/devices/gdevocr.c index 8c6476177..e4151e07e 100644 --- a/devices/gdevocr.c +++ b/devices/gdevocr.c @@ -50,13 +50,10 @@ struct gx_device_ocr_s { }; /* 8-bit gray bitmap -> UTF8 OCRd text */ -static int -ocr_initialize(gx_device *dev) +static void +ocr_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, open_device, ocr_open); set_dev_proc(dev, close_device, ocr_close); @@ -68,13 +65,11 @@ ocr_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; } const gx_device_ocr gs_ocr_device = { - prn_device_body(gx_device_ocr, ocr_initialize, "ocr", + prn_device_body(gx_device_ocr, ocr_initialize_device_procs, "ocr", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -83,13 +78,10 @@ const gx_device_ocr gs_ocr_device = }; /* 8-bit gray bitmap -> HTML OCRd text */ -static int -hocr_initialize(gx_device *dev) +static void +hocr_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, open_device, ocr_open); set_dev_proc(dev, close_device, hocr_close); @@ -101,13 +93,11 @@ hocr_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; } const gx_device_ocr gs_hocr_device = { - prn_device_body(gx_device_ocr, hocr_initialize, "hocr", + prn_device_body(gx_device_ocr, hocr_initialize_device_procs, "hocr", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevokii.c b/devices/gdevokii.c index 69286b81d..214ee5961 100644 --- a/devices/gdevokii.c +++ b/devices/gdevokii.c @@ -75,7 +75,7 @@ static dev_proc_print_page(okiibm_print_page); /* Okidata IBM device */ /* The print_page proc is compatible with allowing bg printing */ const gx_device_printer far_data gs_okiibm_device = - prn_device(gdev_prn_initialize_mono_bg, "okiibm", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "okiibm", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0.25, 0.0, 0.25, 0.0, /* margins */ diff --git a/devices/gdevpbm.c b/devices/gdevpbm.c index b845a5004..f1ba20500 100644 --- a/devices/gdevpbm.c +++ b/devices/gdevpbm.c @@ -140,13 +140,10 @@ static dev_proc_print_page(pnmcmyk_print_page); /* The device procedures */ -static int -pbm_initialize(gx_device *dev) +static void +pbm_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono(dev); set_dev_proc(dev, put_params, ppm_put_params); set_dev_proc(dev, output_page, ppm_output_page); @@ -156,157 +153,125 @@ pbm_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; } -static int -ppm_initialize(gx_device *dev) +static void +ppm_initialize_device_procs(gx_device *dev) { - int code = pbm_initialize(dev); - - if (code < 0) - return code; + pbm_initialize_device_procs(dev); set_dev_proc(dev, get_params, ppm_get_params); set_dev_proc(dev, map_rgb_color, gx_default_rgb_map_rgb_color); set_dev_proc(dev, map_color_rgb, ppm_map_color_rgb); set_dev_proc(dev, open_device, ppm_open); - - return 0; } -static int -pgm_initialize(gx_device *dev) +static void +pgm_initialize_device_procs(gx_device *dev) { - int code = pbm_initialize(dev); - - if (code < 0) - return code; + pbm_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, pgm_map_rgb_color); set_dev_proc(dev, map_color_rgb, pgm_map_color_rgb); set_dev_proc(dev, open_device, ppm_open); - - return 0; } -static int -pnm_initialize(gx_device *dev) +static void +pnm_initialize_device_procs(gx_device *dev) { - int code = ppm_initialize(dev); - - if (code < 0) - return code; + ppm_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, ppm_map_rgb_color); - - return 0; } -static int -pkm_initialize(gx_device *dev) +static void +pkm_initialize_device_procs(gx_device *dev) { - int code = ppm_initialize(dev); - - if (code < 0) - return code; + ppm_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, NULL); set_dev_proc(dev, map_color_rgb, cmyk_1bit_map_color_rgb); set_dev_proc(dev, map_cmyk_color, cmyk_1bit_map_cmyk_color); - - return 0; } -static int -pam_initialize(gx_device *dev) +static void +pam_initialize_device_procs(gx_device *dev) { - int code = ppm_initialize(dev); - - if (code < 0) - return code; + ppm_initialize_device_procs(dev); set_dev_proc(dev, map_rgb_color, NULL); set_dev_proc(dev, map_color_rgb, cmyk_8bit_map_color_rgb); set_dev_proc(dev, map_cmyk_color, cmyk_8bit_map_cmyk_color); - - return 0; } -static int -pnmcmyk_initialize(gx_device *dev) +static void +pnmcmyk_initialize_device_procs(gx_device *dev) { - int code = pam_initialize(dev); - - if (code < 0) - return code; + pam_initialize_device_procs(dev); set_dev_proc(dev, open_device, pnmcmyk_open); - - return 0; } /* The device descriptors themselves */ const gx_device_pbm gs_pbm_device = -pbm_prn_device(pbm_initialize, "pbm", '1', 0, 1, 1, 1, 0, 0, +pbm_prn_device(pbm_initialize_device_procs, "pbm", '1', 0, 1, 1, 1, 0, 0, X_DPI, Y_DPI, pbm_print_page); const gx_device_pbm gs_pbmraw_device = -pbm_prn_device(pbm_initialize, "pbmraw", '4', 1, 1, 1, 1, 1, 0, +pbm_prn_device(pbm_initialize_device_procs, "pbmraw", '4', 1, 1, 1, 1, 1, 0, X_DPI, Y_DPI, pbm_print_page); const gx_device_pbm gs_pgm_device = -pbm_prn_device(pgm_initialize, "pgm", '2', 0, 1, 8, 255, 0, 0, +pbm_prn_device(pgm_initialize_device_procs, "pgm", '2', 0, 1, 8, 255, 0, 0, X_DPI, Y_DPI, pgm_print_page); const gx_device_pbm gs_pgmraw_device = -pbm_prn_device(pgm_initialize, "pgmraw", '5', 1, 1, 8, 255, 0, 0, +pbm_prn_device(pgm_initialize_device_procs, "pgmraw", '5', 1, 1, 8, 255, 0, 0, X_DPI, Y_DPI, pgm_print_page); const gx_device_pbm gs_pgnm_device = -pbm_prn_device(pgm_initialize, "pgnm", '2', 0, 1, 8, 255, 0, 1, +pbm_prn_device(pgm_initialize_device_procs, "pgnm", '2', 0, 1, 8, 255, 0, 1, X_DPI, Y_DPI, pgm_print_page); const gx_device_pbm gs_pgnmraw_device = -pbm_prn_device(pgm_initialize, "pgnmraw", '5', 1, 1, 8, 255, 0, 1, +pbm_prn_device(pgm_initialize_device_procs, "pgnmraw", '5', 1, 1, 8, 255, 0, 1, X_DPI, Y_DPI, pgm_print_page); const gx_device_pbm gs_ppm_device = -pbm_prn_device(ppm_initialize, "ppm", '3', 0, 3, 24, 255, 255, 0, +pbm_prn_device(ppm_initialize_device_procs, "ppm", '3', 0, 3, 24, 255, 255, 0, X_DPI, Y_DPI, ppm_print_page); const gx_device_pbm gs_ppmraw_device = -pbm_prn_device(ppm_initialize, "ppmraw", '6', 1, 3, 24, 255, 255, 0, +pbm_prn_device(ppm_initialize_device_procs, "ppmraw", '6', 1, 3, 24, 255, 255, 0, X_DPI, Y_DPI, ppm_print_page); const gx_device_pbm gs_pnm_device = -pbm_prn_device(pnm_initialize, "pnm", '3', 0, 3, 24, 255, 255, 1, +pbm_prn_device(pnm_initialize_device_procs, "pnm", '3', 0, 3, 24, 255, 255, 1, X_DPI, Y_DPI, ppm_print_page); const gx_device_pbm gs_pnmraw_device = -pbm_prn_device(pnm_initialize, "pnmraw", '6', 1, 3, 24, 255, 255, 1, +pbm_prn_device(pnm_initialize_device_procs, "pnmraw", '6', 1, 3, 24, 255, 255, 1, X_DPI, Y_DPI, ppm_print_page); const gx_device_pbm gs_pkm_device = -pbm_prn_device(pkm_initialize, "pkm", '3', 0, 4, 4, 1, 1, 0, +pbm_prn_device(pkm_initialize_device_procs, "pkm", '3', 0, 4, 4, 1, 1, 0, X_DPI, Y_DPI, pkm_print_page); const gx_device_pbm gs_pkmraw_device = -pbm_prn_device(pkm_initialize, "pkmraw", '6', 1, 4, 4, 1, 1, 0, +pbm_prn_device(pkm_initialize_device_procs, "pkmraw", '6', 1, 4, 4, 1, 1, 0, X_DPI, Y_DPI, pkm_print_page); const gx_device_pbm gs_pksm_device = -pbm_prn_device(pkm_initialize, "pksm", '1', 0, 4, 4, 1, 1, 0, +pbm_prn_device(pkm_initialize_device_procs, "pksm", '1', 0, 4, 4, 1, 1, 0, X_DPI, Y_DPI, psm_print_page); const gx_device_pbm gs_pksmraw_device = -pbm_prn_device(pkm_initialize, "pksmraw", '4', 1, 4, 4, 1, 1, 0, +pbm_prn_device(pkm_initialize_device_procs, "pksmraw", '4', 1, 4, 4, 1, 1, 0, X_DPI, Y_DPI, psm_print_page); const gx_device_pbm gs_pamcmyk32_device = -pbm_prn_device(pam_initialize, "pamcmyk32", '7', 1, 4, 32, 255, 255, 0, +pbm_prn_device(pam_initialize_device_procs, "pamcmyk32", '7', 1, 4, 32, 255, 255, 0, X_DPI, Y_DPI, pam_print_page); const gx_device_pbm gs_pnmcmyk_device = -pbm_prn_device(pnmcmyk_initialize, "pnmcmyk", '7', 1, 4, 32, 255, 255, 0, /* optimize false since this relies on GrayDetection */ +pbm_prn_device(pnmcmyk_initialize_device_procs, "pnmcmyk", '7', 1, 4, 32, 255, 255, 0, /* optimize false since this relies on GrayDetection */ X_DPI, Y_DPI, pnmcmyk_print_page); /* May output PGM, magic = 5 */ const gx_device_pbm gs_pamcmyk4_device = -pbm_prn_device(pam_initialize, "pamcmyk4", '7', 1, 4, 4, 1, 1, 0, +pbm_prn_device(pam_initialize_device_procs, "pamcmyk4", '7', 1, 4, 4, 1, 1, 0, X_DPI, Y_DPI, pam4_print_page); /* Also keep the old device name so anyone using it won't be surprised */ const gx_device_pbm gs_pam_device = -pbm_prn_device(pam_initialize, "pam", '7', 1, 4, 32, 255, 255, 0, +pbm_prn_device(pam_initialize_device_procs, "pam", '7', 1, 4, 32, 255, 255, 0, X_DPI, Y_DPI, pam_print_page); /* Plan 9 bitmaps default to 100 dpi. */ const gx_device_pbm gs_plan9bm_device = -pbm_prn_device(pbm_initialize, "plan9bm", '9', 1, 1, 1, 1, 1, 1, +pbm_prn_device(pbm_initialize_device_procs, "plan9bm", '9', 1, 1, 1, 1, 1, 1, 100, 100, pbm_print_page); /* ------ Initialization ------ */ diff --git a/devices/gdevpcx.c b/devices/gdevpcx.c index 3138b48f6..caef9703f 100644 --- a/devices/gdevpcx.c +++ b/devices/gdevpcx.c @@ -37,13 +37,10 @@ static dev_proc_print_page(pcxmono_print_page); /* Use the default RGB->color map, so we get black=0, white=1. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pcxmono_initialize(gx_device *dev) +static void +pcxmono_initialize_device_procs(gx_device *dev) { - 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, gx_default_map_rgb_color); set_dev_proc(dev, map_color_rgb, gx_default_map_color_rgb); @@ -52,12 +49,10 @@ pcxmono_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; } const gx_device_printer gs_pcxmono_device = -prn_device(pcxmono_initialize, "pcxmono", +prn_device(pcxmono_initialize_device_procs, "pcxmono", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -68,25 +63,20 @@ prn_device(pcxmono_initialize, "pcxmono", static dev_proc_print_page(pcx256_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pcxgray_initialize(gx_device *dev) +static void +pcxgray_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_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); - - return 0; } const gx_device_printer gs_pcxgray_device = -{prn_device_body(gx_device_printer, pcxgray_initialize, "pcxgray", +{prn_device_body(gx_device_printer, pcxgray_initialize_device_procs, "pcxgray", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -98,13 +88,10 @@ const gx_device_printer gs_pcxgray_device = static dev_proc_print_page(pcx16_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pcx16_initialize(gx_device *dev) +static void +pcx16_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return 0; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, map_rgb_color, pc_4bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, pc_4bit_map_color_rgb); @@ -114,12 +101,10 @@ pcx16_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; } const gx_device_printer gs_pcx16_device = -{prn_device_body(gx_device_printer, pcx16_initialize, "pcx16", +{prn_device_body(gx_device_printer, pcx16_initialize_device_procs, "pcx16", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -130,13 +115,10 @@ const gx_device_printer gs_pcx16_device = /* (Uses a fixed palette of 3,3,2 bits.) */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pcx256_initialize(gx_device *dev) +static void +pcx256_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return 0; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, map_rgb_color, pc_8bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, pc_8bit_map_color_rgb); @@ -146,12 +128,10 @@ pcx256_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; } const gx_device_printer gs_pcx256_device = -{prn_device_body(gx_device_printer, pcx256_initialize, "pcx256", +{prn_device_body(gx_device_printer, pcx256_initialize_device_procs, "pcx256", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -163,25 +143,20 @@ const gx_device_printer gs_pcx256_device = static dev_proc_print_page(pcx24b_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pcx24b_initialize(gx_device *dev) +static void +pcx24b_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return 0; + gdev_prn_initialize_device_procs_rgb_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); - - return 0; } const gx_device_printer gs_pcx24b_device = -prn_device(pcx24b_initialize, "pcx24b", +prn_device(pcx24b_initialize_device_procs, "pcx24b", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -191,25 +166,20 @@ prn_device(pcx24b_initialize, "pcx24b", static dev_proc_print_page(pcxcmyk_print_page); -static int -pcxcmyk_initialize(gx_device *dev) +static void +pcxcmyk_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk1_bg(dev); - - if (code < 0) - return 0; + 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); - - return 0; } const gx_device_printer gs_pcxcmyk_device = -{prn_device_body(gx_device_printer, pcxcmyk_initialize, "pcxcmyk", +{prn_device_body(gx_device_printer, pcxcmyk_initialize_device_procs, "pcxcmyk", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevpdfimg.c b/devices/gdevpdfimg.c index 5936012ba..6fe831e1b 100644 --- a/devices/gdevpdfimg.c +++ b/devices/gdevpdfimg.c @@ -57,13 +57,10 @@ int PCLm_close(gx_device * pdev); /* ------ The pdfimage8 device ------ */ -static int -pdfimage8_initialize(gx_device *dev) +static void +pdfimage8_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray(dev); set_dev_proc(dev, open_device, pdf_image_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -76,13 +73,11 @@ pdfimage8_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; } const gx_device_pdf_image gs_pdfimage8_device = { prn_device_body(gx_device_pdf_image, - pdfimage8_initialize, + pdfimage8_initialize_device_procs, "pdfimage8", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -99,13 +94,10 @@ const gx_device_pdf_image gs_pdfimage8_device = { }; /* ------ The pdfimage24 device ------ */ -static int -pdfimage24_initialize(gx_device *dev) +static void +pdfimage24_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb(dev); set_dev_proc(dev, open_device, pdf_image_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -118,13 +110,11 @@ pdfimage24_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; } const gx_device_pdf_image gs_pdfimage24_device = { prn_device_body(gx_device_pdf_image, - pdfimage24_initialize, + pdfimage24_initialize_device_procs, "pdfimage24", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -141,13 +131,10 @@ const gx_device_pdf_image gs_pdfimage24_device = { }; /* ------ The pdfimage32 device ------ */ -static int -pdfimage32_initialize(gx_device *dev) +static void +pdfimage32_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk8(dev); set_dev_proc(dev, open_device, pdf_image_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -160,13 +147,11 @@ pdfimage32_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; } const gx_device_pdf_image gs_pdfimage32_device = { prn_device_body(gx_device_pdf_image, - pdfimage32_initialize, + pdfimage32_initialize_device_procs, "pdfimage32", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -1140,13 +1125,10 @@ pdf_image_put_params_downscale_cmyk_ets(gx_device * dev, gs_param_list * plist) } /* ------ The PCLm device ------ */ -static int -PCLm_initialize(gx_device *dev) +static void +PCLm_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb(dev); set_dev_proc(dev, open_device, PCLm_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -1159,15 +1141,13 @@ PCLm_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; } static dev_proc_print_page(PCLm_print_page); const gx_device_pdf_image gs_PCLm_device = { prn_device_body(gx_device_pdf_image, - PCLm_initialize, + PCLm_initialize_device_procs, "pclm", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ diff --git a/devices/gdevpdfocr.c b/devices/gdevpdfocr.c index 6e5ca352d..61a0e37fd 100644 --- a/devices/gdevpdfocr.c +++ b/devices/gdevpdfocr.c @@ -142,13 +142,10 @@ pdfocr_get_params_downscale(gx_device * dev, gs_param_list * plist) } /* ------ The pdfocr8 device ------ */ -static int -pdfocr8_initialize(gx_device *dev) +static void +pdfocr8_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray(dev); set_dev_proc(dev, open_device, pdf_ocr_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -161,13 +158,11 @@ pdfocr8_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; } const gx_device_pdf_image gs_pdfocr8_device = { prn_device_body(gx_device_pdf_image, - pdfocr8_initialize, + pdfocr8_initialize_device_procs, "pdfocr8", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -184,13 +179,10 @@ const gx_device_pdf_image gs_pdfocr8_device = { }; /* ------ The pdfocr24 device ------ */ -static int -pdfocr24_initialize(gx_device *dev) +static void +pdfocr24_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb(dev); set_dev_proc(dev, open_device, pdf_ocr_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -203,13 +195,11 @@ pdfocr24_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; } const gx_device_pdf_image gs_pdfocr24_device = { prn_device_body(gx_device_pdf_image, - pdfocr24_initialize, + pdfocr24_initialize_device_procs, "pdfocr24", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -226,26 +216,21 @@ const gx_device_pdf_image gs_pdfocr24_device = { }; /* ------ The pdfocr32 device ------ */ -static int -pdfocr32_initialize(gx_device *dev) +static void +pdfocr32_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk8(dev); set_dev_proc(dev, open_device, pdf_ocr_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); set_dev_proc(dev, close_device, pdf_ocr_close); set_dev_proc(dev, get_params, pdfocr_get_params_downscale_cmyk); set_dev_proc(dev, put_params, pdfocr_put_params_downscale_cmyk); - - return 0; } const gx_device_pdf_image gs_pdfocr32_device = { prn_device_body(gx_device_pdf_image, - pdfocr32_initialize, + pdfocr32_initialize_device_procs, "pdfocr32", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ diff --git a/devices/gdevpe.c b/devices/gdevpe.c index 5a47397f0..228408b43 100644 --- a/devices/gdevpe.c +++ b/devices/gdevpe.c @@ -50,19 +50,17 @@ dev_proc_close_device(pe_close); dev_proc_fill_rectangle(pe_fill_rectangle); dev_proc_copy_mono(pe_copy_mono); -static int -pe_initialize(gx_device *dev) +static void +pe_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, pe_open); set_dev_proc(dev, close_device, pe_close); set_dev_proc(dev, fill_rectangle, pe_fill_rectangle); set_dev_proc(dev, copy_mono, pe_copy_mono); - - return 0; } gx_device_pe far_data gs_pe_device = -{ std_device_std_body(gx_device_pe, pe_initialize, "pe", +{ std_device_std_body(gx_device_pe, pe_initialize_device_procs, "pe", XSIZE, YSIZE, XPPI, YPPI), { 0 }, /* std_procs */ DEFAULT_ADDRESS, DEFAULT_REGISTERS diff --git a/devices/gdevperm.c b/devices/gdevperm.c index 98c4a191a..56ef5cb55 100644 --- a/devices/gdevperm.c +++ b/devices/gdevperm.c @@ -57,13 +57,10 @@ struct gx_device_perm_s { }; typedef struct gx_device_perm_s gx_device_perm_t; -static int -perm_initialize(gx_device *dev) +static void +perm_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, get_params, perm_get_params); set_dev_proc(dev, put_params, perm_put_params); @@ -71,12 +68,11 @@ perm_initialize(gx_device *dev) set_dev_proc(dev, get_color_comp_index, perm_get_color_comp_index); set_dev_proc(dev, encode_color, perm_encode_color); set_dev_proc(dev, decode_color, perm_decode_color); - - return 0; } const gx_device_perm_t gs_perm_device = { - prn_device_body_extended(gx_device_perm_t, perm_initialize, "permute", + prn_device_body_extended(gx_device_perm_t, + perm_initialize_device_procs, "permute", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 72, 72, 0, 0, 0, 0, GX_DEVICE_COLOR_MAX_COMPONENTS, 4, diff --git a/devices/gdevphex.c b/devices/gdevphex.c index 74d0c858a..2c832da6a 100644 --- a/devices/gdevphex.c +++ b/devices/gdevphex.c @@ -1007,13 +1007,10 @@ static const HFUNCS htable[ MAXHTONE ] = { * The definition is based on GS macros, the only real stuff that we * define here are the photoex_ functions. */ -static int -photoex_initialize(gx_device *dev) +static void +photoex_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, photoex_open); set_dev_proc(dev, map_rgb_color, photoex_map_rgb_color); @@ -1022,8 +1019,6 @@ photoex_initialize(gx_device *dev) set_dev_proc(dev, put_params, photoex_put_params); set_dev_proc(dev, encode_color, photoex_encode_color); set_dev_proc(dev, decode_color, photoex_decode_color); - - return 0; } /* @@ -1039,7 +1034,7 @@ gx_photoex_device far_data gs_photoex_device = { prn_device_body( gx_photoex_device, /* Device struct type */ - photoex_initialize, /* Initialize proc */ + photoex_initialize_device_procs, /* Initialize proc */ "photoex", /* Name of the device */ DEFAULT_WIDTH_10THS, /* Default width */ DEFAULT_HEIGHT_10THS, /* Default height */ diff --git a/devices/gdevpjet.c b/devices/gdevpjet.c index b1e6516a3..53b8c9210 100644 --- a/devices/gdevpjet.c +++ b/devices/gdevpjet.c @@ -30,13 +30,10 @@ static dev_proc_print_page(paintjet_print_page); static dev_proc_print_page(pjetxl_print_page); static int pj_common_print_page(gx_device_printer *, gp_file *, int, const char *); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -paintjet_initialize(gx_device *dev) +static void +paintjet_initialize_device_procs(gx_device *dev) { - 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, gdev_pcl_3bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, gdev_pcl_3bit_map_color_rgb); @@ -46,19 +43,17 @@ paintjet_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; } const gx_device_printer far_data gs_lj250_device = - prn_device(paintjet_initialize, "lj250", + prn_device(paintjet_initialize_device_procs, "lj250", 85, /* width_10ths, 8.5" */ 110, /* height_10ths, 11" */ X_DPI, Y_DPI, 0.25, 0, 0.25, 0, /* margins */ 3, lj250_print_page); const gx_device_printer far_data gs_paintjet_device = - prn_device(paintjet_initialize, "paintjet", + prn_device(paintjet_initialize_device_procs, "paintjet", 85, /* width_10ths, 8.5" */ 110, /* height_10ths, 11" */ X_DPI, Y_DPI, @@ -66,7 +61,7 @@ const gx_device_printer far_data gs_paintjet_device = 3, paintjet_print_page); const gx_device_printer far_data gs_pjetxl_device = - prn_device(paintjet_initialize, "pjetxl", + prn_device(paintjet_initialize_device_procs, "pjetxl", 85, /* width_10ths, 8.5" */ 110, /* height_10ths, 11" */ X_DPI, Y_DPI, diff --git a/devices/gdevplan.c b/devices/gdevplan.c index f99f44910..48c5314f6 100644 --- a/devices/gdevplan.c +++ b/devices/gdevplan.c @@ -77,16 +77,13 @@ static int planr_print_page(gx_device_printer * pdev, gp_file * pstream); /* The device procedures */ -static int -plan_base_initialize(gx_device *dev, +static void +plan_base_initialize_device_procs(gx_device *dev, dev_proc_map_color_rgb(map_color_rgb), dev_proc_encode_color(encode_color), dev_proc_decode_color(decode_color)) { - int code = gdev_prn_initialize(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs(dev); set_dev_proc(dev, open_device, plan_open); set_dev_proc(dev, close_device, plan_close); @@ -94,62 +91,60 @@ plan_base_initialize(gx_device *dev, set_dev_proc(dev, get_page_device, gx_page_device_get_page_device); set_dev_proc(dev, encode_color, encode_color); set_dev_proc(dev, decode_color, decode_color); - - return 0; } -static int -planm_initialize(gx_device *dev) +static void +planm_initialize_device_procs(gx_device *dev) { - return plan_base_initialize(dev, - gdev_prn_map_color_rgb, - gdev_prn_map_rgb_color, - gdev_prn_map_color_rgb); + plan_base_initialize_device_procs(dev, + gdev_prn_map_color_rgb, + gdev_prn_map_rgb_color, + gdev_prn_map_color_rgb); } -static int -plang_initialize(gx_device *dev) +static void +plang_initialize_device_procs(gx_device *dev) { - return plan_base_initialize(dev, - plang_decode_color, - plang_encode_color, - plang_decode_color); + plan_base_initialize_device_procs(dev, + plang_decode_color, + plang_encode_color, + plang_decode_color); } -static int -plan_initialize(gx_device *dev) +static void +plan_initialize_device_procs(gx_device *dev) { - return plan_base_initialize(dev, - plan_decode_color, - gx_default_rgb_map_rgb_color, - plan_decode_color); + plan_base_initialize_device_procs(dev, + plan_decode_color, + gx_default_rgb_map_rgb_color, + plan_decode_color); } -static int -planc_initialize(gx_device *dev) +static void +planc_initialize_device_procs(gx_device *dev) { - return plan_base_initialize(dev, - planc_map_color_rgb, - planc_encode_color, - planc_decode_color); + plan_base_initialize_device_procs(dev, + planc_map_color_rgb, + planc_encode_color, + planc_decode_color); } -static int -plank_initialize(gx_device *dev) +static void +plank_initialize_device_procs(gx_device *dev) { - return plan_base_initialize(dev, - planc_map_color_rgb, - planc_encode_color, - planc_decode_color); + plan_base_initialize_device_procs(dev, + planc_map_color_rgb, + planc_encode_color, + planc_decode_color); } -static int -planr_initialize(gx_device *dev) +static void +planr_initialize_device_procs(gx_device *dev) { - return plan_base_initialize(dev, - plan_decode_color, - gx_default_rgb_map_rgb_color, - plan_decode_color); + plan_base_initialize_device_procs(dev, + plan_decode_color, + gx_default_rgb_map_rgb_color, + plan_decode_color); } /* Macro for generating device descriptors. */ @@ -163,17 +158,23 @@ planr_initialize(gx_device *dev) /* The device descriptors themselves */ const gx_device_printer gs_plan_device = - plan_prn_device(plan_initialize, "plan", 3, 24, 255, 255, plan_print_page); + plan_prn_device(plan_initialize_device_procs, "plan", + 3, 24, 255, 255, plan_print_page); const gx_device_printer gs_plang_device = - plan_prn_device(plang_initialize, "plang", 1, 8, 255, 0, plang_print_page); + plan_prn_device(plang_initialize_device_procs, "plang", + 1, 8, 255, 0, plang_print_page); const gx_device_printer gs_planm_device = - plan_prn_device(planm_initialize, "planm", 1, 1, 1, 0, planm_print_page); + plan_prn_device(planm_initialize_device_procs, "planm", + 1, 1, 1, 0, planm_print_page); const gx_device_printer gs_plank_device = - plan_prn_device(plank_initialize, "plank", 4, 4, 1, 1, plank_print_page); + plan_prn_device(plank_initialize_device_procs, "plank", + 4, 4, 1, 1, plank_print_page); const gx_device_printer gs_planc_device = - plan_prn_device(planc_initialize, "planc", 4, 32, 255, 255, planc_print_page); + plan_prn_device(planc_initialize_device_procs, "planc", + 4, 32, 255, 255, planc_print_page); const gx_device_printer gs_planr_device = - plan_prn_device(planr_initialize, "planr", 3, 3, 1, 1, planr_print_page); + plan_prn_device(planr_initialize_device_procs, "planr", + 3, 3, 1, 1, planr_print_page); /* ------ Initialization ------ */ diff --git a/devices/gdevplib.c b/devices/gdevplib.c index 96e7372a4..e4e02d1ab 100644 --- a/devices/gdevplib.c +++ b/devices/gdevplib.c @@ -267,91 +267,61 @@ static int plibk_print_page(gx_device_printer * pdev, gp_file * pstream); /* The device procedures */ -static int -plib_base_initialize(gx_device *dev) +static void +plib_base_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, plib_open); set_dev_proc(dev, close_device, plib_close); set_dev_proc(dev, put_params, plib_put_params); - - return 0; } -static int -plibm_initialize(gx_device *dev) +static void +plibm_initialize_device_procs(gx_device *dev) { - int code = plib_base_initialize(dev); - - if (code < 0) - return code; + plib_base_initialize_device_procs(dev); set_dev_proc(dev, encode_color, gdev_prn_map_rgb_color); set_dev_proc(dev, decode_color, gdev_prn_map_color_rgb); - - return 0; } -static int -plibg_initialize(gx_device *dev) +static void +plibg_initialize_device_procs(gx_device *dev) { - int code = plib_base_initialize(dev); - - if (code < 0) - return code; + plib_base_initialize_device_procs(dev); set_dev_proc(dev, encode_color, plibg_encode_color); set_dev_proc(dev, decode_color, plibg_decode_color); - - return 0; } -static int -plib_initialize(gx_device *dev) +static void +plib_initialize_device_procs(gx_device *dev) { - int code = plib_base_initialize(dev); - - if (code < 0) - return code; + plib_base_initialize_device_procs(dev); set_dev_proc(dev, encode_color, gx_default_rgb_map_rgb_color); set_dev_proc(dev, decode_color, plib_decode_color); - - return 0; } -static int -plibc_initialize(gx_device *dev) +static void +plibc_initialize_device_procs(gx_device *dev) { - int code = plib_base_initialize(dev); - - if (code < 0) - return code; + plib_base_initialize_device_procs(dev); set_dev_proc(dev, map_color_rgb, plibc_map_color_rgb); set_dev_proc(dev, encode_color, plibc_encode_color); set_dev_proc(dev, decode_color, plibc_decode_color); - - return 0; } -static int -plibk_initialize(gx_device *dev) +static void +plibk_initialize_device_procs(gx_device *dev) { - int code = plib_base_initialize(dev); - - if (code < 0) - return code; + plib_base_initialize_device_procs(dev); set_dev_proc(dev, map_color_rgb, plibc_map_color_rgb); set_dev_proc(dev, encode_color, plibc_encode_color); set_dev_proc(dev, decode_color, plibc_decode_color); - - return 0; } /* Macro for generating device descriptors. */ @@ -380,15 +350,20 @@ plibk_initialize(gx_device *dev) /* The device descriptors themselves */ const gx_device_plib gs_plib_device = - plib_prn_device(plib_initialize, "plib", 3, 24, 255, 255, plib_print_page); + plib_prn_device(plib_initialize_device_procs, "plib", + 3, 24, 255, 255, plib_print_page); const gx_device_plib gs_plibg_device = - plib_prn_device(plibg_initialize, "plibg", 1, 8, 255, 0, plibg_print_page); + plib_prn_device(plibg_initialize_device_procs, "plibg", + 1, 8, 255, 0, plibg_print_page); const gx_device_plib gs_plibm_device = - plib_prn_device(plibm_initialize, "plibm", 1, 1, 1, 0, plibm_print_page); + plib_prn_device(plibm_initialize_device_procs, "plibm", + 1, 1, 1, 0, plibm_print_page); const gx_device_plib gs_plibk_device = - plib_prn_device(plibk_initialize, "plibk", 4, 4, 1, 1, plibk_print_page); + plib_prn_device(plibk_initialize_device_procs, "plibk", + 4, 4, 1, 1, plibk_print_page); const gx_device_plib gs_plibc_device = - plib_prn_device(plibc_initialize, "plibc", 4, 32, 255, 255, plibc_print_page); + plib_prn_device(plibc_initialize_device_procs, "plibc", + 4, 32, 255, 255, plibc_print_page); /* ------ Initialization ------ */ diff --git a/devices/gdevpng.c b/devices/gdevpng.c index bc6fc8e39..861abc277 100644 --- a/devices/gdevpng.c +++ b/devices/gdevpng.c @@ -93,7 +93,7 @@ struct gx_device_png_s { const gx_device_png gs_pngmono_device = { /* The print_page proc is compatible with allowing bg printing */ - prn_device_body(gx_device_png, gdev_prn_initialize_mono_bg, "pngmono", + prn_device_body(gx_device_png, gdev_prn_initialize_device_procs_mono_bg, "pngmono", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -105,13 +105,10 @@ const gx_device_png gs_pngmono_device = /* 4-bit planar (EGA/VGA-style) color. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -png16_initialize(gx_device *dev) +static void +png16_initialize_device_procs(gx_device *dev) { - 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, pc_4bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, pc_4bit_map_color_rgb); @@ -121,12 +118,10 @@ png16_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; } const gx_device_png gs_png16_device = { - prn_device_body(gx_device_png, png16_initialize, "png16", + prn_device_body(gx_device_png, png16_initialize_device_procs, "png16", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -138,13 +133,10 @@ const gx_device_png gs_png16_device = { /* (Uses a fixed palette of 3,3,2 bits.) */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -png256_initialize(gx_device *dev) +static void +png256_initialize_device_procs(gx_device *dev) { - 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, pc_8bit_map_rgb_color); set_dev_proc(dev, map_color_rgb, pc_8bit_map_color_rgb); @@ -154,12 +146,10 @@ png256_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; } const gx_device_png gs_png256_device = { - prn_device_body(gx_device_png, png256_initialize, "png256", + prn_device_body(gx_device_png, png256_initialize_device_procs, "png256", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -170,13 +160,10 @@ const gx_device_png gs_png256_device = { /* 8-bit gray */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pnggray_initialize(gx_device *dev) +static void +pnggray_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, get_params, png_get_params_downscale); set_dev_proc(dev, put_params, png_put_params_downscale); @@ -186,12 +173,10 @@ pnggray_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; } const gx_device_png gs_pnggray_device = -{prn_device_body(gx_device_png, pnggray_initialize, "pnggray", +{prn_device_body(gx_device_png, pnggray_initialize_device_procs, "pnggray", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -202,13 +187,10 @@ const gx_device_png gs_pnggray_device = /* Monochrome (with error diffusion) */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -pngmonod_initialize(gx_device *dev) +static void +pngmonod_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray_bg(dev); set_dev_proc(dev, get_params, png_get_params_downscale_mfs); set_dev_proc(dev, put_params, png_put_params_downscale_mfs); @@ -218,12 +200,10 @@ pngmonod_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; } const gx_device_png gs_pngmonod_device = -{prn_device_body(gx_device_png, pngmonod_initialize, "pngmonod", +{prn_device_body(gx_device_png, pngmonod_initialize_device_procs, "pngmonod", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -234,13 +214,10 @@ const gx_device_png gs_pngmonod_device = /* 24-bit color. */ /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -png16m_initialize(gx_device *dev) +static void +png16m_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb_bg(dev); set_dev_proc(dev, get_params, png_get_params_downscale); set_dev_proc(dev, put_params, png_put_params_downscale); @@ -250,12 +227,10 @@ png16m_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; } const gx_device_png gs_png16m_device = -{prn_device_body(gx_device_png, png16m_initialize, "png16m", +{prn_device_body(gx_device_png, png16m_initialize_device_procs, "png16m", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -265,26 +240,21 @@ const gx_device_png gs_png16m_device = /* 48 bit color. */ -static int -png48_initialize(gx_device *dev) +static void +png48_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb_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); - - return 0; } /* Since the print_page doesn't alter the device, this device can print in the background */ const gx_device_png gs_png48_device = -{prn_device_body(gx_device_png, png48_initialize, "png48", +{prn_device_body(gx_device_png, png48_initialize_device_procs, "png48", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -308,13 +278,10 @@ struct gx_device_pngalpha_s { int background; }; -static int -pngalpha_initialize(gx_device *dev) +static void +pngalpha_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, pngalpha_open); set_dev_proc(dev, map_rgb_color, pngalpha_encode_color); @@ -329,12 +296,11 @@ pngalpha_initialize(gx_device *dev) set_dev_proc(dev, fillpage, pngalpha_fillpage); set_dev_proc(dev, put_image, pngalpha_put_image); set_dev_proc(dev, dev_spec_op, pngalpha_spec_op); - - return 0; } const gx_device_pngalpha gs_pngalpha_device = { - std_device_part1_(gx_device_pngalpha, pngalpha_initialize, "pngalpha", + std_device_part1_(gx_device_pngalpha, + pngalpha_initialize_device_procs, "pngalpha", &st_device_printer, open_init_closed), /* color_info */ {3 /* max components */, diff --git a/devices/gdevpsd.c b/devices/gdevpsd.c index c52a8fce0..70aa63174 100644 --- a/devices/gdevpsd.c +++ b/devices/gdevpsd.c @@ -148,13 +148,10 @@ gs_private_st_composite_final(st_psd_device, psd_device, "psd_device", psd_device_enum_ptrs, psd_device_reloc_ptrs, psd_device_finalize); -static int -psd_initialize(gx_device *dev) +static void +psd_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_bg(dev); set_dev_proc(dev, open_device, psd_prn_open); set_dev_proc(dev, close_device, psd_prn_close); @@ -168,8 +165,6 @@ psd_initialize(gx_device *dev) set_dev_proc(dev, update_spot_equivalent_colors, gx_devn_prn_update_spot_equivalent_colors); set_dev_proc(dev, ret_devn_params, gx_devn_prn_ret_devn_params); set_dev_proc(dev, dev_spec_op, psd_spec_op); - - return 0; } #define psd_device_body(procs, dname, ncomp, pol, depth, mg, mc, sl, cn)\ @@ -196,7 +191,7 @@ psd_initialize(gx_device *dev) */ const psd_device gs_psdrgb_device = { - psd_device_body(psd_initialize, "psdrgb", 3, GX_CINFO_POLARITY_ADDITIVE, 24, 255, 255, GX_CINFO_SEP_LIN, "DeviceRGB"), + psd_device_body(psd_initialize_device_procs, "psdrgb", 3, GX_CINFO_POLARITY_ADDITIVE, 24, 255, 255, GX_CINFO_SEP_LIN, "DeviceRGB"), /* devn_params specific parameters */ { 8, /* Bits per color - must match ncomp, depth, etc. above */ DeviceRGBComponents, /* Names of color model colorants */ @@ -217,7 +212,7 @@ const psd_device gs_psdrgb_device = const psd_device gs_psdrgb16_device = { - psd_device_body(psd_initialize, "psdrgb16", 3, GX_CINFO_POLARITY_ADDITIVE, 48, 65535, 65535, GX_CINFO_SEP_LIN, "DeviceRGB"), + psd_device_body(psd_initialize_device_procs, "psdrgb16", 3, GX_CINFO_POLARITY_ADDITIVE, 48, 65535, 65535, GX_CINFO_SEP_LIN, "DeviceRGB"), /* devn_params specific parameters */ { 16, /* Bits per color - must match ncomp, depth, etc. above */ DeviceRGBComponents, /* Names of color model colorants */ @@ -239,24 +234,19 @@ const psd_device gs_psdrgb16_device = /* * PSD device with CMYK process color model and spot color support. */ -static int -psdcmyk_initialize(gx_device *dev) +static void +psdcmyk_initialize_device_procs(gx_device *dev) { - int code = psd_initialize(dev); - - if (code < 0) - return code; + psd_initialize_device_procs(dev); set_dev_proc(dev, get_params, psd_get_params_cmyk); set_dev_proc(dev, put_params, psd_put_params_cmyk); set_dev_proc(dev, get_color_mapping_procs, get_psd_color_mapping_procs); - - return 0; } const psd_device gs_psdcmyk_device = { - psd_device_body(psdcmyk_initialize, "psdcmyk", + psd_device_body(psdcmyk_initialize_device_procs, "psdcmyk", ARCH_SIZEOF_GX_COLOR_INDEX, /* Number of components - need a nominal 1 bit for each */ GX_CINFO_POLARITY_SUBTRACTIVE, ARCH_SIZEOF_GX_COLOR_INDEX * 8, /* 8 bits per component (albeit in planes) */ @@ -281,7 +271,7 @@ const psd_device gs_psdcmyk_device = const psd_device gs_psdcmyk16_device = { - psd_device_body(psdcmyk_initialize, "psdcmyk16", + psd_device_body(psdcmyk_initialize_device_procs, "psdcmyk16", ARCH_SIZEOF_GX_COLOR_INDEX, /* Number of components - need a nominal 1 bit for each */ GX_CINFO_POLARITY_SUBTRACTIVE, ARCH_SIZEOF_GX_COLOR_INDEX * 16, /* 8 bits per component (albeit in planes) */ diff --git a/devices/gdevrinkj.c b/devices/gdevrinkj.c index 57025a5cb..7a8a3d44f 100644 --- a/devices/gdevrinkj.c +++ b/devices/gdevrinkj.c @@ -126,8 +126,8 @@ typedef struct rinkj_device_s { char setup_fn[256]; } rinkj_device; -static int -spot_cmyk_initialize(gx_device *dev) +static void +spot_cmyk_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, gdev_prn_open); set_dev_proc(dev, output_page, gdev_prn_bg_output_page); @@ -140,13 +140,12 @@ spot_cmyk_initialize(gx_device *dev) set_dev_proc(dev, get_color_comp_index, rinkj_get_color_comp_index); set_dev_proc(dev, encode_color, rinkj_encode_color); set_dev_proc(dev, decode_color, rinkj_decode_color); - - return 0; } const rinkj_device gs_rinkj_device = { - prn_device_body_extended(rinkj_device, spot_cmyk_initialize, "rinkj", + prn_device_body_extended(rinkj_device, + spot_cmyk_initialize_device_procs, "rinkj", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, /* X and Y hardware resolution */ 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevsj48.c b/devices/gdevsj48.c index 7c7bce0cd..8d0e478c1 100644 --- a/devices/gdevsj48.c +++ b/devices/gdevsj48.c @@ -41,7 +41,7 @@ static dev_proc_print_page(sj48_print_page); /* The print_page proc is compatible with allowing bg printing */ gx_device_printer far_data gs_sj48_device = - prn_device(gdev_prn_initialize_mono_bg, "sj48", + prn_device(gdev_prn_initialize_device_procs_mono_bg, "sj48", 80, /* width_10ths, 8" */ 105, /* height_10ths, 10.5" */ 360, /* x_dpi */ diff --git a/devices/gdevsnfb.c b/devices/gdevsnfb.c index d396ec72d..156a7a425 100644 --- a/devices/gdevsnfb.c +++ b/devices/gdevsnfb.c @@ -28,23 +28,18 @@ static dev_proc_open_device(sonyfb_open); static dev_proc_output_page(sonyfb_output_page); static dev_proc_close_device(sonyfb_close); -static int -sonyfb_initialize(gx_device *dev) +static void +sonyfb_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono_bg(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono_bg(dev); set_dev_proc(dev, open_device, sonyfb_open); set_dev_proc(dev, output_page, sonyfb_output_page); set_dev_proc(dev, close_device, sonyfb_close); - - return 0; } const gx_device_printer far_data gs_sonyfb_device = - prn_device(sonyfb_initialize, "sonyfb", + prn_device(sonyfb_initialize_device_procs, "sonyfb", 102.4, /* width_10ths */ 103.2, /* height_10ths */ 100, /* x_dpi */ diff --git a/devices/gdevstc.c b/devices/gdevstc.c index 45157d350..7de3d905b 100644 --- a/devices/gdevstc.c +++ b/devices/gdevstc.c @@ -130,8 +130,8 @@ static dev_proc_map_color_rgb(stc_map_color_cmyk10); /*** *** Table of Device-Procedures ***/ -static int -stcolor_initialize(gx_device *dev) +static void +stcolor_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, stc_open); set_dev_proc(dev, get_initial_matrix, gx_default_get_initial_matrix); @@ -143,8 +143,6 @@ stcolor_initialize(gx_device *dev) set_dev_proc(dev, get_params, stc_get_params); set_dev_proc(dev, put_params, stc_put_params); set_dev_proc(dev, map_cmyk_color, stc_map_cmyk_color); - - return 0; } /*** @@ -157,7 +155,7 @@ static float defext[] = { 0.0, 1.0 }; *** Main device-control structure ***/ stcolor_device far_data gs_stcolor_device = { - prn_device_body(stcolor_device, stcolor_initialize, "stcolor", + prn_device_body(stcolor_device, stcolor_initialize_device_procs, "stcolor", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, STC_L_MARGIN,STC_B_MARGIN,STC_R_MARGIN,STC_T_MARGIN, diff --git a/devices/gdevtfax.c b/devices/gdevtfax.c index d1ce7181e..531eb9649 100644 --- a/devices/gdevtfax.c +++ b/devices/gdevtfax.c @@ -55,27 +55,22 @@ typedef struct gx_device_tfax_s gx_device_tfax; /* Define procedures that adjust the paper size. */ /* FIXME: From initial analysis this is NOT safe for bg_printing, but might be fixable */ -static int -tfax_initialize(gx_device *dev) +static void +tfax_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono(dev); set_dev_proc(dev, open_device, tfax_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); set_dev_proc(dev, close_device, tfax_close); set_dev_proc(dev, get_params, tfax_get_params); set_dev_proc(dev, put_params, tfax_put_params); - - return 0; } #define TFAX_DEVICE(dname, print_page, compr)\ {\ - FAX_DEVICE_BODY(gx_device_tfax, tfax_initialize, dname, print_page),\ + FAX_DEVICE_BODY(gx_device_tfax, tfax_initialize_device_procs, dname, print_page),\ TIFF_DEFAULT_STRIP_SIZE /* strip size byte count */,\ ARCH_IS_BIG_ENDIAN /* default to native endian (i.e. use big endian iff the platform is so*/,\ false, /* default to not using bigtiff */\ @@ -272,7 +267,7 @@ static dev_proc_print_page(tifflzw_print_page); static dev_proc_print_page(tiffpack_print_page); const gx_device_tfax gs_tifflzw_device = { - prn_device_std_body(gx_device_tfax, tfax_initialize, "tifflzw", + prn_device_std_body(gx_device_tfax, tfax_initialize_device_procs, "tifflzw", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ @@ -288,7 +283,7 @@ const gx_device_tfax gs_tifflzw_device = { }; const gx_device_tfax gs_tiffpack_device = { - prn_device_std_body(gx_device_tfax, tfax_initialize, "tiffpack", + prn_device_std_body(gx_device_tfax, tfax_initialize_device_procs, "tiffpack", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevtfnx.c b/devices/gdevtfnx.c index 07292f297..b38c3f87a 100644 --- a/devices/gdevtfnx.c +++ b/devices/gdevtfnx.c @@ -39,13 +39,10 @@ static dev_proc_print_page(tiff_rgb_print_page); /* FIXME: From initial analysis this is NOT safe for bg_printing, but might be fixable */ -static int -tiff12_initialize(gx_device *dev) +static void +tiff12_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -58,17 +55,12 @@ tiff12_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; } -static int -tiff24_initialize(gx_device *dev) +static void +tiff24_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -81,12 +73,10 @@ tiff24_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; } const gx_device_tiff gs_tiff12nc_device = { - prn_device_std_body(gx_device_tiff, tiff12_initialize, "tiff12nc", + prn_device_std_body(gx_device_tiff, tiff12_initialize_device_procs, "tiff12nc", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, @@ -102,7 +92,7 @@ const gx_device_tiff gs_tiff12nc_device = { }; const gx_device_tiff gs_tiff24nc_device = { - prn_device_std_body(gx_device_tiff, tiff24_initialize, "tiff24nc", + prn_device_std_body(gx_device_tiff, tiff24_initialize_device_procs, "tiff24nc", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, @@ -118,7 +108,7 @@ const gx_device_tiff gs_tiff24nc_device = { }; const gx_device_tiff gs_tiff48nc_device = { - prn_device_std_body(gx_device_tiff, tiff24_initialize, "tiff48nc", + prn_device_std_body(gx_device_tiff, tiff24_initialize_device_procs, "tiff48nc", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, diff --git a/devices/gdevtknk.c b/devices/gdevtknk.c index ebc0a181a..01c154bf9 100644 --- a/devices/gdevtknk.c +++ b/devices/gdevtknk.c @@ -32,13 +32,10 @@ static dev_proc_map_rgb_color(tekink_map_rgb_color); static dev_proc_map_color_rgb(tekink_map_color_rgb); static dev_proc_print_page(tekink_print_page); /* Since the print_page doesn't alter the device, this device can print in the background */ -static int -tekink_initialize(gx_device *dev) +static void +tekink_initialize_device_procs(gx_device *dev) { - 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, tekink_map_rgb_color); set_dev_proc(dev, map_color_rgb, tekink_map_color_rgb); @@ -48,8 +45,6 @@ tekink_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; } /* @@ -59,7 +54,7 @@ tekink_initialize(gx_device *dev) aspect ratio is close to sqrt(2). */ const gx_device_printer far_data gs_tek4696_device = - prn_device(tekink_initialize,"tek4696", + prn_device(tekink_initialize_device_procs,"tek4696", 85,120, /* Page size in 10th of inches */ 120,120, /* Resolution in DPI */ 0.0,0.0,0.0,0.0, /* Margins */ diff --git a/devices/gdevtrac.c b/devices/gdevtrac.c index d19136059..866c8d06d 100644 --- a/devices/gdevtrac.c +++ b/devices/gdevtrac.c @@ -588,8 +588,8 @@ trace_text_begin(gx_device * dev, gs_gstate * pgs, /* ---------------- The device definition ---------------- */ -static int -tr_base_initialize(gx_device *dev, +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)), @@ -616,8 +616,6 @@ tr_base_initialize(gx_device *dev, set_dev_proc(dev, begin_typed_image, trace_begin_typed_image); set_dev_proc(dev, text_begin, trace_text_begin); set_dev_proc(dev, strip_copy_rop2, trace_strip_copy_rop2); - - return 0; } #define TRACE_DEVICE_BODY(dname, ncomp, depth, init)\ @@ -631,41 +629,39 @@ tr_base_initialize(gx_device *dev, (ncomp > 1 ? 1 << (depth / ncomp) : 1)),\ } -static init -tr_mono_initialize(gx_device *dev) +static void +tr_mono_initialize_device_procs(gx_device *dev) { - return tr_base_initialize(dev, + tr_base_initialize_device_procs(dev, gx_default_b_w_map_rgb_color, gx_default_b_w_map_color_rgb, NULL, NULL); } const gx_device gs_tr_mono_device = { - TRACE_DEVICE_BODY("tr_mono", 1, 1, tr_mono_initialize) + TRACE_DEVICE_BODY("tr_mono", 1, 1, tr_mono_initialize_device_procs) }; -static int -tr_rgb_initialize(gx_device *dev) +static void +tr_rgb_initialize_device_procs(gx_device *dev) { - return tr_base_initialize(dev, + tr_base_initialize_device_procs(dev, gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb, NULL, NULL); } const gx_device gs_tr_rgb_device = { - TRACE_DEVICE_BODY("tr_rgb", 3, 24, tr_rgb_initialize); + TRACE_DEVICE_BODY("tr_rgb", 3, 24, tr_rgb_initialize_device_procs) }; -static int -tr_cmyk_initialize(gx_device *dev) +static void +tr_cmyk_initialize_device_procs(gx_device *dev) { - return tr_base_initialize(dev, + tr_base_initialize_device_procs(dev, NULL, cmyk_1bit_map_color_rgb, cmyk_1bit_map_cmyk_color, NULL); } const gx_device gs_tr_cmyk_device = { - TRACE_DEVICE_BODY("tr_cmyk", 4, 4, - NULL, cmyk_1bit_map_color_rgb, - cmyk_1bit_map_cmyk_color, NULL) + TRACE_DEVICE_BODY("tr_cmyk", 4, 4, tr_cmyk_initialize_device_procs) }; diff --git a/devices/gdevtsep.c b/devices/gdevtsep.c index fac7b3bb5..cce340cf2 100644 --- a/devices/gdevtsep.c +++ b/devices/gdevtsep.c @@ -72,13 +72,10 @@ static dev_proc_print_page(tiffgray_print_page); /* FIXME: From initial analysis this is NOT safe for bg_printing, but might be fixable */ -static int -tiffgray_initialize(gx_device *dev) +static void +tiffgray_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -91,12 +88,10 @@ tiffgray_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; } const gx_device_tiff gs_tiffgray_device = { - prn_device_body(gx_device_tiff, tiffgray_initialize, "tiffgray", + prn_device_body(gx_device_tiff, tiffgray_initialize_device_procs, "tiffgray", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* Margins */ @@ -126,13 +121,10 @@ dev_proc_open_device(tiff_open_s); static dev_proc_print_page(tiffscaled_print_page); static int tiff_set_icc_color_fields(gx_device_printer *pdev); -static int -tiffscaled_initialize(gx_device *dev) +static void +tiffscaled_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -145,13 +137,11 @@ tiffscaled_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; } const gx_device_tiff gs_tiffscaled_device = { prn_device_body(gx_device_tiff, - tiffscaled_initialize, + tiffscaled_initialize_device_procs, "tiffscaled", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -174,13 +164,10 @@ const gx_device_tiff gs_tiffscaled_device = { static dev_proc_print_page(tiffscaled8_print_page); -static int -tiffscaled8_initialize(gx_device *dev) +static void +tiffscaled8_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_gray(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_gray(dev); set_dev_proc(dev, open_device, tiff_open_s); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -194,13 +181,11 @@ tiffscaled8_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; } const gx_device_tiff gs_tiffscaled8_device = { prn_device_body(gx_device_tiff, - tiffscaled8_initialize, + tiffscaled8_initialize_device_procs, "tiffscaled8", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -223,13 +208,10 @@ const gx_device_tiff gs_tiffscaled8_device = { static dev_proc_print_page(tiffscaled24_print_page); -static int -tiffscaled24_initialize(gx_device *dev) +static void +tiffscaled24_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_rgb(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_rgb(dev); set_dev_proc(dev, open_device, tiff_open_s); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -237,13 +219,11 @@ tiffscaled24_initialize(gx_device *dev) set_dev_proc(dev, get_params, tiff_get_params_downscale); set_dev_proc(dev, put_params, tiff_put_params_downscale); set_dev_proc(dev, dev_spec_op, tiffscaled_spec_op); - - return 0; } const gx_device_tiff gs_tiffscaled24_device = { prn_device_body(gx_device_tiff, - tiffscaled24_initialize, + tiffscaled24_initialize_device_procs, "tiffscaled24", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -266,13 +246,10 @@ const gx_device_tiff gs_tiffscaled24_device = { static dev_proc_print_page(tiffscaled32_print_page); -static int -tiffscaled32_initialize(gx_device *dev) +static void +tiffscaled32_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk8(dev); set_dev_proc(dev, open_device, tiff_open_s); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); @@ -280,13 +257,11 @@ tiffscaled32_initialize(gx_device *dev) set_dev_proc(dev, get_params, tiff_get_params_downscale_cmyk); set_dev_proc(dev, put_params, tiff_put_params_downscale_cmyk); set_dev_proc(dev, dev_spec_op, tiffscaled_spec_op); - - return 0; } const gx_device_tiff gs_tiffscaled32_device = { prn_device_body(gx_device_tiff, - tiffscaled32_initialize, + tiffscaled32_initialize_device_procs, "tiffscaled32", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -309,26 +284,21 @@ const gx_device_tiff gs_tiffscaled32_device = { static dev_proc_print_page(tiffscaled4_print_page); -static int -tiffscaled4_initialize(gx_device *dev) +static void +tiffscaled4_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk8(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); set_dev_proc(dev, close_device, tiff_close); set_dev_proc(dev, get_params, tiff_get_params_downscale_cmyk_ets); set_dev_proc(dev, put_params, tiff_put_params_downscale_cmyk_ets); - - return 0; } const gx_device_tiff gs_tiffscaled4_device = { prn_device_body(gx_device_tiff, - tiffscaled4_initialize, + tiffscaled4_initialize_device_procs, "tiffscaled4", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 600, 600, /* 600 dpi by default */ @@ -589,25 +559,20 @@ static dev_proc_print_page(tiffcmyk_print_page); /* 8-bit-per-plane separated CMYK color. */ -static int -tiffcmyk_initialize(gx_device *dev) +static void +tiffcmyk_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk8(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk8(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); set_dev_proc(dev, close_device, tiff_close); set_dev_proc(dev, get_params, tiff_get_params); set_dev_proc(dev, put_params, tiff_put_params); - - return 0; } const gx_device_tiff gs_tiff32nc_device = { - prn_device_body(gx_device_tiff, tiffcmyk_initialize, "tiff32nc", + prn_device_body(gx_device_tiff, tiffcmyk_initialize_device_procs, "tiff32nc", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* Margins */ @@ -624,25 +589,20 @@ const gx_device_tiff gs_tiff32nc_device = { /* 16-bit-per-plane separated CMYK color. */ -static int -tiff64_initialize(gx_device *dev) +static void +tiff64_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_cmyk16(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_cmyk16(dev); set_dev_proc(dev, open_device, tiff_open); set_dev_proc(dev, output_page, gdev_prn_output_page_seekable); set_dev_proc(dev, close_device, tiff_close); set_dev_proc(dev, get_params, tiff_get_params); set_dev_proc(dev, put_params, tiff_put_params); - - return 0; } const gx_device_tiff gs_tiff64nc_device = { - prn_device_body(gx_device_tiff, tiff64_initialize, "tiff64nc", + prn_device_body(gx_device_tiff, tiff64_initialize_device_procs, "tiff64nc", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, 0, 0, 0, 0, /* Margins */ @@ -789,13 +749,10 @@ gs_private_st_composite_final(st_tiffsep_device, tiffsep_device, "tiffsep_device", tiffsep_device_enum_ptrs, tiffsep_device_reloc_ptrs, tiffsep_device_finalize); -static int -tiffsep_initialize(gx_device *dev) +static void +tiffsep_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs(dev); set_dev_proc(dev, open_device, tiffsep_prn_open); set_dev_proc(dev, close_device, tiffsep_prn_close); @@ -809,24 +766,17 @@ tiffsep_initialize(gx_device *dev) set_dev_proc(dev, update_spot_equivalent_colors, tiffsep_update_spot_equivalent_colors); set_dev_proc(dev, ret_devn_params, tiffsep_ret_devn_params); set_dev_proc(dev, dev_spec_op, tiffsep_spec_op); - - return 0; } -static int -tiffsep1_initialize(gx_device *dev) +static void +tiffsep1_initialize_device_procs(gx_device *dev) { - int code = tiffsep_initialize(dev); - - if (code < 0) - return code; + tiffsep_initialize_device_procs(dev); set_dev_proc(dev, open_device, tiffsep1_prn_open); set_dev_proc(dev, close_device, tiffsep1_prn_close); set_dev_proc(dev, put_params, tiffsep1_put_params); set_dev_proc(dev, fill_path, sep1_fill_path); - - return 0; } #define tiffsep_devices_body(dtype, procs, dname, ncomp, pol, depth, mg, mc, sl, cn, print_page, compr)\ @@ -868,7 +818,7 @@ tiffsep1_initialize(gx_device *dev) */ const tiffsep_device gs_tiffsep_device = { - tiffsep_devices_body(tiffsep_device, tiffsep_initialize, "tiffsep", ARCH_SIZEOF_GX_COLOR_INDEX, GX_CINFO_POLARITY_SUBTRACTIVE, GCIB, MAX_COLOR_VALUE, MAX_COLOR_VALUE, GX_CINFO_SEP_LIN, "DeviceCMYK", tiffsep_print_page, COMPRESSION_LZW), + tiffsep_devices_body(tiffsep_device, tiffsep_initialize_device_procs, "tiffsep", ARCH_SIZEOF_GX_COLOR_INDEX, GX_CINFO_POLARITY_SUBTRACTIVE, GCIB, MAX_COLOR_VALUE, MAX_COLOR_VALUE, GX_CINFO_SEP_LIN, "DeviceCMYK", tiffsep_print_page, COMPRESSION_LZW), /* devn_params specific parameters */ { 8, /* Ignored - Bits per color */ DeviceCMYKComponents, /* Names of color model colorants */ @@ -885,7 +835,7 @@ const tiffsep_device gs_tiffsep_device = const tiffsep1_device gs_tiffsep1_device = { - tiffsep_devices_body(tiffsep1_device, tiffsep1_initialize, "tiffsep1", ARCH_SIZEOF_GX_COLOR_INDEX, GX_CINFO_POLARITY_SUBTRACTIVE, GCIB, MAX_COLOR_VALUE, MAX_COLOR_VALUE, GX_CINFO_SEP_LIN, "DeviceCMYK", tiffsep1_print_page, COMPRESSION_CCITTFAX4), + tiffsep_devices_body(tiffsep1_device, tiffsep1_initialize_device_procs, "tiffsep1", ARCH_SIZEOF_GX_COLOR_INDEX, GX_CINFO_POLARITY_SUBTRACTIVE, GCIB, MAX_COLOR_VALUE, MAX_COLOR_VALUE, GX_CINFO_SEP_LIN, "DeviceCMYK", tiffsep1_print_page, COMPRESSION_CCITTFAX4), /* devn_params specific parameters */ { 8, /* Ignored - Bits per color */ DeviceCMYKComponents, /* Names of color model colorants */ @@ -3016,22 +2966,23 @@ tiff_open_s(gx_device *pdev) memset(&(pdev->procs), 0, sizeof(pdev->procs)); switch (pdev->icc_struct->device_profile[GS_DEFAULT_DEVICE_PROFILE]->num_comps) { case 1: - pdev->initialize = tiffscaled8_initialize; + pdev->initialize_device_procs = tiffscaled8_initialize_device_procs; pdev->color_info.dither_colors = 0; pdev->color_info.max_color = 0; break; case 3: - pdev->initialize = tiffscaled24_initialize; + pdev->initialize_device_procs = tiffscaled24_initialize_device_procs; pdev->color_info.dither_colors = 0; pdev->color_info.max_color = 0; break; case 4: - pdev->initialize = tiffscaled32_initialize; + pdev->initialize_device_procs = tiffscaled32_initialize_device_procs; pdev->color_info.dither_colors = 256; pdev->color_info.max_color = 255; break; } - (void)pdev->initialize(pdev); + pdev->initialize_device_procs(pdev); + /* We know pdev->procs.initialize_device is NULL */ check_device_separable(pdev); gx_device_fill_in_procs(pdev); } diff --git a/devices/gdevupd.c b/devices/gdevupd.c index 5a0a5565f..b661c9513 100644 --- a/devices/gdevupd.c +++ b/devices/gdevupd.c @@ -212,8 +212,8 @@ static int upd_procs_map( upd_device *udev); #define upd_set_dev_proc(dev, p, proc) \ ((dev)->std_procs.p = (dev)->orig_procs.p = (proc)) -static int -upd_initialize(gx_device *dev) +static void +upd_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, upd_open); set_dev_proc(dev, output_page, gdev_prn_output_page); @@ -223,8 +223,6 @@ upd_initialize(gx_device *dev) set_dev_proc(dev, get_params, upd_get_params); set_dev_proc(dev, put_params, upd_put_params); set_dev_proc(dev, map_cmyk_color, gx_default_map_cmyk_color); - - return 0; } /** @@ -246,7 +244,7 @@ and the reader might directly skip to the section titled */ upd_device far_data gs_uniprint_device = { /** */ - prn_device_body(upd_device, upd_initialize, /** The Type and Init Proc */ + prn_device_body(upd_device, upd_initialize_device_procs, /** The Type and Init Proc */ "uniprint", /** External name of the Device */ DEFAULT_WIDTH_10THS, /** X-Size (1/10") */ DEFAULT_HEIGHT_10THS, /** Y-Size (1/10") */ diff --git a/devices/gdevwpr2.c b/devices/gdevwpr2.c index 1f9ad263f..1a80f2264 100644 --- a/devices/gdevwpr2.c +++ b/devices/gdevwpr2.c @@ -147,13 +147,10 @@ static dev_proc_put_params(win_pr2_put_params); static int win_pr2_set_bpp(gx_device * dev, int depth); -static int -win_pr2_initialize(gx_device *dev) +static void +win_pr2_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs(dev); set_dev_proc(dev, open_device, win_pr2_open); set_dev_proc(dev, close_device, win_pr2_close); @@ -167,8 +164,6 @@ win_pr2_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; } #define PARENT_WINDOW HWND_DESKTOP @@ -217,7 +212,7 @@ struct gx_device_win_pr2_s { gx_device_win_pr2 far_data gs_mswinpr2_device = { prn_device_std_body(gx_device_win_pr2, - win_pr2_initialize, + win_pr2_initialize_device_procs, "mswinpr2", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, 72.0, 72.0, diff --git a/devices/gdevx.c b/devices/gdevx.c index 53f15cc10..0ea2dabf0 100644 --- a/devices/gdevx.c +++ b/devices/gdevx.c @@ -162,14 +162,18 @@ gs_public_st_suffix_add1_final(st_device_X, gx_device_X, x_finalize, st_device_bbox, buffer); x_device(gs_x11_device, - std_device_color_stype_body(gx_device_X, gdev_x_initialize, "x11", &st_device_X, + std_device_color_stype_body(gx_device_X, + gdev_x_initialize_device_procs, + "x11", &st_device_X, FAKE_RES * DEFAULT_WIDTH_10THS / 10, FAKE_RES * DEFAULT_HEIGHT_10THS / 10, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ 24, 255, 256 )) x_device(gs_x11alpha_device, - std_device_dci_alpha_type_body(gx_device_X, gdev_x_initialize, "x11alpha", &st_device_X, + std_device_dci_alpha_type_body(gx_device_X, + gdev_x_initialize_device_procs, + "x11alpha", &st_device_X, FAKE_RES * DEFAULT_WIDTH_10THS / 10, FAKE_RES * DEFAULT_HEIGHT_10THS / 10, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ diff --git a/devices/gdevx.h b/devices/gdevx.h index 03defc609..5e352f3fd 100644 --- a/devices/gdevx.h +++ b/devices/gdevx.h @@ -227,7 +227,7 @@ dev_proc_map_rgb_color(gdev_x_map_rgb_color); /* gdevxcmp.c */ dev_proc_map_color_rgb(gdev_x_map_color_rgb); /* gdevxcmp.c */ dev_proc_get_params(gdev_x_get_params); /* gdevxini.c */ dev_proc_put_params(gdev_x_put_params); /* gdevxini.c */ -dev_proc_initialize(gdev_x_initialize); /* gdevxini.c */ +dev_proc_initialize_device_procs(gdev_x_initialize_device_procs); /* gdevxini.c */ dev_proc_open_device(x_open); dev_proc_get_initial_matrix(x_get_initial_matrix); dev_proc_sync_output(x_sync); diff --git a/devices/gdevxalt.c b/devices/gdevxalt.c index 06e81b77a..d33a9dbab 100644 --- a/devices/gdevxalt.c +++ b/devices/gdevxalt.c @@ -547,8 +547,8 @@ static dev_proc_map_cmyk_color(x_cmyk_map_cmyk_color); /* Extended device procedures */ static dev_proc_map_color_rgb(x_cmyk_alt_map_color); -static int -x_cmyk_initialize(gx_device *dev) +static void +x_cmyk_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, x_cmyk_open); set_dev_proc(dev, get_initial_matrix, gx_forward_get_initial_matrix); @@ -565,13 +565,12 @@ x_cmyk_initialize(gx_device *dev) set_dev_proc(dev, map_cmyk_color, x_cmyk_map_cmyk_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); - - return 0; } /* The instances are public. */ const gx_device_X_wrapper gs_x11cmyk_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_cmyk_initialize, "x11cmyk", + std_device_dci_type_body(gx_device_X_wrapper, + x_cmyk_initialize_device_procs, "x11cmyk", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -579,7 +578,8 @@ const gx_device_X_wrapper gs_x11cmyk_device = { X_WRAPPER_DATA(x_cmyk_alt_map_color) }; const gx_device_X_wrapper gs_x11cmyk2_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_cmyk_initialize, "x11cmyk2", + std_device_dci_type_body(gx_device_X_wrapper, + x_cmyk_initialize_device_procs, "x11cmyk2", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -587,7 +587,8 @@ const gx_device_X_wrapper gs_x11cmyk2_device = { X_WRAPPER_DATA(x_cmyk_alt_map_color) }; const gx_device_X_wrapper gs_x11cmyk4_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_cmyk_initialize, "x11cmyk4", + std_device_dci_type_body(gx_device_X_wrapper, + x_cmyk_initialize_device_procs, "x11cmyk4", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -595,7 +596,8 @@ const gx_device_X_wrapper gs_x11cmyk4_device = { X_WRAPPER_DATA(x_cmyk_alt_map_color) }; const gx_device_X_wrapper gs_x11cmyk8_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_cmyk_initialize, "x11cmyk8", + std_device_dci_type_body(gx_device_X_wrapper, + x_cmyk_initialize_device_procs, "x11cmyk8", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -675,8 +677,8 @@ x_cmyk_map_cmyk_color(gx_device * dev, const gx_color_value cv[]) static dev_proc_map_color_rgb(x_mono_alt_map_color); /* The device descriptor */ -static int -x_mono_initialize(gx_device *dev) +static void +x_mono_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, x_wrap_open); set_dev_proc(dev, get_initial_matrix, gx_forward_get_initial_matrix); @@ -692,13 +694,12 @@ x_mono_initialize(gx_device *dev) set_dev_proc(dev, put_params, x_wrap_put_params); set_dev_proc(dev, get_page_device, gx_forward_get_page_device); set_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits); - - return 0; } /* The instance is public. */ const gx_device_X_wrapper gs_x11mono_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_mono_initialize, "x11mono", + std_device_dci_type_body(gx_device_X_wrapper, + x_mono_initialize_device_procs, "x11mono", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -721,8 +722,8 @@ x_mono_alt_map_color(gx_device * dev, gx_color_index color, static dev_proc_map_color_rgb(x_gray_alt_map_color); /* The device descriptor */ -static int -x_gray_initialize(gx_device *dev) +static void +x_gray_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, x_wrap_open); set_dev_proc(dev, get_initial_matrix, gx_forward_get_initial_matrix); @@ -739,13 +740,12 @@ x_gray_initialize(gx_device *dev) set_dev_proc(dev, put_params, x_wrap_put_params); set_dev_proc(dev, get_page_device, gx_forward_get_page_device); set_dev_proc(dev, get_alpha_bits, gx_forward_get_alpha_bits); - - return 0; } /* The instances are public. */ const gx_device_X_wrapper gs_x11gray2_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_gray_initialize, "x11gray2", + std_device_dci_type_body(gx_device_X_wrapper, + x_gray_initialize_device_procs, "x11gray2", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -754,7 +754,8 @@ const gx_device_X_wrapper gs_x11gray2_device = { }; const gx_device_X_wrapper gs_x11gray4_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_gray_initialize, "x11gray4", + std_device_dci_type_body(gx_device_X_wrapper, + x_gray_initialize_device_procs, "x11gray4", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -799,8 +800,8 @@ static dev_proc_map_color_rgb(x_rg16x_alt_map_color); static dev_proc_map_color_rgb(x_rg32x_alt_map_color); /* The device descriptor */ -static int -rgbx_initialize(gx_device *dev) +static void +rgbx_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, x_wrap_open); set_dev_proc(dev, get_initial_matrix, gx_forward_get_initial_matrix); @@ -817,20 +818,19 @@ rgbx_initialize(gx_device *dev) 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); - - return 0; } -static int -x_rg16x_initialize(gx_device *dev) +static void +x_rg16x_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, map_rgb_color, x_rg16x_map_rgb_color); - return rgbx_initialize(dev); + rgbx_initialize_device_procs(dev); } const gx_device_X_wrapper gs_x11rg16x_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_rg16x_initialize, "x11rg16x", + std_device_dci_type_body(gx_device_X_wrapper, + x_rg16x_initialize_device_procs, "x11rg16x", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ @@ -838,16 +838,17 @@ const gx_device_X_wrapper gs_x11rg16x_device = { X_WRAPPER_DATA(x_rg16x_alt_map_color) }; -static int -x_rg32x_initialize(gx_device *dev) +static void +x_rg32x_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, map_rgb_color, x_rg32x_map_rgb_color); - return rgbx_initialize(dev); + rgbx_initialize_device_procs(dev); } const gx_device_X_wrapper gs_x11rg32x_device = { - std_device_dci_type_body(gx_device_X_wrapper, x_rg32x_initialize, "x11rg32x", + std_device_dci_type_body(gx_device_X_wrapper, + x_rg32x_initialize_device_procs, "x11rg32x", &st_device_X_wrapper, FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ diff --git a/devices/gdevxcf.c b/devices/gdevxcf.c index 0d729a3eb..7716648fe 100644 --- a/devices/gdevxcf.c +++ b/devices/gdevxcf.c @@ -135,8 +135,8 @@ typedef struct xcf_device_s { /* * Macro definition for DeviceN procedures */ -static int -xcf_initialize(gx_device *dev) +static void +xcf_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, gdev_prn_open); set_dev_proc(dev, output_page, gdev_prn_bg_output_page); @@ -148,16 +148,14 @@ xcf_initialize(gx_device *dev) set_dev_proc(dev, get_color_comp_index, xcf_get_color_comp_index); set_dev_proc(dev, encode_color, xcf_encode_color); set_dev_proc(dev, decode_color, xcf_decode_color); - - return 0; } -static int -spot_rgb_initialize(gx_device *dev) +static void +spot_rgb_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, get_color_mapping_procs, get_spotrgb_color_mapping_procs); - return xcf_initialize(dev); + xcf_initialize_device_procs(dev); } /* @@ -165,7 +163,8 @@ spot_rgb_initialize(gx_device *dev) */ const xcf_device gs_xcf_device = { - prn_device_body_extended(xcf_device, spot_rgb_initialize, "xcf", + prn_device_body_extended(xcf_device, + spot_rgb_initialize_device_procs, "xcf", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, /* X and Y hardware resolution */ 0, 0, 0, 0, /* margins */ @@ -185,17 +184,18 @@ const xcf_device gs_xcf_device = {0} /* SeparationOrder names */ }; -static int -spot_cmyk_initialize(gx_device *dev) +static void +spot_cmyk_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, get_color_mapping_procs, get_xcf_color_mapping_procs); - return xcf_initialize(dev); + xcf_initialize_device_procs(dev); } const xcf_device gs_xcfcmyk_device = { - prn_device_body_extended(xcf_device, spot_cmyk_initialize, "xcfcmyk", + prn_device_body_extended(xcf_device, + spot_cmyk_initialize_device_procs, "xcfcmyk", DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, X_DPI, Y_DPI, /* X and Y hardware resolution */ 0, 0, 0, 0, /* margins */ diff --git a/devices/gdevxini.c b/devices/gdevxini.c index 9c0478ba9..b87e5af6d 100644 --- a/devices/gdevxini.c +++ b/devices/gdevxini.c @@ -662,10 +662,10 @@ x_set_buffer(gx_device_X * xdev) xdev->is_buffered = false; tempdev.x11 = gs_x11_device; } - /* We know this cannot fail. */ - tempdev.dev.initialize(&tempdev.dev); + tempdev.dev.initialize_device_procs(&tempdev.dev); if (dev_proc(xdev, fill_rectangle) != tempdev.dev.procs.fill_rectangle) { #define COPY_PROC(p) set_dev_proc(xdev, p, tempdev.dev.procs.p) + COPY_PROC(initialize_device); COPY_PROC(fill_rectangle); COPY_PROC(copy_mono); COPY_PROC(copy_color); @@ -759,30 +759,11 @@ gdev_x_clear_window(gx_device_X * xdev) xdev->colors_or = xdev->colors_and = xdev->background; } - -/* (External procedures are declared in gdevx.h.) */ -int -gdev_x_initialize(gx_device *dev) +static int +x_initialize_device(gx_device *dev) { gx_device_X *xdev = (gx_device_X *) dev; - set_dev_proc(dev, open_device, x_open); - set_dev_proc(dev, get_initial_matrix, x_get_initial_matrix); - set_dev_proc(dev, sync_output, x_sync); - set_dev_proc(dev, output_page, x_output_page); - set_dev_proc(dev, close_device, x_close); - set_dev_proc(dev, map_rgb_color, gdev_x_map_rgb_color); - set_dev_proc(dev, map_color_rgb, gdev_x_map_color_rgb); - set_dev_proc(dev, fill_rectangle, x_fill_rectangle); - set_dev_proc(dev, copy_mono, x_copy_mono); - set_dev_proc(dev, copy_color, x_copy_color); - set_dev_proc(dev, get_params, gdev_x_get_params); - set_dev_proc(dev, put_params, gdev_x_put_params); - set_dev_proc(dev, get_page_device, x_get_page_device); - set_dev_proc(dev, strip_tile_rectangle, x_strip_tile_rectangle); - set_dev_proc(dev, get_bits_rectangle, x_get_bits_rectangle); - set_dev_proc(dev, fillpage, x_fillpage); - /* Mark the new instance as closed. */ xdev->is_open = false; @@ -806,6 +787,30 @@ gdev_x_initialize(gx_device *dev) return 0; } + +/* (External procedures are declared in gdevx.h.) */ +void +gdev_x_initialize_device_procs(gx_device *dev) +{ + set_dev_proc(dev, initialize_device, x_initialize_device); + set_dev_proc(dev, open_device, x_open); + set_dev_proc(dev, get_initial_matrix, x_get_initial_matrix); + set_dev_proc(dev, sync_output, x_sync); + set_dev_proc(dev, output_page, x_output_page); + set_dev_proc(dev, close_device, x_close); + set_dev_proc(dev, map_rgb_color, gdev_x_map_rgb_color); + set_dev_proc(dev, map_color_rgb, gdev_x_map_color_rgb); + set_dev_proc(dev, fill_rectangle, x_fill_rectangle); + set_dev_proc(dev, copy_mono, x_copy_mono); + set_dev_proc(dev, copy_color, x_copy_color); + set_dev_proc(dev, get_params, gdev_x_get_params); + set_dev_proc(dev, put_params, gdev_x_put_params); + set_dev_proc(dev, get_page_device, x_get_page_device); + set_dev_proc(dev, strip_tile_rectangle, x_strip_tile_rectangle); + set_dev_proc(dev, get_bits_rectangle, x_get_bits_rectangle); + set_dev_proc(dev, fillpage, x_fillpage); +} + /* ---------------- Get/put parameters ---------------- */ /* Get the device parameters. See below. */ diff --git a/devices/vector/gdevdocxw.c b/devices/vector/gdevdocxw.c index 541e58813..c7d7a8a54 100644 --- a/devices/vector/gdevdocxw.c +++ b/devices/vector/gdevdocxw.c @@ -144,8 +144,8 @@ typedef struct { private_st_textw_text_enum(); -static int -docxwrite_initialize(gx_device *dev) +static void +docxwrite_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, docxwrite_open_device); set_dev_proc(dev, output_page, docxwrite_output_page); @@ -160,14 +160,13 @@ docxwrite_initialize(gx_device *dev) set_dev_proc(dev, composite, gx_null_composite); set_dev_proc(dev, text_begin, docxwrite_text_begin); set_dev_proc(dev, dev_spec_op, docxwrite_dev_spec_op); - - return 0; } const gx_device_docxwrite_t gs_docxwrite_device = { /* Define the device as 8-bit gray scale to avoid computing halftones. */ - std_device_dci_body(gx_device_docxwrite_t, docxwrite_initialize, + std_device_dci_body(gx_device_docxwrite_t, + docxwrite_initialize_device_procs, "docxwrite", DEFAULT_WIDTH_10THS * X_DPI / 10, DEFAULT_HEIGHT_10THS * Y_DPI / 10, diff --git a/devices/vector/gdevpdf.c b/devices/vector/gdevpdf.c index 94942e9ba..af08f2d67 100644 --- a/devices/vector/gdevpdf.c +++ b/devices/vector/gdevpdf.c @@ -220,8 +220,8 @@ static dev_proc_close_device(pdf_close); /* ---------------- Device prototype ---------------- */ -static int -pdfwrite_initialize(gx_device *dev) +static void +pdfwrite_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, pdf_open); set_dev_proc(dev, get_initial_matrix, gx_upright_get_initial_matrix); @@ -253,8 +253,6 @@ pdfwrite_initialize(gx_device *dev) set_dev_proc(dev, fillpage, gdev_pdf_fillpage); set_dev_proc(dev, dev_spec_op, gdev_pdf_dev_spec_op); set_dev_proc(dev, fill_stroke_path, gdev_pdf_fill_stroke_path); - - return 0; } #define PDF_DEVICE_NAME "pdfwrite" diff --git a/devices/vector/gdevpdfb.h b/devices/vector/gdevpdfb.h index 0e8a5706f..daa6ba0a0 100644 --- a/devices/vector/gdevpdfb.h +++ b/devices/vector/gdevpdfb.h @@ -27,7 +27,7 @@ #ifdef PDF_DEVICE_NAME const gx_device_pdf PDF_DEVICE_IDENT = -{std_device_dci_type_body(gx_device_pdf, pdfwrite_initialize, +{std_device_dci_type_body(gx_device_pdf, pdfwrite_initialize_device_procs, PDF_DEVICE_NAME, &st_device_pdfwrite, DEFAULT_WIDTH_10THS * X_DPI / 10, diff --git a/devices/vector/gdevpx.c b/devices/vector/gdevpx.c index f5d794b53..960d18ae7 100644 --- a/devices/vector/gdevpx.c +++ b/devices/vector/gdevpx.c @@ -146,10 +146,10 @@ static dev_proc_put_params(pclxl_put_params); static dev_proc_begin_typed_image(pclxl_begin_typed_image); static dev_proc_strip_copy_rop(pclxl_strip_copy_rop); -static int -pclxl_initialize(gx_device *dev, - dev_proc_map_rgb_color(map_rgb_color), - dev_proc_map_color_rgb(map_color_rgb)) +static void +pclxl_initialize_device_procs(gx_device *dev, + dev_proc_map_rgb_color(map_rgb_color), + dev_proc_map_color_rgb(map_color_rgb)) { set_dev_proc(dev, open_device, pclxl_open_device); set_dev_proc(dev, output_page, pclxl_output_page); @@ -170,32 +170,30 @@ pclxl_initialize(gx_device *dev, set_dev_proc(dev, fill_triangle, gdev_vector_fill_triangle); set_dev_proc(dev, begin_typed_image, pclxl_begin_typed_image); set_dev_proc(dev, strip_copy_rop, pclxl_strip_copy_rop); - - return 0; } -static int -pxlmono_initialize(gx_device *dev) +static void +pxlmono_initialize_device_procs(gx_device *dev) { - return pclxl_initialize(dev, - gx_default_gray_map_rgb_color, - gx_default_gray_map_color_rgb); + pclxl_initialize_device_procs(dev, + gx_default_gray_map_rgb_color, + gx_default_gray_map_color_rgb); } -static int -pxlcolor_initialize(gx_device *dev) +static void +pxlcolor_initialize_device_procs(gx_device *dev) { - return pclxl_initialize(dev, - gx_default_rgb_map_rgb_color, - gx_default_rgb_map_color_rgb); + pclxl_initialize_device_procs(dev, + gx_default_rgb_map_rgb_color, + gx_default_rgb_map_color_rgb); } const gx_device_pclxl gs_pxlmono_device = { - pclxl_device_body("pxlmono", 8, pxlmono_initialize) + pclxl_device_body("pxlmono", 8, pxlmono_initialize_device_procs) }; const gx_device_pclxl gs_pxlcolor_device = { - pclxl_device_body("pxlcolor", 24, pxlcolor_initialize) + pclxl_device_body("pxlcolor", 24, pxlcolor_initialize_device_procs) }; /* ---------------- Other utilities ---------------- */ diff --git a/devices/vector/gdevtxtw.c b/devices/vector/gdevtxtw.c index 1f7fd75ea..e256d1026 100644 --- a/devices/vector/gdevtxtw.c +++ b/devices/vector/gdevtxtw.c @@ -145,8 +145,8 @@ typedef struct textw_text_enum_s { private_st_textw_text_enum(); -static int -txtwrite_initialize(gx_device *dev) +static void +txtwrite_initialize_device_procs(gx_device *dev) { set_dev_proc(dev, open_device, txtwrite_open_device); set_dev_proc(dev, output_page, txtwrite_output_page); @@ -161,14 +161,13 @@ txtwrite_initialize(gx_device *dev) set_dev_proc(dev, composite, gx_null_composite); set_dev_proc(dev, text_begin, txtwrite_text_begin); set_dev_proc(dev, dev_spec_op, txtwrite_dev_spec_op); - - return 0; } const gx_device_txtwrite_t gs_txtwrite_device = { /* Define the device as 8-bit gray scale to avoid computing halftones. */ - std_device_dci_body(gx_device_txtwrite_t, txtwrite_initialize, "txtwrite", + std_device_dci_body(gx_device_txtwrite_t, + txtwrite_initialize_device_procs, "txtwrite", DEFAULT_WIDTH_10THS * X_DPI / 10, DEFAULT_HEIGHT_10THS * Y_DPI / 10, X_DPI, Y_DPI, diff --git a/devices/vector/gdevxps.c b/devices/vector/gdevxps.c index ca8312060..a74f8421d 100644 --- a/devices/vector/gdevxps.c +++ b/devices/vector/gdevxps.c @@ -214,18 +214,27 @@ static dev_proc_get_params(xps_get_params); static dev_proc_put_params(xps_put_params); static dev_proc_fill_path(gdev_xps_fill_path); static dev_proc_stroke_path(gdev_xps_stroke_path); -static dev_proc_initialize(xps_initialize); +static dev_proc_initialize_device_procs(xps_initialize_device_procs); static dev_proc_begin_typed_image(xps_begin_typed_image); const gx_device_xps gs_xpswrite_device = { - xps_device_body("xpswrite", 24, xps_initialize), + xps_device_body("xpswrite", 24, xps_initialize_device_procs), }; static int -xps_initialize(gx_device *dev) +xps_initialize_device(gx_device *dev) { gx_device_xps *xps = (gx_device_xps*)dev; + memset(xps->PrinterName, 0x00, MAXPRINTERNAME); + + return 0; +} + +static void +xps_initialize_device_procs(gx_device *dev) +{ + set_dev_proc(dev, initialize_device, xps_initialize_device); set_dev_proc(dev, open_device, xps_open_device); set_dev_proc(dev, output_page, xps_output_page); set_dev_proc(dev, close_device, xps_close_device); @@ -238,10 +247,6 @@ xps_initialize(gx_device *dev) set_dev_proc(dev, fill_path, gdev_xps_fill_path); set_dev_proc(dev, stroke_path, gdev_xps_stroke_path); set_dev_proc(dev, begin_typed_image, xps_begin_typed_image); - - memset(xps->PrinterName, 0x00, MAXPRINTERNAME); - - return 0; } /* Vector device procedures */ |