diff options
author | Robin Watts <Robin.Watts@artifex.com> | 2021-04-06 00:16:24 +0100 |
---|---|---|
committer | Robin Watts <Robin.Watts@artifex.com> | 2021-04-20 15:03:03 +0100 |
commit | ecac058cc868704f262e57bd9ed993f71e28f891 (patch) | |
tree | 519f582e9459d27eb0f03cbf21faaf9fe7c77cd5 | |
parent | d18dbc4375bdaf48925a877218fdadf104f607e2 (diff) | |
download | ghostpdl-ecac058cc868704f262e57bd9ed993f71e28f891.tar.gz |
Remove obsolete tile_rectangle dev_proc.
-rw-r--r-- | base/gdevdbit.c | 37 | ||||
-rw-r--r-- | base/gdevdflt.c | 2 | ||||
-rw-r--r-- | base/gdevepo.c | 13 | ||||
-rw-r--r-- | base/gdevflp.c | 16 | ||||
-rw-r--r-- | base/gdevmem.c | 1 | ||||
-rw-r--r-- | base/gdevnfwd.c | 16 | ||||
-rw-r--r-- | base/gdevoflt.c | 11 | ||||
-rw-r--r-- | base/gdevp14.c | 2 | ||||
-rw-r--r-- | base/gdevplnx.c | 1 | ||||
-rw-r--r-- | base/gdevsclass.c | 10 | ||||
-rw-r--r-- | base/gdevsclass.h | 1 | ||||
-rw-r--r-- | base/gsovrc.c | 3 | ||||
-rw-r--r-- | base/gxcht.c | 4 | ||||
-rw-r--r-- | base/gxclip.c | 1 | ||||
-rw-r--r-- | base/gxclip2.c | 1 | ||||
-rw-r--r-- | base/gxclipm.c | 1 | ||||
-rw-r--r-- | base/gxclrast.c | 2 | ||||
-rw-r--r-- | base/gxdevcli.h | 9 | ||||
-rw-r--r-- | base/gxdevice.h | 2 | ||||
-rw-r--r-- | base/gxpcmap.c | 1 | ||||
-rw-r--r-- | devices/gdevtrac.c | 14 |
21 files changed, 4 insertions, 144 deletions
diff --git a/base/gdevdbit.c b/base/gdevdbit.c index aba17446a..42d87179d 100644 --- a/base/gdevdbit.c +++ b/base/gdevdbit.c @@ -28,21 +28,6 @@ #undef mdev #include "gxcpath.h" -/* By default, implement tile_rectangle using strip_tile_rectangle. */ -int -gx_default_tile_rectangle(gx_device * dev, const gx_tile_bitmap * tile, - int x, int y, int w, int h, gx_color_index color0, gx_color_index color1, - int px, int py) -{ - gx_strip_bitmap tiles; - - *(gx_tile_bitmap *) & tiles = *tile; - tiles.shift = tiles.rep_shift = 0; - tiles.num_planes = 1; - return (*dev_proc(dev, strip_tile_rectangle)) - (dev, &tiles, x, y, w, h, color0, color1, px, py); -} - /* Implement copy_mono by filling lots of small rectangles. */ /* This is very inefficient, but it works as a default. */ int @@ -644,27 +629,7 @@ gx_default_strip_tile_rectangle(gx_device * dev, const gx_strip_bitmap * tiles, } #endif - if (dev_proc(dev, tile_rectangle) != gx_default_tile_rectangle) { - if (shift == 0) { /* - * Temporarily patch the tile_rectangle procedure in the - * device so we don't get into a recursion loop if the - * device has a tile_rectangle procedure that conditionally - * calls the strip_tile_rectangle procedure. - */ - dev_proc_tile_rectangle((*tile_proc)) = - dev_proc(dev, tile_rectangle); - int code = 0; - - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); - code = (*tile_proc) - (dev, (const gx_tile_bitmap *)tiles, x, y, w, h, - color0, color1, px, py); - set_dev_proc(dev, tile_rectangle, tile_proc); - return code; - } - /* We should probably optimize this case too, for the benefit */ - /* of window systems, but we don't yet. */ - } { /* + { /* * Note: we can't do the following computations until after * the fit_fill_xy. */ diff --git a/base/gdevdflt.c b/base/gdevdflt.c index 31850a0b0..25b730407 100644 --- a/base/gdevdflt.c +++ b/base/gdevdflt.c @@ -594,7 +594,6 @@ gx_device_fill_in_procs(register gx_device * dev) /* see below for map_rgb_color */ fill_dev_proc(dev, map_color_rgb, gx_default_map_color_rgb); /* NOT fill_rectangle */ - fill_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); fill_dev_proc(dev, copy_mono, gx_default_copy_mono); fill_dev_proc(dev, copy_color, gx_default_copy_color); fill_dev_proc(dev, get_bits, gx_default_get_bits); @@ -1258,7 +1257,6 @@ int gx_copy_device_procs(gx_device *dest, const gx_device *src, const gx_device set_dev_proc(dest, map_rgb_color, dev_proc(&prototype, map_rgb_color)); set_dev_proc(dest, map_color_rgb, dev_proc(&prototype, map_color_rgb)); set_dev_proc(dest, fill_rectangle, dev_proc(&prototype, fill_rectangle)); - set_dev_proc(dest, tile_rectangle, dev_proc(&prototype, tile_rectangle)); set_dev_proc(dest, copy_mono, dev_proc(&prototype, copy_mono)); set_dev_proc(dest, copy_color, dev_proc(&prototype, copy_color)); set_dev_proc(dest, get_bits, dev_proc(&prototype, get_bits)); diff --git a/base/gdevepo.c b/base/gdevepo.c index c067d6016..417276ba0 100644 --- a/base/gdevepo.c +++ b/base/gdevepo.c @@ -67,7 +67,6 @@ static dev_proc_initialize(epo_initialize); static dev_proc_begin_image(epo_begin_image); static dev_proc_begin_typed_image(epo_begin_typed_image); static dev_proc_stroke_path(epo_stroke_path); -static dev_proc_tile_rectangle(epo_tile_rectangle); static dev_proc_copy_mono(epo_copy_mono); static dev_proc_copy_color(epo_copy_color); static dev_proc_get_bits(epo_get_bits); @@ -436,7 +435,6 @@ int epo_initialize(gx_device *dev) set_dev_proc(dev, output_page, epo_output_page); set_dev_proc(dev, fill_rectangle, epo_fill_rectangle); - set_dev_proc(dev, tile_rectangle, epo_tile_rectangle); set_dev_proc(dev, copy_mono, epo_copy_mono); set_dev_proc(dev, copy_color, epo_copy_color); set_dev_proc(dev, get_bits, epo_get_bits); @@ -514,17 +512,6 @@ int epo_stroke_path(gx_device *dev, const gs_gstate *pgs, gx_path *ppath, return dev_proc(dev, stroke_path)(dev, pgs, ppath, params, pdcolor, pcpath); } -int epo_tile_rectangle(gx_device *dev, const gx_tile_bitmap *tile, int x, int y, int width, int height, - gx_color_index color0, gx_color_index color1, - int phase_x, int phase_y) -{ - int code = epo_handle_erase_page(dev); - - if (code != 0) - return code; - return dev_proc(dev, tile_rectangle)(dev, tile, x, y, width, height, color0, color1, phase_x, phase_y); -} - int epo_copy_mono(gx_device *dev, const byte *data, int data_x, int raster, gx_bitmap_id id, int x, int y, int width, int height, gx_color_index color0, gx_color_index color1) diff --git a/base/gdevflp.c b/base/gdevflp.c index d9f21e529..052b7c72a 100644 --- a/base/gdevflp.c +++ b/base/gdevflp.c @@ -60,7 +60,6 @@ private_st_flp_text_enum(); static dev_proc_output_page(flp_output_page); static dev_proc_close_device(flp_close_device); static dev_proc_fill_rectangle(flp_fill_rectangle); -static dev_proc_tile_rectangle(flp_tile_rectangle); static dev_proc_copy_mono(flp_copy_mono); static dev_proc_copy_color(flp_copy_color); static dev_proc_get_bits(flp_get_bits); @@ -373,20 +372,6 @@ int flp_fill_rectangle(gx_device *dev, int x, int y, int width, int height, gx_c return 0; } -int flp_tile_rectangle(gx_device *dev, const gx_tile_bitmap *tile, int x, int y, int width, int height, - gx_color_index color0, gx_color_index color1, - int phase_x, int phase_y) -{ - int code = SkipPage(dev); - - if (code < 0) - return code; - if (!code) - return default_subclass_tile_rectangle(dev, tile, x, y, width, height, color0, color1, phase_x, phase_y); - - return 0; -} - int flp_copy_mono(gx_device *dev, const byte *data, int data_x, int raster, gx_bitmap_id id, int x, int y, int width, int height, gx_color_index color0, gx_color_index color1) @@ -1257,7 +1242,6 @@ flp_initialize(gx_device *dev) set_dev_proc(dev, output_page, flp_output_page); set_dev_proc(dev, close_device, flp_close_device); set_dev_proc(dev, fill_rectangle, flp_fill_rectangle); - set_dev_proc(dev, tile_rectangle, flp_tile_rectangle); set_dev_proc(dev, copy_mono, flp_copy_mono); set_dev_proc(dev, copy_color, flp_copy_color); set_dev_proc(dev, get_bits, flp_get_bits); diff --git a/base/gdevmem.c b/base/gdevmem.c index 2911b5ba7..5c65f2465 100644 --- a/base/gdevmem.c +++ b/base/gdevmem.c @@ -886,7 +886,6 @@ void mem_initialize(gx_device *dev) set_dev_proc(dev, sync_output, gx_default_sync_output); set_dev_proc(dev, output_page, gx_default_output_page); set_dev_proc(dev, close_device, mem_close); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, get_bits, gx_default_get_bits); set_dev_proc(dev, get_params, gx_default_get_params); set_dev_proc(dev, put_params, gx_default_put_params); diff --git a/base/gdevnfwd.c b/base/gdevnfwd.c index ceffbeb66..5677dba61 100644 --- a/base/gdevnfwd.c +++ b/base/gdevnfwd.c @@ -63,7 +63,6 @@ gx_device_forward_fill_in_procs(register gx_device_forward * dev) fill_dev_proc(dev, map_rgb_color, gx_forward_map_rgb_color); fill_dev_proc(dev, map_color_rgb, gx_forward_map_color_rgb); /* NOT fill_rectangle */ - /* NOT tile_rectangle */ /* NOT copy_mono */ /* NOT copy_color */ fill_dev_proc(dev, get_bits, gx_forward_get_bits); @@ -220,20 +219,6 @@ gx_forward_fill_rectangle(gx_device * dev, int x, int y, int w, int h, } int -gx_forward_tile_rectangle(gx_device * dev, const gx_tile_bitmap * tile, - int x, int y, int w, int h, gx_color_index color0, - gx_color_index color1, int px, int py) -{ - gx_device_forward * const fdev = (gx_device_forward *)dev; - gx_device *tdev = fdev->target; - dev_proc_tile_rectangle((*proc)) = - (tdev == 0 ? (tdev = dev, gx_default_tile_rectangle) : - dev_proc(tdev, tile_rectangle)); - - return proc(tdev, tile, x, y, w, h, color0, color1, px, py); -} - -int gx_forward_copy_mono(gx_device * dev, const byte * data, int dx, int raster, gx_bitmap_id id, int x, int y, int w, int h, @@ -1365,7 +1350,6 @@ void gx_forward_device_initialize_procs(gx_device *dev) fill_dev_proc(dev, map_rgb_color, gx_forward_map_rgb_color); fill_dev_proc(dev, map_color_rgb, gx_forward_map_color_rgb); fill_dev_proc(dev, fill_rectangle, gx_forward_fill_rectangle); - fill_dev_proc(dev, tile_rectangle, gx_forward_tile_rectangle); fill_dev_proc(dev, copy_mono, gx_forward_copy_mono); fill_dev_proc(dev, copy_color, gx_forward_copy_color); fill_dev_proc(dev, get_bits, gx_forward_get_bits); diff --git a/base/gdevoflt.c b/base/gdevoflt.c index 6b30995b3..35ffb94ac 100644 --- a/base/gdevoflt.c +++ b/base/gdevoflt.c @@ -44,7 +44,6 @@ private_st_obj_filter_text_enum(); /* Device procedures, we need to implement all of them */ static dev_proc_fill_rectangle(obj_filter_fill_rectangle); -static dev_proc_tile_rectangle(obj_filter_tile_rectangle); static dev_proc_fill_path(obj_filter_fill_path); static dev_proc_stroke_path(obj_filter_stroke_path); static dev_proc_fill_mask(obj_filter_fill_mask); @@ -100,7 +99,6 @@ obj_filter_initialize(gx_device *dev) return code; set_dev_proc(dev, fill_rectangle, obj_filter_fill_rectangle); - set_dev_proc(dev, tile_rectangle, obj_filter_tile_rectangle); set_dev_proc(dev, fill_path, obj_filter_fill_path); set_dev_proc(dev, stroke_path, obj_filter_stroke_path); set_dev_proc(dev, fill_mask, obj_filter_fill_mask); @@ -150,15 +148,6 @@ int obj_filter_fill_rectangle(gx_device *dev, int x, int y, int width, int heigh return 0; } -int obj_filter_tile_rectangle(gx_device *dev, const gx_tile_bitmap *tile, int x, int y, int width, int height, - gx_color_index color0, gx_color_index color1, - int phase_x, int phase_y) -{ - if ((dev->ObjectFilter & FILTERVECTOR) == 0) - return default_subclass_tile_rectangle(dev, tile, x, y, width, height, color0, color1, phase_x, phase_y); - return 0; -} - int obj_filter_fill_path(gx_device *dev, const gs_gstate *pgs, gx_path *ppath, const gx_fill_params *params, const gx_drawing_color *pdcolor, const gx_clip_path *pcpath) diff --git a/base/gdevp14.c b/base/gdevp14.c index 2476558f1..81a358b4c 100644 --- a/base/gdevp14.c +++ b/base/gdevp14.c @@ -5461,7 +5461,6 @@ pdf14_forward_device_procs(gx_device * dev) set_dev_proc(dev, close_device, gx_forward_close_device); set_dev_proc(dev, fill_rectangle, gx_forward_fill_rectangle); set_dev_proc(dev, fill_rectangle_hl_color, gx_forward_fill_rectangle_hl_color); - set_dev_proc(dev, tile_rectangle, gx_forward_tile_rectangle); set_dev_proc(dev, copy_mono, gx_forward_copy_mono); set_dev_proc(dev, copy_color, gx_forward_copy_color); set_dev_proc(dev, get_page_device, gx_forward_get_page_device); @@ -9598,7 +9597,6 @@ pdf14_clist_initialize(gx_device *dev, set_dev_proc(dev, map_rgb_color, pdf14_encode_color); set_dev_proc(dev, map_color_rgb, pdf14_decode_color); set_dev_proc(dev, fill_rectangle, gx_forward_fill_rectangle); - set_dev_proc(dev, tile_rectangle, gx_forward_tile_rectangle); set_dev_proc(dev, copy_mono, gx_forward_copy_mono); set_dev_proc(dev, copy_color, gx_forward_copy_color); set_dev_proc(dev, get_bits, gx_forward_get_bits); diff --git a/base/gdevplnx.c b/base/gdevplnx.c index fb337b639..5ae4c980a 100644 --- a/base/gdevplnx.c +++ b/base/gdevplnx.c @@ -91,7 +91,6 @@ plane_initialize(gx_device *dev) /* Ideally the following would be initialized to the defaults * automatically, but this does not currently work. */ set_dev_proc(dev, close_device, gx_default_close_device); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, get_bits, gx_default_get_bits); set_dev_proc(dev, copy_rop, gx_default_copy_rop); set_dev_proc(dev, fill_trapezoid, gx_default_fill_trapezoid); diff --git a/base/gdevsclass.c b/base/gdevsclass.c index 9626be37e..56434b907 100644 --- a/base/gdevsclass.c +++ b/base/gdevsclass.c @@ -178,15 +178,6 @@ int default_subclass_fill_rectangle(gx_device *dev, int x, int y, int width, int return 0; } -int default_subclass_tile_rectangle(gx_device *dev, const gx_tile_bitmap *tile, int x, int y, int width, int height, - gx_color_index color0, gx_color_index color1, - int phase_x, int phase_y) -{ - if (dev->child) - return dev_proc(dev->child, tile_rectangle)(dev->child, tile, x, y, width, height, color0, color1, phase_x, phase_y); - return 0; -} - int default_subclass_copy_mono(gx_device *dev, const byte *data, int data_x, int raster, gx_bitmap_id id, int x, int y, int width, int height, gx_color_index color0, gx_color_index color1) @@ -899,7 +890,6 @@ int default_subclass_initialize(gx_device *dev) set_dev_proc(dev, map_rgb_color, default_subclass_map_rgb_color); set_dev_proc(dev, map_color_rgb, default_subclass_map_color_rgb); set_dev_proc(dev, fill_rectangle, default_subclass_fill_rectangle); - set_dev_proc(dev, tile_rectangle, default_subclass_tile_rectangle); set_dev_proc(dev, copy_mono, default_subclass_copy_mono); set_dev_proc(dev, copy_color, default_subclass_copy_color); set_dev_proc(dev, get_bits, default_subclass_get_bits); diff --git a/base/gdevsclass.h b/base/gdevsclass.h index 319ce6965..5d85d584d 100644 --- a/base/gdevsclass.h +++ b/base/gdevsclass.h @@ -36,7 +36,6 @@ dev_proc_close_device(default_subclass_close_device); dev_proc_map_rgb_color(default_subclass_map_rgb_color); dev_proc_map_color_rgb(default_subclass_map_color_rgb); dev_proc_fill_rectangle(default_subclass_fill_rectangle); -dev_proc_tile_rectangle(default_subclass_tile_rectangle); dev_proc_copy_mono(default_subclass_copy_mono); dev_proc_copy_color(default_subclass_copy_color); dev_proc_get_bits(default_subclass_get_bits); diff --git a/base/gsovrc.c b/base/gsovrc.c index cd38e6d51..7fe51d1b0 100644 --- a/base/gsovrc.c +++ b/base/gsovrc.c @@ -412,7 +412,6 @@ nooverprint_initialize(gx_device *dev) { set_dev_proc(dev, open_device, overprint_open_device); set_dev_proc(dev, fill_rectangle, gx_forward_fill_rectangle); - set_dev_proc(dev, tile_rectangle, gx_forward_tile_rectangle); set_dev_proc(dev, copy_mono, gx_forward_copy_mono); set_dev_proc(dev, copy_color, gx_forward_copy_color); set_dev_proc(dev, put_params, overprint_put_params); @@ -472,7 +471,6 @@ generic_overprint_initialize(gx_device *dev) * ones, and that doesn't work. Maybe look into this in future. */ set_dev_proc(dev, open_device, overprint_open_device); set_dev_proc(dev, fill_rectangle, overprint_generic_fill_rectangle); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, copy_mono, gx_default_copy_mono); set_dev_proc(dev, copy_color, gx_default_copy_color); set_dev_proc(dev, put_params, overprint_put_params); @@ -513,7 +511,6 @@ sep_overprint_initialize(gx_device *dev) * ones, and that doesn't work. Maybe look into this in future. */ set_dev_proc(dev, open_device, overprint_open_device); set_dev_proc(dev, fill_rectangle, overprint_sep_fill_rectangle); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, copy_mono, gx_default_copy_mono); set_dev_proc(dev, copy_color, gx_default_copy_color); set_dev_proc(dev, put_params, overprint_put_params); diff --git a/base/gxcht.c b/base/gxcht.c index dc1064a18..2fe34bbb2 100644 --- a/base/gxcht.c +++ b/base/gxcht.c @@ -671,8 +671,8 @@ gx_dc_ht_colored_fill_rectangle(const gx_device_color * pdevc, /* * If the LCM of the plane cell sizes is smaller than the rectangle - * being filled, compute a single tile and let tile_rectangle do the - * replication. + * being filled, compute a single tile and let strip_tile_rectangle + * do the replication. */ if ((w > lw || h > lh) && (raster = bitmap_raster(lw * depth)) <= tile_bytes / lh diff --git a/base/gxclip.c b/base/gxclip.c index 52b16a6fd..53d5ffddf 100644 --- a/base/gxclip.c +++ b/base/gxclip.c @@ -100,7 +100,6 @@ clipper_initialize(gx_device *dev) set_dev_proc(dev, sync_output, gx_default_sync_output); set_dev_proc(dev, output_page, gx_default_output_page); set_dev_proc(dev, close_device, gx_default_close_device); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, draw_thin_line, gx_default_draw_thin_line); set_dev_proc(dev, get_bits, gx_default_get_bits); set_dev_proc(dev, copy_rop, gx_default_copy_rop); diff --git a/base/gxclip2.c b/base/gxclip2.c index f125e4ca1..516dbc8ef 100644 --- a/base/gxclip2.c +++ b/base/gxclip2.c @@ -87,7 +87,6 @@ tile_clipper_initialize(gx_device *dev) set_dev_proc(dev, sync_output, gx_default_sync_output); set_dev_proc(dev, output_page, gx_default_output_page); set_dev_proc(dev, close_device, gx_default_close_device); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, copy_rop, gx_default_copy_rop); set_dev_proc(dev, fill_path, gx_default_fill_path); set_dev_proc(dev, stroke_path, gx_default_stroke_path); diff --git a/base/gxclipm.c b/base/gxclipm.c index 20a1efa08..f9c7e1846 100644 --- a/base/gxclipm.c +++ b/base/gxclipm.c @@ -89,7 +89,6 @@ mask_clip_initialize(gx_device *dev) set_dev_proc(dev, sync_output, gx_default_sync_output); set_dev_proc(dev, output_page, gx_default_output_page); set_dev_proc(dev, close_device, gx_default_close_device); - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, copy_rop, gx_default_copy_rop); set_dev_proc(dev, fill_path, gx_default_fill_path); set_dev_proc(dev, stroke_path, gx_default_stroke_path); diff --git a/base/gxclrast.c b/base/gxclrast.c index f9f42d88f..798e5d4f2 100644 --- a/base/gxclrast.c +++ b/base/gxclrast.c @@ -2291,7 +2291,7 @@ idata: data_size = 0; } case cmd_op_tile_rect_short >> 4: case cmd_op_tile_rect_tiny >> 4: - /* Currently we don't use lop with tile_rectangle. */ + /* Currently we don't use lop with strip_tile_rectangle. */ code = (*dev_proc(tdev, strip_tile_rectangle)) (tdev, &state_tile, state.rect.x - x0, state.rect.y - y0, diff --git a/base/gxdevcli.h b/base/gxdevcli.h index a3c7dcf43..f82a9fa85 100644 --- a/base/gxdevcli.h +++ b/base/gxdevcli.h @@ -900,14 +900,6 @@ typedef enum FILTER_FLAGS { #define dev_proc_fill_rectangle(proc)\ dev_t_proc_fill_rectangle(proc, gx_device) -#define dev_t_proc_tile_rectangle(proc, dev_t)\ - int proc(dev_t *dev,\ - const gx_tile_bitmap *tile, int x, int y, int width, int height,\ - gx_color_index color0, gx_color_index color1,\ - int phase_x, int phase_y) -#define dev_proc_tile_rectangle(proc)\ - dev_t_proc_tile_rectangle(proc, gx_device) - #define dev_t_proc_copy_mono(proc, dev_t)\ int proc(dev_t *dev,\ const byte *data, int data_x, int raster, gx_bitmap_id id,\ @@ -1536,7 +1528,6 @@ typedef struct { dev_t_proc_map_rgb_color((*map_rgb_color), dev_t);\ dev_t_proc_map_color_rgb((*map_color_rgb), dev_t);\ dev_t_proc_fill_rectangle((*fill_rectangle), dev_t);\ - dev_t_proc_tile_rectangle((*tile_rectangle), dev_t);\ dev_t_proc_copy_mono((*copy_mono), dev_t);\ dev_t_proc_copy_color((*copy_color), dev_t);\ dev_t_proc_get_bits((*get_bits), dev_t);\ diff --git a/base/gxdevice.h b/base/gxdevice.h index ce61f2dec..b1cbe0f3a 100644 --- a/base/gxdevice.h +++ b/base/gxdevice.h @@ -252,7 +252,6 @@ dev_proc_map_rgb_color(gx_default_w_b_map_rgb_color); dev_proc_map_color_rgb(gx_default_w_b_map_color_rgb); #define gx_default_map_rgb_color gx_default_w_b_map_rgb_color #define gx_default_map_color_rgb gx_default_w_b_map_color_rgb -dev_proc_tile_rectangle(gx_default_tile_rectangle); dev_proc_copy_mono(gx_default_copy_mono); dev_proc_copy_color(gx_default_copy_color); dev_proc_get_bits(gx_no_get_bits); /* gives error */ @@ -363,7 +362,6 @@ dev_proc_output_page(gx_forward_output_page); dev_proc_map_rgb_color(gx_forward_map_rgb_color); dev_proc_map_color_rgb(gx_forward_map_color_rgb); dev_proc_fill_rectangle(gx_forward_fill_rectangle); -dev_proc_tile_rectangle(gx_forward_tile_rectangle); dev_proc_copy_mono(gx_forward_copy_mono); dev_proc_copy_color(gx_forward_copy_color); dev_proc_get_bits(gx_forward_get_bits); diff --git a/base/gxpcmap.c b/base/gxpcmap.c index 1a0d5c5f3..3eb248044 100644 --- a/base/gxpcmap.c +++ b/base/gxpcmap.c @@ -117,7 +117,6 @@ pattern_accum_initialize(gx_device *dev) /* It would be much nicer if gx_device_init set the following * defaults for us, but that doesn't work for some reason. */ - set_dev_proc(dev, tile_rectangle, gx_default_tile_rectangle); set_dev_proc(dev, get_bits, gx_default_get_bits); set_dev_proc(dev, copy_alpha, gx_default_copy_alpha); set_dev_proc(dev, copy_rop, gx_default_copy_rop); diff --git a/devices/gdevtrac.c b/devices/gdevtrac.c index e42b4d5b2..d19136059 100644 --- a/devices/gdevtrac.c +++ b/devices/gdevtrac.c @@ -260,20 +260,6 @@ trace_draw_thin_line(gx_device * dev, } static int -trace_strip_tile_rectangle(gx_device * dev, const gx_strip_bitmap * tiles, - int x, int y, int w, int h, - gx_color_index color0, gx_color_index color1, - int px, int py) -{ - dmprintf6(dev->memory,"strip_tile_rectangle(x=%d, y=%d, w=%d, h=%d, colors=(0x%lx,0x%lx),\n", - x, y, w, h, (ulong)color0, (ulong)color1); - dmprintf8(dev->memory," size=(%d,%d) shift %u, rep=(%u,%u) shift %u, phase=(%d,%d))\n", - tiles->size.x, tiles->size.y, tiles->shift, - tiles->rep_width, tiles->rep_height, tiles->rep_shift, px, py); - return 0; -} - -static int trace_strip_copy_rop(gx_device * dev, const byte * sdata, int sourcex, uint sraster, gx_bitmap_id id, const gx_color_index * scolors, |