diff options
| -rw-r--r-- | base/gdevddrw.c | 17 | ||||
| -rw-r--r-- | base/gdevdflt.c | 6 | ||||
| -rw-r--r-- | base/gdevflp.c | 29 | ||||
| -rw-r--r-- | base/gdevhit.c | 2 | ||||
| -rw-r--r-- | base/gdevmem.c | 2 | ||||
| -rw-r--r-- | base/gdevnfwd.c | 4 | ||||
| -rw-r--r-- | base/gdevoflt.c | 19 | ||||
| -rw-r--r-- | base/gdevp14.c | 2 | ||||
| -rw-r--r-- | base/gdevplnx.c | 2 | ||||
| -rw-r--r-- | base/gdevsclass.c | 17 | ||||
| -rw-r--r-- | base/gdevsclass.h | 2 | ||||
| -rw-r--r-- | base/gdevvec.c | 3 | ||||
| -rw-r--r-- | base/gxclip.c | 2 | ||||
| -rw-r--r-- | base/gxclip2.c | 2 | ||||
| -rw-r--r-- | base/gxclipm.c | 2 | ||||
| -rw-r--r-- | base/gxdevcli.h | 19 | ||||
| -rw-r--r-- | base/gxdevice.h | 4 | ||||
| -rw-r--r-- | base/gxpcmap.c | 2 |
18 files changed, 1 insertions, 135 deletions
diff --git a/base/gdevddrw.c b/base/gdevddrw.c index 88cf9df31..b38c950a8 100644 --- a/base/gdevddrw.c +++ b/base/gdevddrw.c @@ -1045,23 +1045,6 @@ gx_default_begin_typed_image(gx_device * dev, (dev, pgs, pmat, pic, prect, pdcolor, pcpath, memory, pinfo); } -/* Backward compatibility for obsolete driver procedures. */ - -int -gx_default_image_data(gx_device *dev, gx_image_enum_common_t * info, - const byte ** plane_data, - int data_x, uint raster, int height) -{ - return gx_image_data(info, plane_data, data_x, raster, height); -} - -int -gx_default_end_image(gx_device *dev, gx_image_enum_common_t * info, - bool draw_last) -{ - return gx_image_end(info, draw_last); -} - int gx_default_fillpage(gx_device *dev, gs_gstate * pgs, gx_device_color *pdevc) { diff --git a/base/gdevdflt.c b/base/gdevdflt.c index b6d013c59..ebd210030 100644 --- a/base/gdevdflt.c +++ b/base/gdevdflt.c @@ -632,10 +632,6 @@ gx_device_fill_in_procs(register gx_device * dev) CHECK_NON_DEFAULT(get_alpha_bits, gx_default_get_alpha_bits, "get_alpha_bits"); set_dev_proc(dev, get_alpha_bits, gx_default_get_alpha_bits); - CHECK_NON_DEFAULT(image_data, gx_default_image_data, "image_data"); - set_dev_proc(dev, image_data, gx_default_image_data); - CHECK_NON_DEFAULT(end_image, gx_default_end_image, "end_image"); - set_dev_proc(dev, end_image, gx_default_end_image); #undef CHECK_NON_DEFAULT fill_dev_proc(dev, strip_tile_rectangle, gx_default_strip_tile_rectangle); fill_dev_proc(dev, strip_copy_rop, gx_default_strip_copy_rop); @@ -1274,8 +1270,6 @@ int gx_copy_device_procs(gx_device *dest, const gx_device *src, const gx_device set_dev_proc(dest, fill_triangle, dev_proc(&prototype, fill_triangle)); set_dev_proc(dest, draw_thin_line, dev_proc(&prototype, draw_thin_line)); set_dev_proc(dest, begin_image, dev_proc(&prototype, begin_image)); - set_dev_proc(dest, image_data, dev_proc(&prototype, image_data)); - set_dev_proc(dest, end_image, dev_proc(&prototype, end_image)); set_dev_proc(dest, strip_tile_rectangle, dev_proc(&prototype, strip_tile_rectangle)); set_dev_proc(dest, strip_copy_rop, dev_proc(&prototype, strip_copy_rop)); set_dev_proc(dest, get_clipping_box, dev_proc(&prototype, get_clipping_box)); diff --git a/base/gdevflp.c b/base/gdevflp.c index 4e0b08ba0..24958938d 100644 --- a/base/gdevflp.c +++ b/base/gdevflp.c @@ -75,8 +75,6 @@ static dev_proc_fill_parallelogram(flp_fill_parallelogram); static dev_proc_fill_triangle(flp_fill_triangle); static dev_proc_draw_thin_line(flp_draw_thin_line); static dev_proc_begin_image(flp_begin_image); -static dev_proc_image_data(flp_image_data); -static dev_proc_end_image(flp_end_image); static dev_proc_strip_tile_rectangle(flp_strip_tile_rectangle); static dev_proc_strip_copy_rop(flp_strip_copy_rop); static dev_proc_begin_typed_image(flp_begin_typed_image); @@ -673,31 +671,6 @@ int flp_begin_image(gx_device *dev, const gs_gstate *pgs, const gs_image_t *pim, return 0; } -int flp_image_data(gx_device *dev, gx_image_enum_common_t *info, const byte **planes, int data_x, - uint raster, int height) -{ - int code = SkipPage(dev); - - if (code < 0) - return code; - if (!code) - return default_subclass_image_data(dev, info, planes, data_x, raster, height); - - return 0; -} - -int flp_end_image(gx_device *dev, gx_image_enum_common_t *info, bool draw_last) -{ - int code = SkipPage(dev); - - if (code < 0) - return code; - if (!code) - return default_subclass_end_image(dev, info, draw_last); - - return 0; -} - int flp_strip_tile_rectangle(gx_device *dev, const gx_strip_bitmap *tiles, int x, int y, int width, int height, gx_color_index color0, gx_color_index color1, int phase_x, int phase_y) @@ -1240,8 +1213,6 @@ flp_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, flp_fill_triangle); set_dev_proc(dev, draw_thin_line, flp_draw_thin_line); set_dev_proc(dev, begin_image, flp_begin_image); - set_dev_proc(dev, image_data, flp_image_data); - set_dev_proc(dev, end_image, flp_end_image); set_dev_proc(dev, strip_tile_rectangle, flp_strip_tile_rectangle); set_dev_proc(dev, strip_copy_rop, flp_strip_copy_rop); set_dev_proc(dev, begin_typed_image, flp_begin_typed_image); diff --git a/base/gdevhit.c b/base/gdevhit.c index 5d5df7de6..6bb62ffcc 100644 --- a/base/gdevhit.c +++ b/base/gdevhit.c @@ -47,8 +47,6 @@ hit_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, gx_default_fill_triangle); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, strip_tile_rectangle, gx_default_strip_tile_rectangle); set_dev_proc(dev, strip_copy_rop, gx_default_strip_copy_rop); set_dev_proc(dev, get_clipping_box, gx_get_largest_clipping_box); diff --git a/base/gdevmem.c b/base/gdevmem.c index c2a4022f4..3b1c187f4 100644 --- a/base/gdevmem.c +++ b/base/gdevmem.c @@ -901,8 +901,6 @@ void mem_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, gx_default_fill_triangle); set_dev_proc(dev, draw_thin_line, mem_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, get_clipping_box, gx_default_get_clipping_box); set_dev_proc(dev, begin_typed_image, gx_default_begin_typed_image); set_dev_proc(dev, map_color_rgb_alpha, gx_default_map_color_rgb_alpha); diff --git a/base/gdevnfwd.c b/base/gdevnfwd.c index b1f9c900b..e9d3ad72f 100644 --- a/base/gdevnfwd.c +++ b/base/gdevnfwd.c @@ -82,8 +82,6 @@ gx_device_forward_fill_in_procs(register gx_device_forward * dev) fill_dev_proc(dev, fill_triangle, gx_forward_fill_triangle); fill_dev_proc(dev, draw_thin_line, gx_forward_draw_thin_line); fill_dev_proc(dev, begin_image, gx_forward_begin_image); - /* NOT image_data (OBSOLETE) */ - /* NOT end_image (OBSOLETE) */ /* NOT strip_tile_rectangle */ fill_dev_proc(dev, strip_copy_rop, gx_forward_strip_copy_rop); fill_dev_proc(dev, get_clipping_box, gx_forward_get_clipping_box); @@ -1336,8 +1334,6 @@ void gx_forward_device_initialize_procs(gx_device *dev) fill_dev_proc(dev, fill_triangle, gx_forward_fill_triangle); fill_dev_proc(dev, draw_thin_line, gx_forward_draw_thin_line); fill_dev_proc(dev, begin_image, gx_forward_begin_image); - fill_dev_proc(dev, image_data, gx_forward_image_data); - fill_dev_proc(dev, end_image, gx_forward_end_image); fill_dev_proc(dev, strip_tile_rectangle, gx_forward_strip_tile_rectangle); fill_dev_proc(dev, strip_copy_rop, gx_forward_strip_copy_rop); fill_dev_proc(dev, get_clipping_box, gx_forward_get_clipping_box); diff --git a/base/gdevoflt.c b/base/gdevoflt.c index 35ffb94ac..1768294f1 100644 --- a/base/gdevoflt.c +++ b/base/gdevoflt.c @@ -52,8 +52,6 @@ static dev_proc_fill_parallelogram(obj_filter_fill_parallelogram); static dev_proc_fill_triangle(obj_filter_fill_triangle); static dev_proc_draw_thin_line(obj_filter_draw_thin_line); static dev_proc_begin_image(obj_filter_begin_image); -static dev_proc_image_data(obj_filter_image_data); -static dev_proc_end_image(obj_filter_end_image); static dev_proc_strip_tile_rectangle(obj_filter_strip_tile_rectangle); static dev_proc_strip_copy_rop(obj_filter_strip_copy_rop); static dev_proc_begin_typed_image(obj_filter_begin_typed_image); @@ -107,8 +105,6 @@ obj_filter_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, obj_filter_fill_triangle); set_dev_proc(dev, draw_thin_line, obj_filter_draw_thin_line); set_dev_proc(dev, begin_image, obj_filter_begin_image); - set_dev_proc(dev, image_data, obj_filter_image_data); - set_dev_proc(dev, end_image, obj_filter_end_image); set_dev_proc(dev, strip_tile_rectangle, obj_filter_strip_tile_rectangle); set_dev_proc(dev, strip_copy_rop, obj_filter_strip_copy_rop); set_dev_proc(dev, begin_typed_image, obj_filter_begin_typed_image); @@ -230,21 +226,6 @@ int obj_filter_begin_image(gx_device *dev, const gs_gstate *pgs, const gs_image_ return 0; } -int obj_filter_image_data(gx_device *dev, gx_image_enum_common_t *info, const byte **planes, int data_x, - uint raster, int height) -{ - if ((dev->ObjectFilter & FILTERIMAGE) == 0) - return default_subclass_image_data(dev, info, planes, data_x, raster, height); - return 0; -} - -int obj_filter_end_image(gx_device *dev, gx_image_enum_common_t *info, bool draw_last) -{ - if ((dev->ObjectFilter & FILTERIMAGE) == 0) - return default_subclass_end_image(dev, info, draw_last); - return 0; -} - int obj_filter_strip_tile_rectangle(gx_device *dev, const gx_strip_bitmap *tiles, int x, int y, int width, int height, gx_color_index color0, gx_color_index color1, int phase_x, int phase_y) diff --git a/base/gdevp14.c b/base/gdevp14.c index adb74251b..c93a8f799 100644 --- a/base/gdevp14.c +++ b/base/gdevp14.c @@ -9614,8 +9614,6 @@ pdf14_clist_initialize(gx_device *dev, set_dev_proc(dev, fill_triangle, gx_forward_fill_triangle); set_dev_proc(dev, draw_thin_line, gx_forward_draw_thin_line); set_dev_proc(dev, begin_image, pdf14_clist_begin_image); - set_dev_proc(dev, image_data, gx_forward_image_data); - set_dev_proc(dev, end_image, gx_forward_end_image); set_dev_proc(dev, strip_tile_rectangle, gx_forward_strip_tile_rectangle); set_dev_proc(dev, strip_copy_rop, gx_forward_strip_copy_rop); set_dev_proc(dev, get_clipping_box, gx_forward_get_clipping_box); diff --git a/base/gdevplnx.c b/base/gdevplnx.c index 1e15b2482..360f3a72a 100644 --- a/base/gdevplnx.c +++ b/base/gdevplnx.c @@ -95,8 +95,6 @@ plane_initialize(gx_device *dev) set_dev_proc(dev, fill_trapezoid, gx_default_fill_trapezoid); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, text_begin, gx_default_text_begin); set_dev_proc(dev, fill_rectangle_hl_color, gx_default_fill_rectangle_hl_color); set_dev_proc(dev, include_color_space, gx_default_include_color_space); diff --git a/base/gdevsclass.c b/base/gdevsclass.c index 0ef95ed9e..d0100feab 100644 --- a/base/gdevsclass.c +++ b/base/gdevsclass.c @@ -355,21 +355,6 @@ int default_subclass_begin_image(gx_device *dev, const gs_gstate *pgs, const gs_ return gx_default_begin_image(dev, pgs, pim, format, prect, pdcolor, pcpath, memory, pinfo); } -int default_subclass_image_data(gx_device *dev, gx_image_enum_common_t *info, const byte **planes, int data_x, - uint raster, int height) -{ - if (dev->child) - return dev_proc(dev->child, image_data)(dev->child, info, planes, data_x, raster, height); - return 0; -} - -int default_subclass_end_image(gx_device *dev, gx_image_enum_common_t *info, bool draw_last) -{ - if (dev->child) - return dev_proc(dev->child, end_image)(dev->child, info, draw_last); - return 0; -} - int default_subclass_strip_tile_rectangle(gx_device *dev, const gx_strip_bitmap *tiles, int x, int y, int width, int height, gx_color_index color0, gx_color_index color1, int phase_x, int phase_y) @@ -897,8 +882,6 @@ int default_subclass_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, default_subclass_fill_triangle); set_dev_proc(dev, draw_thin_line, default_subclass_draw_thin_line); set_dev_proc(dev, begin_image, default_subclass_begin_image); - set_dev_proc(dev, image_data, default_subclass_image_data); - set_dev_proc(dev, end_image, default_subclass_end_image); set_dev_proc(dev, strip_tile_rectangle, default_subclass_strip_tile_rectangle); set_dev_proc(dev, strip_copy_rop, default_subclass_strip_copy_rop); set_dev_proc(dev, get_clipping_box, default_subclass_get_clipping_box); diff --git a/base/gdevsclass.h b/base/gdevsclass.h index 2b2c2ef9b..93ae625a7 100644 --- a/base/gdevsclass.h +++ b/base/gdevsclass.h @@ -55,8 +55,6 @@ dev_proc_fill_parallelogram(default_subclass_fill_parallelogram); dev_proc_fill_triangle(default_subclass_fill_triangle); dev_proc_draw_thin_line(default_subclass_draw_thin_line); dev_proc_begin_image(default_subclass_begin_image); -dev_proc_image_data(default_subclass_image_data); -dev_proc_end_image(default_subclass_end_image); dev_proc_strip_tile_rectangle(default_subclass_strip_tile_rectangle); dev_proc_strip_copy_rop(default_subclass_strip_copy_rop); dev_proc_get_clipping_box(default_subclass_get_clipping_box); diff --git a/base/gdevvec.c b/base/gdevvec.c index d26942079..193b9dfd8 100644 --- a/base/gdevvec.c +++ b/base/gdevvec.c @@ -926,8 +926,7 @@ gdev_vector_end_image(gx_device_vector * vdev, int code; if (pie->default_info) { - code = gx_default_end_image((gx_device *) vdev, pie->default_info, - draw_last); + code = gx_image_end(pie->default_info, draw_last); if (code >= 0) code = 0; } else { /* Fill out to the full image height. */ diff --git a/base/gxclip.c b/base/gxclip.c index 280d3d420..c19b2de14 100644 --- a/base/gxclip.c +++ b/base/gxclip.c @@ -108,8 +108,6 @@ clipper_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, gx_default_fill_triangle); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, begin_typed_image, gx_default_begin_typed_image); set_dev_proc(dev, text_begin, gx_default_text_begin); set_dev_proc(dev, fill_linear_color_scanline, gx_default_fill_linear_color_scanline); diff --git a/base/gxclip2.c b/base/gxclip2.c index 5d0207b39..72aa93c8d 100644 --- a/base/gxclip2.c +++ b/base/gxclip2.c @@ -95,8 +95,6 @@ tile_clipper_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, gx_default_fill_triangle); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, strip_tile_rectangle, gx_default_strip_tile_rectangle); set_dev_proc(dev, begin_typed_image, gx_default_begin_typed_image); set_dev_proc(dev, text_begin, gx_default_text_begin); diff --git a/base/gxclipm.c b/base/gxclipm.c index f33a96ce2..dbfa9d66e 100644 --- a/base/gxclipm.c +++ b/base/gxclipm.c @@ -97,8 +97,6 @@ mask_clip_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, gx_default_fill_triangle); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, begin_typed_image, gx_default_begin_typed_image); set_dev_proc(dev, text_begin, gx_default_text_begin); diff --git a/base/gxdevcli.h b/base/gxdevcli.h index 0dad8c505..68fa9ef12 100644 --- a/base/gxdevcli.h +++ b/base/gxdevcli.h @@ -1075,23 +1075,6 @@ typedef enum FILTER_FLAGS { #define dev_proc_begin_image(proc)\ dev_t_proc_begin_image(proc, gx_device) - /* OBSOLETED in release 5.23 */ - -#define dev_t_proc_image_data(proc, dev_t)\ - int proc(dev_t *dev,\ - gx_image_enum_common_t *info, const byte **planes, int data_x,\ - uint raster, int height) -#define dev_proc_image_data(proc)\ - dev_t_proc_image_data(proc, gx_device) - - /* OBSOLETED in release 5.23 */ - -#define dev_t_proc_end_image(proc, dev_t)\ - int proc(dev_t *dev,\ - gx_image_enum_common_t *info, bool draw_last) -#define dev_proc_end_image(proc)\ - dev_t_proc_end_image(proc, gx_device) - /* Added in release 3.68 */ #define dev_t_proc_strip_tile_rectangle(proc, dev_t)\ @@ -1535,8 +1518,6 @@ typedef struct { dev_t_proc_fill_triangle((*fill_triangle), dev_t);\ dev_t_proc_draw_thin_line((*draw_thin_line), dev_t);\ dev_t_proc_begin_image((*begin_image), dev_t);\ - dev_t_proc_image_data((*image_data), dev_t);\ - dev_t_proc_end_image((*end_image), dev_t);\ dev_t_proc_strip_tile_rectangle((*strip_tile_rectangle), dev_t);\ dev_t_proc_strip_copy_rop((*strip_copy_rop), dev_t);\ dev_t_proc_get_clipping_box((*get_clipping_box), dev_t);\ diff --git a/base/gxdevice.h b/base/gxdevice.h index e07f5fc8c..13d5fe4a6 100644 --- a/base/gxdevice.h +++ b/base/gxdevice.h @@ -274,8 +274,6 @@ dev_proc_fill_parallelogram(gx_default_fill_parallelogram); dev_proc_fill_triangle(gx_default_fill_triangle); dev_proc_draw_thin_line(gx_default_draw_thin_line); dev_proc_begin_image(gx_default_begin_image); -dev_proc_image_data(gx_default_image_data); -dev_proc_end_image(gx_default_end_image); dev_proc_strip_tile_rectangle(gx_default_strip_tile_rectangle); dev_proc_strip_copy_rop(gx_no_strip_copy_rop); /* gives error */ dev_proc_strip_copy_rop(gx_default_strip_copy_rop); @@ -379,8 +377,6 @@ dev_proc_fill_parallelogram(gx_forward_fill_parallelogram); dev_proc_fill_triangle(gx_forward_fill_triangle); dev_proc_draw_thin_line(gx_forward_draw_thin_line); dev_proc_begin_image(gx_forward_begin_image); -#define gx_forward_image_data gx_default_image_data -#define gx_forward_end_image gx_default_end_image dev_proc_strip_tile_rectangle(gx_forward_strip_tile_rectangle); dev_proc_strip_copy_rop(gx_forward_strip_copy_rop); dev_proc_get_clipping_box(gx_forward_get_clipping_box); diff --git a/base/gxpcmap.c b/base/gxpcmap.c index cb7b56aa3..1ff4fe30d 100644 --- a/base/gxpcmap.c +++ b/base/gxpcmap.c @@ -127,8 +127,6 @@ pattern_accum_initialize(gx_device *dev) set_dev_proc(dev, fill_triangle, gx_default_fill_triangle); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, begin_image, gx_default_begin_image); - set_dev_proc(dev, image_data, gx_default_image_data); - set_dev_proc(dev, end_image, gx_default_end_image); set_dev_proc(dev, strip_tile_rectangle, gx_default_strip_tile_rectangle); set_dev_proc(dev, strip_copy_rop, gx_default_strip_copy_rop); set_dev_proc(dev, begin_typed_image, gx_default_begin_typed_image); |