summaryrefslogtreecommitdiff
path: root/devices
diff options
context:
space:
mode:
authorRobin Watts <Robin.Watts@artifex.com>2021-03-18 13:36:13 +0000
committerRobin Watts <Robin.Watts@artifex.com>2021-04-20 15:03:01 +0100
commitf3892f9380a0af0875ab9c8d3a60a98beec0ac4a (patch)
treef24120b7fd8de38c67802c68882822eb0d7f587e /devices
parent4d9a796db91e85a55505773e16d3b877e3ff5591 (diff)
downloadghostpdl-f3892f9380a0af0875ab9c8d3a60a98beec0ac4a.tar.gz
Rename finish_copydevice to initialize, and remove second param.
It used to be that finish_copydevice(dev, const old_dev) would be used to copy stuff from a prototype to a new instance of a device. Now, no copying is ever done. Also, it's a confusing name. Rename it to be 'initialize', which is clearer. Also, it should become even more appropriate in future, if we have this function be the one that is responsible for filling out the procs.
Diffstat (limited to 'devices')
-rw-r--r--devices/gdevbit.c4
-rw-r--r--devices/gdevcdj.c2
-rw-r--r--devices/gdevcmykog.c2
-rw-r--r--devices/gdevdsp.c6
-rw-r--r--devices/gdevfpng.c2
-rw-r--r--devices/gdevijs.c10
-rw-r--r--devices/gdevperm.c2
-rw-r--r--devices/gdevplan.c2
-rw-r--r--devices/gdevplib.c2
-rw-r--r--devices/gdevpng.c2
-rw-r--r--devices/gdevpsd.c2
-rw-r--r--devices/gdevrinkj.c2
-rw-r--r--devices/gdevtrac.c2
-rw-r--r--devices/gdevtsep.c2
-rw-r--r--devices/gdevx.c4
-rw-r--r--devices/gdevx.h2
-rw-r--r--devices/gdevxcf.c2
-rw-r--r--devices/gdevxini.c2
-rw-r--r--devices/vector/gdevdocxw.c2
-rw-r--r--devices/vector/gdevpdfb.h2
-rw-r--r--devices/vector/gdevtxtw.c2
-rw-r--r--devices/vector/gdevxps.c6
22 files changed, 32 insertions, 32 deletions
diff --git a/devices/gdevbit.c b/devices/gdevbit.c
index 600bfdd2f..8808c0239 100644
--- a/devices/gdevbit.c
+++ b/devices/gdevbit.c
@@ -102,7 +102,7 @@ dev_proc_get_color_comp_index(gx_default_DevRGB_get_color_comp_index);
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
@@ -219,7 +219,7 @@ static const gx_device_procs bitrgbtags_procs =
((void *)0), /* create_compositor */
((void *)0), /* get_hardware_params */
((void *)0), /* text_begin */
- ((void *)0), /* finish_copydevice */
+ ((void *)0), /* initialize */
((void *)0), /* begin_transparency_group */
((void *)0), /* end_transparency_group */
((void *)0), /* begin_transparency_mask */
diff --git a/devices/gdevcdj.c b/devices/gdevcdj.c
index 49b30df60..dc014077a 100644
--- a/devices/gdevcdj.c
+++ b/devices/gdevcdj.c
@@ -517,7 +517,7 @@ typedef struct {
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevcmykog.c b/devices/gdevcmykog.c
index dcd1a4a4c..ff9919661 100644
--- a/devices/gdevcmykog.c
+++ b/devices/gdevcmykog.c
@@ -762,7 +762,7 @@ prn_done:
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevdsp.c b/devices/gdevdsp.c
index 10cfd85e1..8991bd813 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_finish_copydevice(display_finish_copydevice);
+static dev_proc_initialize(display_initialize);
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);
@@ -151,7 +151,7 @@ static const gx_device_procs display_procs =
NULL, /* create_compositor */
NULL, /* get_hardware_params */
NULL, /* text_begin */
- display_finish_copydevice, /* finish_copydevice */
+ display_initialize, /* initialize */
NULL, /* begin_transparency_group */
NULL, /* end_transparency_group */
NULL, /* begin_transparency_mask */
@@ -1213,7 +1213,7 @@ display_put_params(gx_device * dev, gs_param_list * plist)
/* Clean up the instance after making a copy. */
int
-display_finish_copydevice(gx_device *dev, const gx_device *from_dev)
+display_initialize(gx_device *dev)
{
gx_device_display *ddev = (gx_device_display *) dev;
diff --git a/devices/gdevfpng.c b/devices/gdevfpng.c
index 324cbd280..81fd7b49a 100644
--- a/devices/gdevfpng.c
+++ b/devices/gdevfpng.c
@@ -152,7 +152,7 @@ static const gx_device_procs fpng_procs =
NULL, /* create_compositor */
NULL, /* get_hardware_params */
NULL, /* text_begin */
- NULL, /* finish_copydevice */
+ NULL, /* initialize */
NULL, /* begin_transparency_group */
NULL, /* end_transparency_group */
NULL, /* begin_transparency_mask */
diff --git a/devices/gdevijs.c b/devices/gdevijs.c
index 884ea54a1..cdb861436 100644
--- a/devices/gdevijs.c
+++ b/devices/gdevijs.c
@@ -90,7 +90,7 @@ 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_finish_copydevice(gsijs_finish_copydevice);
+static dev_proc_initialize(gsijs_initialize);
/* Following definitions are for krgb support. */
static dev_proc_create_buf_device(gsijs_create_buf_device);
@@ -144,7 +144,7 @@ static const gx_device_procs gsijs_procs = {
NULL, /* create_compositor */
NULL, /* get_hardware_params */
NULL, /* text_begin */
- gsijs_finish_copydevice
+ gsijs_initialize
};
typedef struct gx_device_ijs_s gx_device_ijs;
@@ -928,19 +928,19 @@ gsijs_open(gx_device *dev)
/* Finish device initialization. */
static int
-gsijs_finish_copydevice(gx_device *dev, const gx_device *from_dev)
+gsijs_initialize(gx_device *dev)
{
int code;
static const char rgb[] = "DeviceRGB";
gx_device_ijs *ijsdev = (gx_device_ijs *)dev;
- code = gx_default_finish_copydevice(dev, from_dev);
+ code = gx_default_initialize(dev);
if(code < 0)
return code;
if (!ijsdev->ColorSpace) {
ijsdev->ColorSpace = gs_malloc(ijsdev->memory, sizeof(rgb), 1,
- "gsijs_finish_copydevice");
+ "gsijs_initialize");
if (!ijsdev->ColorSpace)
return gs_note_error(gs_error_VMerror);
ijsdev->ColorSpace_size = sizeof(rgb);
diff --git a/devices/gdevperm.c b/devices/gdevperm.c
index 80afdf487..e8e65d1b3 100644
--- a/devices/gdevperm.c
+++ b/devices/gdevperm.c
@@ -102,7 +102,7 @@ static const gx_device_procs perm_procs = {
NULL, /* create_compositor */
NULL, /* get_hardware_params */
NULL, /* text_begin */
- NULL, /* finish_copydevice */
+ NULL, /* initialize */
NULL, /* begin_transparency_group */
NULL, /* end_transparency_group */
NULL, /* begin_transparency_mask */
diff --git a/devices/gdevplan.c b/devices/gdevplan.c
index bf9a81e5e..0f1d07de3 100644
--- a/devices/gdevplan.c
+++ b/devices/gdevplan.c
@@ -123,7 +123,7 @@ static int planr_print_page(gx_device_printer * pdev, gp_file * pstream);
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevplib.c b/devices/gdevplib.c
index f1bf65980..fe9aa33db 100644
--- a/devices/gdevplib.c
+++ b/devices/gdevplib.c
@@ -313,7 +313,7 @@ static int plibk_print_page(gx_device_printer * pdev, gp_file * pstream);
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevpng.c b/devices/gdevpng.c
index 4833efb19..6eb32c366 100644
--- a/devices/gdevpng.c
+++ b/devices/gdevpng.c
@@ -261,7 +261,7 @@ static const gx_device_procs pngalpha_procs =
NULL, /* create_compositor */
NULL, /* get_hardware_params */
NULL, /* text_begin */
- NULL, /* finish_copydevice */
+ NULL, /* initialize */
NULL, /* begin_transparency_group */
NULL, /* end_transparency_group */
NULL, /* begin_transparency_mask */
diff --git a/devices/gdevpsd.c b/devices/gdevpsd.c
index 03495ae0d..669cfb4d1 100644
--- a/devices/gdevpsd.c
+++ b/devices/gdevpsd.c
@@ -196,7 +196,7 @@ gs_private_st_composite_final(st_psd_device, psd_device,
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevrinkj.c b/devices/gdevrinkj.c
index a49ee1c09..ca7b7966c 100644
--- a/devices/gdevrinkj.c
+++ b/devices/gdevrinkj.c
@@ -174,7 +174,7 @@ typedef struct rinkj_device_s {
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevtrac.c b/devices/gdevtrac.c
index 7fff38622..8dc5bf70c 100644
--- a/devices/gdevtrac.c
+++ b/devices/gdevtrac.c
@@ -655,7 +655,7 @@ trace_text_begin(gx_device * dev, gs_gstate * pgs,
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
trace_text_begin,\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevtsep.c b/devices/gdevtsep.c
index 1a52aede2..df1a31796 100644
--- a/devices/gdevtsep.c
+++ b/devices/gdevtsep.c
@@ -748,7 +748,7 @@ gs_private_st_composite_final(st_tiffsep_device, tiffsep_device,
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevx.c b/devices/gdevx.c
index 438af1729..f15932e93 100644
--- a/devices/gdevx.c
+++ b/devices/gdevx.c
@@ -70,7 +70,7 @@ static dev_proc_copy_color(x_copy_color);
static dev_proc_get_page_device(x_get_page_device);
static dev_proc_strip_tile_rectangle(x_strip_tile_rectangle);
static dev_proc_get_bits_rectangle(x_get_bits_rectangle);
-/*extern dev_proc_get_xfont_procs(gdev_x_finish_copydevice);*/
+/*extern dev_proc_get_xfont_procs(gdev_x_initialize);*/
static dev_proc_fillpage(x_fillpage);
/* The device descriptor */
@@ -121,7 +121,7 @@ const gx_device_X this_device = { \
NULL, /* create_compositor */ \
NULL, /* get_hardware_params */ \
NULL, /* text_begin */ \
- gdev_x_finish_copydevice, \
+ gdev_x_initialize, \
NULL, /* begin_transparency_group */ \
NULL, /* end_transparency_group */ \
NULL, /* begin_transparency_mask */ \
diff --git a/devices/gdevx.h b/devices/gdevx.h
index b35d4d856..05c6d2ab1 100644
--- a/devices/gdevx.h
+++ b/devices/gdevx.h
@@ -227,6 +227,6 @@ 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_finish_copydevice(gdev_x_finish_copydevice); /* gdevxini.c */
+dev_proc_initialize(gdev_x_initialize); /* gdevxini.c */
#endif /* gdevx_INCLUDED */
diff --git a/devices/gdevxcf.c b/devices/gdevxcf.c
index 18ff322e4..86b635e57 100644
--- a/devices/gdevxcf.c
+++ b/devices/gdevxcf.c
@@ -180,7 +180,7 @@ typedef struct xcf_device_s {
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- NULL, /* finish_copydevice */\
+ NULL, /* initialize */\
NULL, /* begin_transparency_group */\
NULL, /* end_transparency_group */\
NULL, /* begin_transparency_mask */\
diff --git a/devices/gdevxini.c b/devices/gdevxini.c
index 82032cd6a..4fd7992d0 100644
--- a/devices/gdevxini.c
+++ b/devices/gdevxini.c
@@ -756,7 +756,7 @@ gdev_x_clear_window(gx_device_X * xdev)
/* Clean up the instance after making a copy. */
int
-gdev_x_finish_copydevice(gx_device *dev, const gx_device *from_dev)
+gdev_x_initialize(gx_device *dev)
{
gx_device_X *xdev = (gx_device_X *) dev;
diff --git a/devices/vector/gdevdocxw.c b/devices/vector/gdevdocxw.c
index 74dfa3d7b..cc0590602 100644
--- a/devices/vector/gdevdocxw.c
+++ b/devices/vector/gdevdocxw.c
@@ -195,7 +195,7 @@ const gx_device_docxwrite_t gs_docxwrite_device =
gx_null_create_compositor,
NULL, /* get_hardware_params */
docxwrite_text_begin,
- NULL, /* finish_copydevice */
+ NULL, /* initialize */
NULL, /* begin_transparency_group */
NULL, /* end_transparency_group */
NULL, /* begin_transparency_mask */
diff --git a/devices/vector/gdevpdfb.h b/devices/vector/gdevpdfb.h
index 48280d312..d218e104b 100644
--- a/devices/vector/gdevpdfb.h
+++ b/devices/vector/gdevpdfb.h
@@ -76,7 +76,7 @@ const gx_device_pdf PDF_DEVICE_IDENT =
gdev_pdf_create_compositor, /* create_compositor */
NULL, /* get_hardware_params */
gdev_pdf_text_begin,
- NULL, /* finish_copydevice */
+ NULL, /* initialize */
gdev_pdf_begin_transparency_group, /* begin_transparency_group */
gdev_pdf_end_transparency_group, /* end_transparency_group */
gdev_pdf_begin_transparency_mask, /* begin_transparency_mask */
diff --git a/devices/vector/gdevtxtw.c b/devices/vector/gdevtxtw.c
index 687581d51..fe8468334 100644
--- a/devices/vector/gdevtxtw.c
+++ b/devices/vector/gdevtxtw.c
@@ -196,7 +196,7 @@ const gx_device_txtwrite_t gs_txtwrite_device =
gx_null_create_compositor,
NULL, /* get_hardware_params */
txtwrite_text_begin,
- NULL, /* finish_copydevice */
+ NULL, /* initialize */
NULL, /* begin_transparency_group */
NULL, /* end_transparency_group */
NULL, /* begin_transparency_mask */
diff --git a/devices/vector/gdevxps.c b/devices/vector/gdevxps.c
index c435cd47c..e8afd0d3a 100644
--- a/devices/vector/gdevxps.c
+++ b/devices/vector/gdevxps.c
@@ -214,7 +214,7 @@ 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_finish_copydevice(xps_finish_copydevice);
+static dev_proc_initialize(xps_initialize);
static dev_proc_begin_image(xps_begin_image);
#define xps_device_procs \
@@ -262,7 +262,7 @@ static dev_proc_begin_image(xps_begin_image);
NULL, /* create_compositor */\
NULL, /* get_hardware_params */\
NULL, /* text_begin */\
- xps_finish_copydevice,\
+ xps_initialize,\
NULL,\
}
@@ -1321,7 +1321,7 @@ xps_put_params(gx_device *dev, gs_param_list *plist)
return code;
}
-static int xps_finish_copydevice(gx_device *dev, const gx_device *from_dev)
+static int xps_initialize(gx_device *dev)
{
gx_device_xps *xps = (gx_device_xps*)dev;