diff options
| -rw-r--r-- | base/gdevdflt.c | 187 | ||||
| -rw-r--r-- | base/gdevmpla.c | 2 | ||||
| -rw-r--r-- | base/gdevnfwd.c | 4 | ||||
| -rw-r--r-- | base/gdevp14.c | 132 | ||||
| -rw-r--r-- | base/gdevprn.c | 7 | ||||
| -rw-r--r-- | base/gdevsclass.c | 144 | ||||
| -rw-r--r-- | base/gdevvec.c | 4 | ||||
| -rw-r--r-- | base/gsdevice.c | 6 | ||||
| -rw-r--r-- | base/gsdparam.c | 20 | ||||
| -rw-r--r-- | base/gsicc_manage.c | 6 | ||||
| -rw-r--r-- | base/gxclist.c | 6 | ||||
| -rw-r--r-- | base/gxclrect.c | 2 | ||||
| -rw-r--r-- | base/gxcmap.c | 7 | ||||
| -rw-r--r-- | base/gxdevice.h | 2 | ||||
| -rw-r--r-- | base/gxfapi.c | 4 | ||||
| -rw-r--r-- | base/gxfill.c | 2 | ||||
| -rw-r--r-- | base/gxp1fill.c | 2 | ||||
| -rw-r--r-- | base/gxpcmap.c | 14 | ||||
| -rw-r--r-- | devices/gdevdsp.c | 2 | ||||
| -rw-r--r-- | devices/gdevplib.c | 4 | ||||
| -rw-r--r-- | devices/gdevtifs.c | 4 | ||||
| -rw-r--r-- | devices/gdevtsep.c | 12 | ||||
| -rw-r--r-- | devices/gdevwpr2.c | 20 |
23 files changed, 287 insertions, 306 deletions
diff --git a/base/gdevdflt.c b/base/gdevdflt.c index cd00b7f61..964ee1df1 100644 --- a/base/gdevdflt.c +++ b/base/gdevdflt.c @@ -722,8 +722,6 @@ gx_device_fill_in_procs(register gx_device * dev) } set_dev_proc(dev, decode_color, get_decode_color(dev)); -/* This is set at the start of the routine already! */ -/* fill_dev_proc(dev, map_color_rgb, gx_default_map_color_rgb);*/ fill_dev_proc(dev, get_profile, gx_default_get_profile); fill_dev_proc(dev, set_graphics_type_tag, gx_default_set_graphics_type_tag); @@ -1025,9 +1023,9 @@ gx_default_dev_spec_op(gx_device *pdev, int dev_spec_op, void *data, int size) case gxdso_needs_invariant_palette: return 0; case gxdso_pattern_shfill_doesnt_need_path: - return (pdev->procs.fill_path == gx_default_fill_path); + return (dev_proc(pdev, fill_path) == gx_default_fill_path); case gxdso_is_std_cmyk_1bit: - return (pdev->procs.map_cmyk_color == cmyk_1bit_map_cmyk_color); + return (dev_proc(pdev, map_cmyk_color) == cmyk_1bit_map_cmyk_color); case gxdso_interpolate_antidropout: return pdev->color_info.use_antidropout_downscaler; case gxdso_interpolate_threshold: @@ -1231,73 +1229,72 @@ gx_default_set_graphics_type_tag(gx_device *dev, gs_graphics_type_tag_t graphics * prototype (subclass device) method if the original device had the default implementation. * I suspect a combination of forwarding and subclassing devices will not work properly for this reason. */ -int gx_copy_device_procs(gx_device_procs *dest_procs, gx_device_procs *src_procs, gx_device_procs *prototype_procs) +int gx_copy_device_procs(gx_device *dest, gx_device *src, gx_device *prototype) { - dest_procs->open_device = prototype_procs->open_device; - dest_procs->get_initial_matrix = prototype_procs->get_initial_matrix; - dest_procs->sync_output = prototype_procs->sync_output; - dest_procs->output_page = prototype_procs->output_page; - dest_procs->close_device = prototype_procs->close_device; - dest_procs->map_rgb_color = prototype_procs->map_rgb_color; - dest_procs->map_color_rgb = prototype_procs->map_color_rgb; - dest_procs->fill_rectangle = prototype_procs->fill_rectangle; - dest_procs->tile_rectangle = prototype_procs->tile_rectangle; - dest_procs->copy_mono = prototype_procs->copy_mono; - dest_procs->copy_color = prototype_procs->copy_color; - dest_procs->obsolete_draw_line = prototype_procs->obsolete_draw_line; - dest_procs->get_bits = prototype_procs->get_bits; - dest_procs->get_params = prototype_procs->get_params; - dest_procs->put_params = prototype_procs->put_params; - dest_procs->map_cmyk_color = prototype_procs->map_cmyk_color; - dest_procs->get_xfont_procs = prototype_procs->get_xfont_procs; - dest_procs->get_xfont_device = prototype_procs->get_xfont_device; - dest_procs->map_rgb_alpha_color = prototype_procs->map_rgb_alpha_color; - dest_procs->get_page_device = prototype_procs->get_page_device; - dest_procs->get_alpha_bits = prototype_procs->get_alpha_bits; - dest_procs->copy_alpha = prototype_procs->copy_alpha; - dest_procs->get_band = prototype_procs->get_band; - dest_procs->copy_rop = prototype_procs->copy_rop; - dest_procs->fill_path = prototype_procs->fill_path; - dest_procs->stroke_path = prototype_procs->stroke_path; - - dest_procs->fill_trapezoid = prototype_procs->fill_trapezoid; - dest_procs->fill_parallelogram = prototype_procs->fill_parallelogram; - dest_procs->fill_triangle = prototype_procs->fill_triangle; - dest_procs->draw_thin_line = prototype_procs->draw_thin_line; - dest_procs->begin_image = prototype_procs->begin_image; - dest_procs->image_data = prototype_procs->image_data; - dest_procs->end_image = prototype_procs->end_image; - dest_procs->strip_tile_rectangle = prototype_procs->strip_tile_rectangle; - dest_procs->strip_copy_rop = prototype_procs->strip_copy_rop; - dest_procs->get_clipping_box = prototype_procs->get_clipping_box; - dest_procs->begin_typed_image = prototype_procs->begin_typed_image; - dest_procs->get_bits_rectangle = prototype_procs->get_bits_rectangle; - dest_procs->map_color_rgb_alpha = prototype_procs->map_color_rgb_alpha; - dest_procs->create_compositor = prototype_procs->create_compositor; - dest_procs->get_hardware_params = prototype_procs->get_hardware_params; - dest_procs->text_begin = prototype_procs->text_begin; - dest_procs->finish_copydevice = prototype_procs->finish_copydevice; - dest_procs->discard_transparency_layer = prototype_procs->discard_transparency_layer; - dest_procs->get_color_mapping_procs = prototype_procs->get_color_mapping_procs; - dest_procs->get_color_comp_index = prototype_procs->get_color_comp_index; - dest_procs->encode_color = prototype_procs->encode_color; - dest_procs->decode_color = prototype_procs->decode_color; - dest_procs->pattern_manage = prototype_procs->pattern_manage; - dest_procs->fill_rectangle_hl_color = prototype_procs->fill_rectangle_hl_color; - dest_procs->include_color_space = prototype_procs->include_color_space; - dest_procs->fill_linear_color_scanline = prototype_procs->fill_linear_color_scanline; - dest_procs->fill_linear_color_trapezoid = prototype_procs->fill_linear_color_trapezoid; - dest_procs->fill_linear_color_triangle = prototype_procs->fill_linear_color_triangle; - dest_procs->update_spot_equivalent_colors = prototype_procs->update_spot_equivalent_colors; - dest_procs->ret_devn_params = prototype_procs->ret_devn_params; - dest_procs->fillpage = prototype_procs->fillpage; - dest_procs->push_transparency_state = prototype_procs->push_transparency_state; - dest_procs->pop_transparency_state = prototype_procs->pop_transparency_state; - dest_procs->dev_spec_op = prototype_procs->dev_spec_op; - dest_procs->get_profile = prototype_procs->get_profile; - dest_procs->strip_copy_rop2 = prototype_procs->strip_copy_rop2; - dest_procs->strip_tile_rect_devn = prototype_procs->strip_tile_rect_devn; - dest_procs->process_page = prototype_procs->process_page; + set_dev_proc(dest, open_device, dev_proc(prototype, open_device)); + set_dev_proc(dest, get_initial_matrix, dev_proc(prototype, get_initial_matrix)); + set_dev_proc(dest, sync_output, dev_proc(prototype, sync_output)); + set_dev_proc(dest, output_page, dev_proc(prototype, output_page)); + set_dev_proc(dest, close_device, dev_proc(prototype, close_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, obsolete_draw_line, dev_proc(prototype, obsolete_draw_line)); + set_dev_proc(dest, get_bits, dev_proc(prototype, get_bits)); + set_dev_proc(dest, get_params, dev_proc(prototype, get_params)); + set_dev_proc(dest, put_params, dev_proc(prototype, put_params)); + set_dev_proc(dest, map_cmyk_color, dev_proc(prototype, map_cmyk_color)); + set_dev_proc(dest, get_xfont_procs, dev_proc(prototype, get_xfont_procs)); + set_dev_proc(dest, get_xfont_device, dev_proc(prototype, get_xfont_device)); + set_dev_proc(dest, map_rgb_alpha_color, dev_proc(prototype, map_rgb_alpha_color)); + set_dev_proc(dest, get_page_device, dev_proc(prototype, get_page_device)); + set_dev_proc(dest, get_alpha_bits, dev_proc(prototype, get_alpha_bits)); + set_dev_proc(dest, copy_alpha, dev_proc(prototype, copy_alpha)); + set_dev_proc(dest, get_band, dev_proc(prototype, get_band)); + set_dev_proc(dest, copy_rop, dev_proc(prototype, copy_rop)); + set_dev_proc(dest, fill_path, dev_proc(prototype, fill_path)); + set_dev_proc(dest, stroke_path, dev_proc(prototype, stroke_path)); + set_dev_proc(dest, fill_trapezoid, dev_proc(prototype, fill_trapezoid)); + set_dev_proc(dest, fill_parallelogram, dev_proc(prototype, fill_parallelogram)); + 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)); + set_dev_proc(dest, begin_typed_image, dev_proc(prototype, begin_typed_image)); + set_dev_proc(dest, get_bits_rectangle, dev_proc(prototype, get_bits_rectangle)); + set_dev_proc(dest, map_color_rgb_alpha, dev_proc(prototype, map_color_rgb_alpha)); + set_dev_proc(dest, create_compositor, dev_proc(prototype, create_compositor)); + set_dev_proc(dest, get_hardware_params, dev_proc(prototype, get_hardware_params)); + set_dev_proc(dest, text_begin, dev_proc(prototype, text_begin)); + set_dev_proc(dest, finish_copydevice, dev_proc(prototype, finish_copydevice)); + set_dev_proc(dest, discard_transparency_layer, dev_proc(prototype, discard_transparency_layer)); + set_dev_proc(dest, get_color_mapping_procs, dev_proc(prototype, get_color_mapping_procs)); + set_dev_proc(dest, get_color_comp_index, dev_proc(prototype, get_color_comp_index)); + set_dev_proc(dest, encode_color, dev_proc(prototype, encode_color)); + set_dev_proc(dest, decode_color, dev_proc(prototype, decode_color)); + set_dev_proc(dest, pattern_manage, dev_proc(prototype, pattern_manage)); + set_dev_proc(dest, fill_rectangle_hl_color, dev_proc(prototype, fill_rectangle_hl_color)); + set_dev_proc(dest, include_color_space, dev_proc(prototype, include_color_space)); + set_dev_proc(dest, fill_linear_color_scanline, dev_proc(prototype, fill_linear_color_scanline)); + set_dev_proc(dest, fill_linear_color_trapezoid, dev_proc(prototype, fill_linear_color_trapezoid)); + set_dev_proc(dest, fill_linear_color_triangle, dev_proc(prototype, fill_linear_color_triangle)); + set_dev_proc(dest, update_spot_equivalent_colors, dev_proc(prototype, update_spot_equivalent_colors)); + set_dev_proc(dest, ret_devn_params, dev_proc(prototype, ret_devn_params)); + set_dev_proc(dest, fillpage, dev_proc(prototype, fillpage)); + set_dev_proc(dest, push_transparency_state, dev_proc(prototype, push_transparency_state)); + set_dev_proc(dest, pop_transparency_state, dev_proc(prototype, pop_transparency_state)); + set_dev_proc(dest, dev_spec_op, dev_proc(prototype, dev_spec_op)); + set_dev_proc(dest, get_profile, dev_proc(prototype, get_profile)); + set_dev_proc(dest, strip_copy_rop2, dev_proc(prototype, strip_copy_rop2)); + set_dev_proc(dest, strip_tile_rect_devn, dev_proc(prototype, strip_tile_rect_devn)); + set_dev_proc(dest, process_page, dev_proc(prototype, process_page)); /* * We absolutely must set the 'set_graphics_type_tag' to the default subclass one @@ -1306,7 +1303,7 @@ int gx_copy_device_procs(gx_device_procs *dest_procs, gx_device_procs *src_procs * copy the default method, we'lll end up setting the flag in the subclassing device * instead of the subclassed device! */ - dest_procs->set_graphics_type_tag = prototype_procs->set_graphics_type_tag; + set_dev_proc(dest, set_graphics_type_tag, dev_proc(prototype, set_graphics_type_tag)); /* These are the routines whose existence is checked against the default at * some point in the code. The code path differs when the device implements a @@ -1314,18 +1311,18 @@ int gx_copy_device_procs(gx_device_procs *dest_procs, gx_device_procs *src_procs * if the subclassed device has one of these methods set to the default, we * do not overwrite the default method. */ - if (src_procs->fill_mask != gx_default_fill_mask) - dest_procs->fill_mask = prototype_procs->fill_mask; - if (src_procs->begin_transparency_group != gx_default_begin_transparency_group) - dest_procs->begin_transparency_group = prototype_procs->begin_transparency_group; - if (src_procs->end_transparency_group != gx_default_end_transparency_group) - dest_procs->end_transparency_group = prototype_procs->end_transparency_group; - if (src_procs->put_image != gx_default_put_image) - dest_procs->put_image = prototype_procs->put_image; - if (src_procs->copy_planes != gx_default_copy_planes) - dest_procs->copy_planes = prototype_procs->copy_planes; - if (src_procs->copy_alpha_hl_color != gx_default_no_copy_alpha_hl_color) - dest_procs->copy_alpha_hl_color = prototype_procs->copy_alpha_hl_color; + if (dev_proc(src, fill_mask) != gx_default_fill_mask) + set_dev_proc(dest, fill_mask, dev_proc(prototype, fill_mask)); + if (dev_proc(src, begin_transparency_group) != gx_default_begin_transparency_group) + set_dev_proc(dest, begin_transparency_group, dev_proc(prototype, begin_transparency_group)); + if (dev_proc(src, end_transparency_group) != gx_default_end_transparency_group) + set_dev_proc(dest, end_transparency_group, dev_proc(prototype, end_transparency_group)); + if (dev_proc(src, put_image) != gx_default_put_image) + set_dev_proc(dest, put_image, dev_proc(prototype, put_image)); + if (dev_proc(src, copy_planes) != gx_default_copy_planes) + set_dev_proc(dest, copy_planes, dev_proc(prototype, copy_planes)); + if (dev_proc(src, copy_alpha_hl_color) != gx_default_no_copy_alpha_hl_color) + set_dev_proc(dest, copy_alpha_hl_color, dev_proc(prototype, copy_alpha_hl_color)); return 0; } @@ -1382,9 +1379,9 @@ int gx_device_subclass(gx_device *dev_to_subclass, gx_device *new_prototype, uns } memset(psubclass_data, 0x00, private_data_size); - gx_copy_device_procs(&dev_to_subclass->procs, &child_dev->procs, &new_prototype->procs); - dev_to_subclass->procs.fill_rectangle = new_prototype->procs.fill_rectangle; - dev_to_subclass->procs.copy_planes = new_prototype->procs.copy_planes; + gx_copy_device_procs(dev_to_subclass, child_dev, new_prototype); + set_dev_proc(dev_to_subclass, fill_rectangle, dev_proc(new_prototype, fill_rectangle)); + set_dev_proc(dev_to_subclass, copy_planes, dev_proc(new_prototype, copy_planes)); dev_to_subclass->finalize = new_prototype->finalize; dev_to_subclass->dname = new_prototype->dname; if (dev_to_subclass->icc_struct) @@ -1567,7 +1564,7 @@ int gx_subclass_create_compositor(gx_device *dev, gx_device **pcdev, const gs_co p14dev = (pdf14_clist_device *)dev; psubclass_data = p14dev->target->subclass_data; - dev->procs.create_compositor = psubclass_data->saved_compositor_method; + set_dev_proc(dev, create_compositor, psubclass_data->saved_compositor_method); if (gs_is_pdf14trans_compositor(pcte) != 0 && strncmp(dev->dname, "pdf14clist", 10) == 0) { const gs_pdf14trans_t * pdf14pct = (const gs_pdf14trans_t *) pcte; @@ -1582,10 +1579,10 @@ int gx_subclass_create_compositor(gx_device *dev, gx_device **pcdev, const gs_co if (p14dev->target->child) p14dev->target->child->color_info = p14dev->saved_target_color_info; - p14dev->target->child->procs.encode_color = p14dev->saved_target_encode_color; - p14dev->target->child->procs.decode_color = p14dev->saved_target_decode_color; - p14dev->target->child->procs.get_color_mapping_procs = p14dev->saved_target_get_color_mapping_procs; - p14dev->target->child->procs.get_color_comp_index = p14dev->saved_target_get_color_comp_index; + set_dev_proc(p14dev->target->child, encode_color, p14dev->saved_target_encode_color); + set_dev_proc(p14dev->target->child, decode_color, p14dev->saved_target_decode_color); + set_dev_proc(p14dev->target->child, get_color_mapping_procs, p14dev->saved_target_get_color_mapping_procs); + set_dev_proc(p14dev->target->child, get_color_comp_index, p14dev->saved_target_get_color_comp_index); pgs->get_cmap_procs = p14dev->save_get_cmap_procs; gx_set_cmap_procs(pgs, p14dev->target); @@ -1593,7 +1590,7 @@ int gx_subclass_create_compositor(gx_device *dev, gx_device **pcdev, const gs_co subclass_device = p14dev->target; p14dev->target = p14dev->target->child; - code = dev->procs.create_compositor(dev, pcdev, pcte, pgs, memory, cdev); + code = dev_proc(dev, create_compositor)(dev, pcdev, pcte, pgs, memory, cdev); p14dev->target = subclass_device; @@ -1601,12 +1598,12 @@ int gx_subclass_create_compositor(gx_device *dev, gx_device **pcdev, const gs_co } break; default: - code = dev->procs.create_compositor(dev, pcdev, pcte, pgs, memory, cdev); + code = dev_proc(dev, create_compositor)(dev, pcdev, pcte, pgs, memory, cdev); break; } } else { - code = dev->procs.create_compositor(dev, pcdev, pcte, pgs, memory, cdev); + code = dev_proc(dev, create_compositor)(dev, pcdev, pcte, pgs, memory, cdev); } - dev->procs.create_compositor = gx_subclass_create_compositor; + set_dev_proc(dev, create_compositor, gx_subclass_create_compositor); return code; } diff --git a/base/gdevmpla.c b/base/gdevmpla.c index a2080db98..51e5ea65e 100644 --- a/base/gdevmpla.c +++ b/base/gdevmpla.c @@ -51,7 +51,7 @@ mem_planar_dev_spec_op(gx_device *pdev, int dev_spec_op, if (dev_spec_op == gxdso_supports_devn) { dev_proc(pdev, get_profile)(pdev, &dev_profile); if (dev_profile != NULL && dev_profile->supports_devn && - pdev->procs.fill_rectangle_hl_color == mem_planar_fill_rectangle_hl_color) + dev_proc(pdev, fill_rectangle_hl_color) == mem_planar_fill_rectangle_hl_color) return 1; } return gx_default_dev_spec_op(pdev, dev_spec_op, data, size); diff --git a/base/gdevnfwd.c b/base/gdevnfwd.c index f0be6d3ad..161fac410 100644 --- a/base/gdevnfwd.c +++ b/base/gdevnfwd.c @@ -831,11 +831,11 @@ gx_forward_dev_spec_op(gx_device * dev, int dev_spec_op, void *data, int size) so this function is unapplicable to clist. */ if (tdev == 0) { if (dev_spec_op == gxdso_pattern_shfill_doesnt_need_path) { - return (dev->procs.fill_path == gx_default_fill_path); + return (dev_proc(dev, fill_path) == gx_default_fill_path); } return_error(gs_error_undefined); } else if (dev_spec_op == gxdso_pattern_handles_clip_path) { - if (dev->procs.fill_path == gx_default_fill_path) + if (dev_proc(dev, fill_path) == gx_default_fill_path) return 0; } else if (dev_spec_op == gxdso_device_child) { gxdso_device_child_request *d = (gxdso_device_child_request *)data; diff --git a/base/gdevp14.c b/base/gdevp14.c index d502ce35f..81d02afb8 100644 --- a/base/gdevp14.c +++ b/base/gdevp14.c @@ -1887,7 +1887,7 @@ pdf14_put_image(gx_device * dev, gs_gstate * pgs, gx_device * target) can handle the image data directly. If it cannot, then we will need to use the begin_typed_image interface, which cannot pass along tag nor alpha data to the target device. */ - if (target->procs.put_image != gx_default_put_image) { + if (dev_proc(target, put_image) != gx_default_put_image) { pdf14_buf *cm_result = NULL; int alpha_offset, tag_offset; const byte *buf_ptrs[GS_CLIENT_COLOR_MAX_COMPONENTS]; @@ -3278,7 +3278,7 @@ pdf14_begin_typed_image(gx_device * dev, const gs_gstate * pgs, renderer which will end up installed for this case. Detect setting of begin_image to gx_no_begin_image. (final recursive call) */ - if (dev->procs.begin_image != gx_default_begin_image) { + if (dev_proc(dev, begin_image) != gx_default_begin_image) { code = pdf14_patt_trans_image_fill(dev, pgs, pmat, pic, prect, pdcolor, pcpath, mem, pinfo); @@ -3692,7 +3692,7 @@ pdf14_recreate_device(gs_memory_t *mem, gs_gstate * pgs, pdev->is_planar = target->is_planar; pdev->procs = dev_proto->procs; if (has_tags) { - pdev->procs.encode_color = pdf14_encode_color_tag; + set_dev_proc(pdev, encode_color, pdf14_encode_color_tag); pdev->color_info.comp_shift[pdev->color_info.num_components] = pdev->color_info.depth; pdev->color_info.depth += 8; } @@ -4277,10 +4277,8 @@ pdf14_end_transparency_group(gx_device *dev, parent_color->parent_color_comp_index == NULL)) { pgs->get_cmap_procs = parent_color->get_cmap_procs; gx_set_cmap_procs(pgs, dev); - pdev->procs.get_color_mapping_procs = - parent_color->parent_color_mapping_procs; - pdev->procs.get_color_comp_index = - parent_color->parent_color_comp_index; + set_dev_proc(pdev, get_color_mapping_procs, parent_color->parent_color_mapping_procs); + set_dev_proc(pdev, get_color_comp_index, parent_color->parent_color_comp_index); pdev->color_info.polarity = parent_color->polarity; pdev->color_info.num_components = parent_color->num_components; pdev->blend_procs = parent_color->parent_blending_procs; @@ -4477,9 +4475,9 @@ pdf14_update_device_color_procs(gx_device *dev, /* Save the old information */ parent_color_info->get_cmap_procs = pgs->get_cmap_procs; parent_color_info->parent_color_mapping_procs = - pdev->procs.get_color_mapping_procs; + dev_proc(pdev, get_color_mapping_procs); parent_color_info->parent_color_comp_index = - pdev->procs.get_color_comp_index; + dev_proc(pdev, get_color_comp_index); parent_color_info->parent_blending_procs = pdev->blend_procs; parent_color_info->polarity = pdev->color_info.polarity; parent_color_info->num_components = pdev->color_info.num_components; @@ -4488,8 +4486,8 @@ pdf14_update_device_color_procs(gx_device *dev, parent_color_info->depth = pdev->color_info.depth; parent_color_info->max_color = pdev->color_info.max_color; parent_color_info->max_gray = pdev->color_info.max_gray; - parent_color_info->encode = pdev->procs.encode_color; - parent_color_info->decode = pdev->procs.decode_color; + parent_color_info->encode = dev_proc(pdev, encode_color); + parent_color_info->decode = dev_proc(pdev, decode_color); memcpy(&(parent_color_info->comp_bits), &(pdev->color_info.comp_bits), GX_DEVICE_COLOR_MAX_COMPONENTS); memcpy(&(parent_color_info->comp_shift), &(pdev->color_info.comp_shift), @@ -4518,10 +4516,8 @@ pdf14_update_device_color_procs(gx_device *dev, } } - pdev->procs.get_color_mapping_procs = - pdevproto->static_procs->get_color_mapping_procs; - pdev->procs.get_color_comp_index = - pdevproto->static_procs->get_color_comp_index; + set_dev_proc(pdev, get_color_mapping_procs, pdevproto->static_procs->get_color_mapping_procs); + set_dev_proc(pdev, get_color_comp_index, pdevproto->static_procs->get_color_comp_index); pdev->blend_procs = pdevproto->blend_procs; pdev->color_info.polarity = new_polarity; pdev->color_info.num_components = new_num_comps; @@ -4732,8 +4728,8 @@ pdf14_update_device_color_procs_push_c(gx_device *dev, "[v]pdf14_update_device_color_procs_push_c,num_components_old = %d num_components_new = %d\n", pdev->color_info.num_components,new_num_comps); /* Set new information in the device */ - pdev->procs.get_color_mapping_procs = pdevproto->static_procs->get_color_mapping_procs; - pdev->procs.get_color_comp_index = pdevproto->static_procs->get_color_comp_index; + set_dev_proc(pdev, get_color_mapping_procs, pdevproto->static_procs->get_color_mapping_procs); + set_dev_proc(pdev, get_color_comp_index, pdevproto->static_procs->get_color_comp_index); pdev->blend_procs = pdevproto->blend_procs; pdev->color_info.polarity = new_polarity; pdev->color_info.num_components = new_num_comps; @@ -4796,8 +4792,8 @@ pdf14_update_device_color_procs_pop_c(gx_device *dev,gs_gstate *pgs) pdev->color_info.num_components,parent_color->num_components); pgs->get_cmap_procs = parent_color->get_cmap_procs; gx_set_cmap_procs(pgs, dev); - pdev->procs.get_color_mapping_procs = parent_color->parent_color_mapping_procs; - pdev->procs.get_color_comp_index = parent_color->parent_color_comp_index; + set_dev_proc(pdev, get_color_mapping_procs, parent_color->parent_color_mapping_procs); + set_dev_proc(pdev, get_color_comp_index, parent_color->parent_color_comp_index); pdev->color_info.polarity = parent_color->polarity; pdev->color_info.depth = parent_color->depth; pdev->color_info.num_components = parent_color->num_components; @@ -4805,8 +4801,8 @@ pdf14_update_device_color_procs_pop_c(gx_device *dev,gs_gstate *pgs) pdev->pdf14_procs = parent_color->unpack_procs; pdev->color_info.max_color = parent_color->max_color; pdev->color_info.max_gray = parent_color->max_gray; - pdev->procs.encode_color = parent_color->encode; - pdev->procs.decode_color = parent_color->decode; + set_dev_proc(pdev, encode_color, parent_color->encode); + set_dev_proc(pdev, decode_color, parent_color->decode); memcpy(&(pdev->color_info.comp_bits),&(parent_color->comp_bits), GX_DEVICE_COLOR_MAX_COMPONENTS); memcpy(&(pdev->color_info.comp_shift),&(parent_color->comp_shift), @@ -4866,9 +4862,9 @@ pdf14_push_parent_color(gx_device *dev, const gs_gstate *pgs) /* Initialize with values */ new_parent_color->get_cmap_procs = pgs->get_cmap_procs; new_parent_color->parent_color_mapping_procs = - pdev->procs.get_color_mapping_procs; + dev_proc(pdev, get_color_mapping_procs); new_parent_color->parent_color_comp_index = - pdev->procs.get_color_comp_index; + dev_proc(pdev, get_color_comp_index); new_parent_color->parent_blending_procs = pdev->blend_procs; new_parent_color->polarity = pdev->color_info.polarity; new_parent_color->num_components = pdev->color_info.num_components; @@ -4876,8 +4872,8 @@ pdf14_push_parent_color(gx_device *dev, const gs_gstate *pgs) new_parent_color->depth = pdev->color_info.depth; new_parent_color->max_color = pdev->color_info.max_color; new_parent_color->max_gray = pdev->color_info.max_gray; - new_parent_color->decode = pdev->procs.decode_color; - new_parent_color->encode = pdev->procs.encode_color; + new_parent_color->decode = dev_proc(pdev, decode_color); + new_parent_color->encode = dev_proc(pdev, encode_color); memcpy(&(new_parent_color->comp_bits),&(pdev->color_info.comp_bits), GX_DEVICE_COLOR_MAX_COMPONENTS); memcpy(&(new_parent_color->comp_shift),&(pdev->color_info.comp_shift), @@ -5020,8 +5016,8 @@ pdf14_end_transparency_mask(gx_device *dev, gs_gstate *pgs) parent_color->parent_color_comp_index == NULL)) { pgs->get_cmap_procs = parent_color->get_cmap_procs; gx_set_cmap_procs(pgs, dev); - pdev->procs.get_color_mapping_procs = parent_color->parent_color_mapping_procs; - pdev->procs.get_color_comp_index = parent_color->parent_color_comp_index; + set_dev_proc(pdev, get_color_mapping_procs, parent_color->parent_color_mapping_procs); + set_dev_proc(pdev, get_color_comp_index, parent_color->parent_color_comp_index); pdev->color_info.polarity = parent_color->polarity; pdev->color_info.num_components = parent_color->num_components; pdev->color_info.depth = parent_color->depth; @@ -5033,8 +5029,8 @@ pdf14_end_transparency_mask(gx_device *dev, gs_gstate *pgs) parent_color->get_cmap_procs = NULL; parent_color->parent_color_comp_index = NULL; parent_color->parent_color_mapping_procs = NULL; - pdev->procs.encode_color = parent_color->encode; - pdev->procs.decode_color = parent_color->decode; + set_dev_proc(pdev, encode_color, parent_color->encode); + set_dev_proc(pdev, decode_color, parent_color->decode); memcpy(&(pdev->color_info.comp_bits),&(parent_color->comp_bits), GX_DEVICE_COLOR_MAX_COMPONENTS); memcpy(&(pdev->color_info.comp_shift),&(parent_color->comp_shift), @@ -5723,7 +5719,7 @@ gs_pdf14_device_push(gs_memory_t *mem, gs_gstate * pgs, of colorants became large. If we need to do compressed color with tags that will be a special project at that time */ if (has_tags) { - p14dev->procs.encode_color = pdf14_encode_color_tag; + set_dev_proc(p14dev, encode_color, pdf14_encode_color_tag); p14dev->color_info.comp_shift[p14dev->color_info.num_components] = p14dev->color_info.depth; p14dev->color_info.depth += 8; } @@ -6966,7 +6962,7 @@ pdf14_create_clist_device(gs_memory_t *mem, gs_gstate * pgs, into other issues if the number of colorants became large. If we need to do compressed color with tags that will be a special project at that time */ if (has_tags) { - pdev->procs.encode_color = pdf14_encode_color_tag; + set_dev_proc(pdev, encode_color, pdf14_encode_color_tag); pdev->color_info.comp_shift[pdev->color_info.num_components] = pdev->color_info.depth; pdev->color_info.depth += 8; } @@ -6990,10 +6986,10 @@ pdf14_create_clist_device(gs_memory_t *mem, gs_gstate * pgs, rc_assign(pdev->icc_struct->device_profile[0], pgs->icc_manager->default_rgb, "pdf14_create_clist_device"); } - pdev->my_encode_color = pdev->procs.encode_color; - pdev->my_decode_color = pdev->procs.decode_color; - pdev->my_get_color_mapping_procs = pdev->procs.get_color_mapping_procs; - pdev->my_get_color_comp_index = pdev->procs.get_color_comp_index; + pdev->my_encode_color = dev_proc(pdev, encode_color); + pdev->my_decode_color = dev_proc(pdev, decode_color); + pdev->my_get_color_mapping_procs = dev_proc(pdev, get_color_mapping_procs); + pdev->my_get_color_comp_index = dev_proc(pdev, get_color_comp_index); pdev->color_info.separable_and_linear = target->color_info.separable_and_linear; *ppdev = (gx_device *) pdev; @@ -7163,22 +7159,20 @@ pdf14_clist_create_compositor(gx_device * dev, gx_device ** pcdev, /* Re-activate the PDF 1.4 compositor */ pdev->saved_target_color_info = pdev->target->color_info; pdev->target->color_info = pdev->color_info; - pdev->saved_target_encode_color = pdev->target->procs.encode_color; - pdev->saved_target_decode_color = pdev->target->procs.decode_color; - pdev->target->procs.encode_color = pdev->procs.encode_color = - pdev->my_encode_color; - pdev->target->procs.decode_color = pdev->procs.decode_color = - pdev->my_decode_color; + pdev->saved_target_encode_color = dev_proc(pdev->target, encode_color); + pdev->saved_target_decode_color = dev_proc(pdev->target, decode_color); + set_dev_proc(pdev->target, encode_color, pdev->my_encode_color); + set_dev_proc(pdev, encode_color, pdev->my_encode_color); + set_dev_proc(pdev->target, decode_color, pdev->my_decode_color); + set_dev_proc(pdev, decode_color, pdev->my_decode_color); pdev->saved_target_get_color_mapping_procs = - pdev->target->procs.get_color_mapping_procs; + dev_proc(pdev->target, get_color_mapping_procs); pdev->saved_target_get_color_comp_index = - pdev->target->procs.get_color_comp_index; - pdev->target->procs.get_color_mapping_procs = - pdev->procs.get_color_mapping_procs = - pdev->my_get_color_mapping_procs; - pdev->target->procs.get_color_comp_index = - pdev->procs.get_color_comp_index = - pdev->my_get_color_comp_index; + dev_proc(pdev->target, get_color_comp_index); + set_dev_proc(pdev->target, get_color_mapping_procs, pdev->my_get_color_mapping_procs); + set_dev_proc(pdev, get_color_mapping_procs, pdev->my_get_color_mapping_procs); + set_dev_proc(pdev->target, get_color_comp_index, pdev->my_get_color_comp_index); + set_dev_proc(pdev, get_color_comp_index, pdev->my_get_color_comp_index); pdev->save_get_cmap_procs = pgs->get_cmap_procs; pgs->get_cmap_procs = pdf14_get_cmap_procs; gx_set_cmap_procs(pgs, dev); @@ -7209,14 +7203,10 @@ pdf14_clist_create_compositor(gx_device * dev, gx_device ** pcdev, pdf14_decrement_smask_color(pgs, dev); /* Restore the color_info for the clist device */ pdev->target->color_info = pdev->saved_target_color_info; - pdev->target->procs.encode_color = - pdev->saved_target_encode_color; - pdev->target->procs.decode_color = - pdev->saved_target_decode_color; - pdev->target->procs.get_color_mapping_procs = - pdev->saved_target_get_color_mapping_procs; - pdev->target->procs.get_color_comp_index = - pdev->saved_target_get_color_comp_index; + set_dev_proc(pdev->target, encode_color, pdev->saved_target_encode_color); + set_dev_proc(pdev->target, decode_color, pdev->saved_target_decode_color); + set_dev_proc(pdev->target, get_color_mapping_procs, pdev->saved_target_get_color_mapping_procs); + set_dev_proc(pdev->target, get_color_comp_index, pdev->saved_target_get_color_comp_index); pgs->get_cmap_procs = pdev->save_get_cmap_procs; gx_set_cmap_procs(pgs, pdev->target); gx_device_decache_colors(pdev->target); @@ -7775,7 +7765,7 @@ pdf14_clist_begin_typed_image(gx_device * dev, const gs_gstate * pgs, if (pim->ImageMask) { if (pdcolor != NULL && gx_dc_is_pattern1_color(pdcolor)) { if( gx_pattern1_get_transptr(pdcolor) != NULL){ - if (dev->procs.begin_image != pdf14_clist_begin_image) { + if (dev_proc(dev, begin_image) != pdf14_clist_begin_image) { ptile = pdcolor->colors.pattern.p_tile; /* Set up things in the ptile so that we get the proper blending etc */ @@ -7894,22 +7884,20 @@ gs_pdf14_clist_device_push(gs_memory_t *mem, gs_gstate *pgs, gx_device **pcdev, cdev->clist_color_info.max_color = p14dev->color_info.max_color; cdev->clist_color_info.max_gray = p14dev->color_info.max_gray; - p14dev->saved_target_encode_color = dev->procs.encode_color; - p14dev->saved_target_decode_color = dev->procs.decode_color; - dev->procs.encode_color = p14dev->procs.encode_color = - p14dev->my_encode_color; - dev->procs.decode_color = p14dev->procs.decode_color = - p14dev->my_decode_color; + p14dev->saved_target_encode_color = dev_proc(dev, encode_color); + p14dev->saved_target_decode_color = dev_proc(dev, decode_color); + set_dev_proc(dev, encode_color, p14dev->my_encode_color); + set_dev_proc(p14dev, encode_color, p14dev->my_encode_color); + set_dev_proc(dev, decode_color, p14dev->my_decode_color); + set_dev_proc(p14dev, decode_color, p14dev->my_decode_color); p14dev->saved_target_get_color_mapping_procs = - dev->procs.get_color_mapping_procs; + dev_proc(dev, get_color_mapping_procs); p14dev->saved_target_get_color_comp_index = - dev->procs.get_color_comp_index; - dev->procs.get_color_mapping_procs = - p14dev->procs.get_color_mapping_procs = - p14dev->my_get_color_mapping_procs; - dev->procs.get_color_comp_index = - p14dev->procs.get_color_comp_index = - p14dev->my_get_color_comp_index; + dev_proc(dev, get_color_comp_index); + set_dev_proc(dev, get_color_mapping_procs, p14dev->my_get_color_mapping_procs); + set_dev_proc(p14dev, get_color_mapping_procs, p14dev->my_get_color_mapping_procs); + set_dev_proc(dev, get_color_comp_index, p14dev->my_get_color_comp_index); + set_dev_proc(p14dev, get_color_comp_index, p14dev->my_get_color_comp_index); p14dev->save_get_cmap_procs = pgs->get_cmap_procs; pgs->get_cmap_procs = pdf14_get_cmap_procs; gx_set_cmap_procs(pgs, dev); diff --git a/base/gdevprn.c b/base/gdevprn.c index 7250fdfb4..005d30d70 100644 --- a/base/gdevprn.c +++ b/base/gdevprn.c @@ -102,11 +102,11 @@ gdev_prn_open(gx_device * pdev) code = gdev_prn_allocate_memory(pdev, NULL, 0, 0); if (update_procs) { if (pdev->ObjectHandlerPushed) { - gx_copy_device_procs(&pdev->parent->procs, &pdev->procs, (gx_device_procs *)&gs_obj_filter_device.procs); + gx_copy_device_procs(pdev->parent, pdev, &gs_obj_filter_device); pdev = pdev->parent; } if (pdev->PageHandlerPushed) - gx_copy_device_procs(&pdev->parent->procs, &pdev->procs, (gx_device_procs *)&gs_flp_device.procs); + gx_copy_device_procs(pdev->parent, pdev, &gs_flp_device); } if (code < 0) return code; @@ -1124,7 +1124,8 @@ gdev_prn_output_page_aux(gx_device * pdev, int num_copies, int flush, bool seeka if (endcode < 0) return endcode; endcode = gx_finish_output_page(pdev, num_copies, flush); - return (endcode < 0 ? endcode : 0); + code = (endcode < 0 ? endcode : closecode < 0 ? closecode : 0); + return code; } int diff --git a/base/gdevsclass.c b/base/gdevsclass.c index c804aa6ed..9c9327dda 100644 --- a/base/gdevsclass.c +++ b/base/gdevsclass.c @@ -100,7 +100,7 @@ int default_subclass_open_device(gx_device *dev) { if (dev->child) { - dev->child->procs.open_device(dev->child); + dev_proc(dev->child, open_device)(dev->child); dev->child->is_open = true; gx_update_from_subclass(dev); } @@ -111,7 +111,7 @@ int default_subclass_open_device(gx_device *dev) void default_subclass_get_initial_matrix(gx_device *dev, gs_matrix *pmat) { if (dev->child) - dev->child->procs.get_initial_matrix(dev->child, pmat); + dev_proc(dev->child, get_initial_matrix)(dev->child, pmat); else gx_default_get_initial_matrix(dev, pmat); return; @@ -120,7 +120,7 @@ void default_subclass_get_initial_matrix(gx_device *dev, gs_matrix *pmat) int default_subclass_sync_output(gx_device *dev) { if (dev->child) - return dev->child->procs.sync_output(dev->child); + return dev_proc(dev->child, sync_output)(dev->child); else gx_default_sync_output(dev); @@ -130,7 +130,7 @@ int default_subclass_sync_output(gx_device *dev) int default_subclass_output_page(gx_device *dev, int num_copies, int flush) { if (dev->child) - return dev->child->procs.output_page(dev->child, num_copies, flush); + return dev_proc(dev->child, output_page)(dev->child, num_copies, flush); return 0; } @@ -139,7 +139,7 @@ int default_subclass_close_device(gx_device *dev) int code; if (dev->child) { - code = dev->child->procs.close_device(dev->child); + code = dev_proc(dev->child, close_device)(dev->child); dev->is_open = dev->child->is_open = false; return code; } @@ -151,7 +151,7 @@ int default_subclass_close_device(gx_device *dev) gx_color_index default_subclass_map_rgb_color(gx_device *dev, const gx_color_value cv[]) { if (dev->child) - return dev->child->procs.map_rgb_color(dev->child, cv); + return dev_proc(dev->child, map_rgb_color)(dev->child, cv); else gx_error_encode_color(dev, cv); return 0; @@ -160,7 +160,7 @@ gx_color_index default_subclass_map_rgb_color(gx_device *dev, const gx_color_val int default_subclass_map_color_rgb(gx_device *dev, gx_color_index color, gx_color_value rgb[3]) { if (dev->child) - return dev->child->procs.map_color_rgb(dev->child, color, rgb); + return dev_proc(dev->child, map_color_rgb)(dev->child, color, rgb); else gx_default_map_color_rgb(dev, color, rgb); @@ -170,7 +170,7 @@ int default_subclass_map_color_rgb(gx_device *dev, gx_color_index color, gx_colo int default_subclass_fill_rectangle(gx_device *dev, int x, int y, int width, int height, gx_color_index color) { if (dev->child) - return dev->child->procs.fill_rectangle(dev->child, x, y, width, height, color); + return dev_proc(dev->child, fill_rectangle)(dev->child, x, y, width, height, color); return 0; } @@ -179,7 +179,7 @@ int default_subclass_tile_rectangle(gx_device *dev, const gx_tile_bitmap *tile, int phase_x, int phase_y) { if (dev->child) - return dev->child->procs.tile_rectangle(dev->child, tile, x, y, width, height, color0, color1, phase_x, phase_y); + return dev_proc(dev->child, tile_rectangle)(dev->child, tile, x, y, width, height, color0, color1, phase_x, phase_y); return 0; } @@ -188,7 +188,7 @@ int default_subclass_copy_mono(gx_device *dev, const byte *data, int data_x, int gx_color_index color0, gx_color_index color1) { if (dev->child) - return dev->child->procs.copy_mono(dev->child, data, data_x, raster, id, x, y, width, height, color0, color1); + return dev_proc(dev->child, copy_mono)(dev->child, data, data_x, raster, id, x, y, width, height, color0, color1); return 0; } @@ -196,21 +196,21 @@ int default_subclass_copy_color(gx_device *dev, const byte *data, int data_x, in int x, int y, int width, int height) { if (dev->child) - return dev->child->procs.copy_color(dev->child, data, data_x, raster, id, x, y, width, height); + return dev_proc(dev->child, copy_color)(dev->child, data, data_x, raster, id, x, y, width, height); return 0; } int default_subclass_draw_line(gx_device *dev, int x0, int y0, int x1, int y1, gx_color_index color) { if (dev->child) - return dev->child->procs.obsolete_draw_line(dev->child, x0, y0, x1, y1, color); + return dev_proc(dev->child, obsolete_draw_line)(dev->child, x0, y0, x1, y1, color); return 0; } int default_subclass_get_bits(gx_device *dev, int y, byte *data, byte **actual_data) { if (dev->child) - return dev->child->procs.get_bits(dev->child, y, data, actual_data); + return dev_proc(dev->child, get_bits)(dev->child, y, data, actual_data); else return gx_default_get_bits(dev, y, data, actual_data); return 0; @@ -219,7 +219,7 @@ int default_subclass_get_bits(gx_device *dev, int y, byte *data, byte **actual_d int default_subclass_get_params(gx_device *dev, gs_param_list *plist) { if (dev->child) - return dev->child->procs.get_params(dev->child, plist); + return dev_proc(dev->child, get_params)(dev->child, plist); else return gx_default_get_params(dev, plist); @@ -231,7 +231,7 @@ int default_subclass_put_params(gx_device *dev, gs_param_list *plist) int code; if (dev->child) { - code = dev->child->procs.put_params(dev->child, plist); + code = dev_proc(dev->child, put_params)(dev->child, plist); /* The child device might have closed itself (yes seriously, this can happen!) */ dev->is_open = dev->child->is_open; gx_update_from_subclass(dev); @@ -246,7 +246,7 @@ int default_subclass_put_params(gx_device *dev, gs_param_list *plist) gx_color_index default_subclass_map_cmyk_color(gx_device *dev, const gx_color_value cv[]) { if (dev->child) - return dev->child->procs.map_cmyk_color(dev->child, cv); + return dev_proc(dev->child, map_cmyk_color)(dev->child, cv); else return gx_default_map_cmyk_color(dev, cv); @@ -256,7 +256,7 @@ gx_color_index default_subclass_map_cmyk_color(gx_device *dev, const gx_color_va const gx_xfont_procs *default_subclass_get_xfont_procs(gx_device *dev) { if (dev->child) - return dev->child->procs.get_xfont_procs(dev->child); + return dev_proc(dev->child, get_xfont_procs)(dev->child); else return gx_default_get_xfont_procs(dev); @@ -266,7 +266,7 @@ const gx_xfont_procs *default_subclass_get_xfont_procs(gx_device *dev) gx_device *default_subclass_get_xfont_device(gx_device *dev) { if (dev->child) - return dev->child->procs.get_xfont_device(dev->child); + return dev_proc(dev->child, get_xfont_device)(dev->child); else return gx_default_get_xfont_device(dev); @@ -277,7 +277,7 @@ gx_color_index default_subclass_map_rgb_alpha_color(gx_device *dev, gx_color_val gx_color_value alpha) { if (dev->child) { - return dev->child->procs.map_rgb_alpha_color(dev->child, red, green, blue, alpha); + return dev_proc(dev->child, map_rgb_alpha_color)(dev->child, red, green, blue, alpha); } else return gx_default_map_rgb_alpha_color(dev, red, green, blue, alpha); @@ -287,7 +287,7 @@ gx_color_index default_subclass_map_rgb_alpha_color(gx_device *dev, gx_color_val gx_device *default_subclass_get_page_device(gx_device *dev) { if (dev->child) - return dev->child->procs.get_page_device(dev->child); + return dev_proc(dev->child, get_page_device)(dev->child); else return gx_default_get_page_device(dev); @@ -297,7 +297,7 @@ gx_device *default_subclass_get_page_device(gx_device *dev) int default_subclass_get_alpha_bits(gx_device *dev, graphics_object_type type) { if (dev->child) - return dev->child->procs.get_alpha_bits(dev->child, type); + return dev_proc(dev->child, get_alpha_bits)(dev->child, type); return 0; } @@ -306,14 +306,14 @@ int default_subclass_copy_alpha(gx_device *dev, const byte *data, int data_x, gx_color_index color, int depth) { if (dev->child) - return dev->child->procs.copy_alpha(dev->child, data, data_x, raster, id, x, y, width, height, color, depth); + return dev_proc(dev->child, copy_alpha)(dev->child, data, data_x, raster, id, x, y, width, height, color, depth); return 0; } int default_subclass_get_band(gx_device *dev, int y, int *band_start) { if (dev->child) - return dev->child->procs.get_band(dev->child, y, band_start); + return dev_proc(dev->child, get_band)(dev->child, y, band_start); else return gx_default_get_band(dev, y, band_start); return 0; @@ -326,7 +326,7 @@ int default_subclass_copy_rop(gx_device *dev, const byte *sdata, int sourcex, ui int phase_x, int phase_y, gs_logical_operation_t lop) { if (dev->child) { - return dev->child->procs.copy_rop(dev->child, sdata, sourcex, sraster, id, scolors, texture, tcolors, x, y, width, height, phase_x, phase_y, lop); + return dev_proc(dev->child, copy_rop)(dev->child, sdata, sourcex, sraster, id, scolors, texture, tcolors, x, y, width, height, phase_x, phase_y, lop); } else return gx_default_copy_rop(dev, sdata, sourcex, sraster, id, scolors, texture, tcolors, x, y, width, height, phase_x, phase_y, lop); return 0; @@ -337,7 +337,7 @@ int default_subclass_fill_path(gx_device *dev, const gs_gstate *pgs, gx_path *pp const gx_drawing_color *pdcolor, const gx_clip_path *pcpath) { if (dev->child) { - return dev->child->procs.fill_path(dev->child, pgs, ppath, params, pdcolor, pcpath); + return dev_proc(dev->child, fill_path)(dev->child, pgs, ppath, params, pdcolor, pcpath); } else return gx_default_fill_path(dev, pgs, ppath, params, pdcolor, pcpath); @@ -349,7 +349,7 @@ int default_subclass_stroke_path(gx_device *dev, const gs_gstate *pgs, gx_path * const gx_drawing_color *pdcolor, const gx_clip_path *pcpath) { if (dev->child) { - return dev->child->procs.stroke_path(dev->child, pgs, ppath, params, pdcolor, pcpath); + return dev_proc(dev->child, stroke_path)(dev->child, pgs, ppath, params, pdcolor, pcpath); } else return gx_default_stroke_path(dev, pgs, ppath, params, pdcolor, pcpath); return 0; @@ -361,7 +361,7 @@ int default_subclass_fill_mask(gx_device *dev, const byte *data, int data_x, int gs_logical_operation_t lop, const gx_clip_path *pcpath) { if (dev->child) { - return dev->child->procs.fill_mask(dev->child, data, data_x, raster, id, x, y, width, height, pdcolor, depth, lop, pcpath); + return dev_proc(dev->child, fill_mask)(dev->child, data, data_x, raster, id, x, y, width, height, pdcolor, depth, lop, pcpath); } else return gx_default_fill_mask(dev, data, data_x, raster, id, x, y, width, height, pdcolor, depth, lop, pcpath); return 0; @@ -372,7 +372,7 @@ int default_subclass_fill_trapezoid(gx_device *dev, const gs_fixed_edge *left, c const gx_drawing_color *pdcolor, gs_logical_operation_t lop) { if (dev->child) { - return dev->child->procs.fill_trapezoid(dev->child, left, right, ybot, ytop, swap_axes, pdcolor, lop); + return dev_proc(dev->child, fill_trapezoid)(dev->child, left, right, ybot, ytop, swap_axes, pdcolor, lop); } else return gx_default_fill_trapezoid(dev, left, right, ybot, ytop, swap_axes, pdcolor, lop); return 0; @@ -382,7 +382,7 @@ int default_subclass_fill_parallelogram(gx_device *dev, fixed px, fixed py, fixe const gx_drawing_color *pdcolor, gs_logical_operation_t lop) { if (dev->child) { - return dev->child->procs.fill_parallelogram(dev->child, px, py, ax, ay, bx, by, pdcolor, lop); + return dev_proc(dev->child, fill_parallelogram)(dev->child, px, py, ax, ay, bx, by, pdcolor, lop); } else return gx_default_fill_parallelogram(dev, px, py, ax, ay, bx, by, pdcolor, lop); return 0; @@ -392,7 +392,7 @@ int default_subclass_fill_triangle(gx_device *dev, fixed px, fixed py, fixed ax, const gx_drawing_color *pdcolor, gs_logical_operation_t lop) { if (dev->child) { - return dev->child->procs.fill_triangle(dev->child, px, py, ax, ay, bx, by, pdcolor, lop); + return dev_proc(dev->child, fill_triangle)(dev->child, px, py, ax, ay, bx, by, pdcolor, lop); } else return gx_default_fill_triangle(dev, px, py, ax, ay, bx, by, pdcolor, lop); return 0; @@ -403,7 +403,7 @@ int default_subclass_draw_thin_line(gx_device *dev, fixed fx0, fixed fy0, fixed fixed adjustx, fixed adjusty) { if (dev->child) { - return dev->child->procs.draw_thin_line(dev->child, fx0, fy0, fx1, fy1, pdcolor, lop, adjustx, adjusty); + return dev_proc(dev->child, draw_thin_line)(dev->child, fx0, fy0, fx1, fy1, pdcolor, lop, adjustx, adjusty); } else return gx_default_draw_thin_line(dev, fx0, fy0, fx1, fy1, pdcolor, lop, adjustx, adjusty); return 0; @@ -415,7 +415,7 @@ int default_subclass_begin_image(gx_device *dev, const gs_gstate *pgs, const gs_ gs_memory_t *memory, gx_image_enum_common_t **pinfo) { if (dev->child) { - return dev->child->procs.begin_image(dev->child, pgs, pim, format, prect, pdcolor, pcpath, memory, pinfo); + return dev_proc(dev->child, begin_image)(dev->child, pgs, pim, format, prect, pdcolor, pcpath, memory, pinfo); } else return gx_default_begin_image(dev, pgs, pim, format, prect, pdcolor, pcpath, memory, pinfo); @@ -426,14 +426,14 @@ int default_subclass_image_data(gx_device *dev, gx_image_enum_common_t *info, co uint raster, int height) { if (dev->child) - return dev->child->procs.image_data(dev->child, info, planes, data_x, raster, height); + 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->child->procs.end_image(dev->child, info, draw_last); + return dev_proc(dev->child, end_image)(dev->child, info, draw_last); return 0; } @@ -442,7 +442,7 @@ int default_subclass_strip_tile_rectangle(gx_device *dev, const gx_strip_bitmap int phase_x, int phase_y) { if (dev->child) { - return dev->child->procs.strip_tile_rectangle(dev->child, tiles, x, y, width, height, color0, color1, phase_x, phase_y); + return dev_proc(dev->child, strip_tile_rectangle)(dev->child, tiles, x, y, width, height, color0, color1, phase_x, phase_y); } else return gx_default_strip_tile_rectangle(dev, tiles, x, y, width, height, color0, color1, phase_x, phase_y); return 0; @@ -455,7 +455,7 @@ int default_subclass_strip_copy_rop(gx_device *dev, const byte *sdata, int sourc int phase_x, int phase_y, gs_logical_operation_t lop) { if (dev->child) { - return dev->child->procs.strip_copy_rop(dev->child, sdata, sourcex, sraster, id, scolors, textures, tcolors, x, y, width, height, phase_x, phase_y, lop); + return dev_proc(dev->child, strip_copy_rop)(dev->child, sdata, sourcex, sraster, id, scolors, textures, tcolors, x, y, width, height, phase_x, phase_y, lop); } else return gx_default_strip_copy_rop(dev, sdata, sourcex, sraster, id, scolors, textures, tcolors, x, y, width, height, phase_x, phase_y, lop); return 0; @@ -464,7 +464,7 @@ int default_subclass_strip_copy_rop(gx_device *dev, const byte *sdata, int sourc void default_subclass_get_clipping_box(gx_device *dev, gs_fixed_rect *pbox) { if (dev->child) { - dev->child->procs.get_clipping_box(dev->child, pbox); + dev_proc(dev->child, get_clipping_box)(dev->child, pbox); } else gx_default_get_clipping_box(dev, pbox); @@ -477,7 +477,7 @@ int default_subclass_begin_typed_image(gx_device *dev, const gs_gstate *pgs, con gs_memory_t *memory, gx_image_enum_common_t **pinfo) { if (dev->child) { - return dev->child->procs.begin_typed_image(dev->child, pgs, pmat, pic, prect, pdcolor, pcpath, memory, pinfo); + return dev_proc(dev->child, begin_typed_image)(dev->child, pgs, pmat, pic, prect, pdcolor, pcpath, memory, pinfo); } else return gx_default_begin_typed_image(dev, pgs, pmat, pic, prect, pdcolor, pcpath, memory, pinfo); return 0; @@ -487,7 +487,7 @@ int default_subclass_get_bits_rectangle(gx_device *dev, const gs_int_rect *prect gs_get_bits_params_t *params, gs_int_rect **unread) { if (dev->child) { - return dev->child->procs.get_bits_rectangle(dev->child, prect, params, unread); + return dev_proc(dev->child, get_bits_rectangle)(dev->child, prect, params, unread); } else return gx_default_get_bits_rectangle(dev, prect, params, unread); @@ -497,7 +497,7 @@ int default_subclass_get_bits_rectangle(gx_device *dev, const gs_int_rect *prect int default_subclass_map_color_rgb_alpha(gx_device *dev, gx_color_index color, gx_color_value rgba[4]) { if (dev->child) { - return dev->child->procs.map_color_rgb_alpha(dev->child, color, rgba); + return dev_proc(dev->child, map_color_rgb_alpha)(dev->child, color, rgba); } else return gx_default_map_color_rgb_alpha(dev, color, rgba); @@ -515,7 +515,7 @@ int default_subclass_create_compositor(gx_device *dev, gx_device **pcdev, const * that we pass to access its own data (not unreasonably), so we need to make sure we pass in the * child device. This has some follow on implications detailed below. */ - code = dev->child->procs.create_compositor(dev->child, pcdev, pcte, pgs, memory, cdev); + code = dev_proc(dev->child, create_compositor)(dev->child, pcdev, pcte, pgs, memory, cdev); if (code < 0) return code; @@ -566,7 +566,7 @@ int default_subclass_create_compositor(gx_device *dev, gx_device **pcdev, const int default_subclass_get_hardware_params(gx_device *dev, gs_param_list *plist) { if (dev->child) { - return dev->child->procs.get_hardware_params(dev->child, plist); + return dev_proc(dev->child, get_hardware_params)(dev->child, plist); } else return gx_default_get_hardware_params(dev, plist); @@ -578,7 +578,7 @@ int default_subclass_text_begin(gx_device *dev, gs_gstate *pgs, const gs_text_pa gs_memory_t *memory, gs_text_enum_t **ppte) { if (dev->child) { - return dev->child->procs.text_begin(dev->child, pgs, text, font, path, pdcolor, pcpath, memory, ppte); + return dev_proc(dev->child, text_begin)(dev->child, pgs, text, font, path, pdcolor, pcpath, memory, ppte); } else return gx_default_text_begin(dev, pgs, text, font, path, pdcolor, pcpath, memory, ppte); @@ -598,7 +598,7 @@ int default_subclass_begin_transparency_group(gx_device *dev, const gs_transpare const gs_rect *pbbox, gs_gstate *pgs, gs_memory_t *mem) { if (dev->child) - return dev->child->procs.begin_transparency_group(dev->child, ptgp, pbbox, pgs, mem); + return dev_proc(dev->child, begin_transparency_group)(dev->child, ptgp, pbbox, pgs, mem); return 0; } @@ -606,7 +606,7 @@ int default_subclass_begin_transparency_group(gx_device *dev, const gs_transpare int default_subclass_end_transparency_group(gx_device *dev, gs_gstate *pgs) { if (dev->child) - return dev->child->procs.end_transparency_group(dev->child, pgs); + return dev_proc(dev->child, end_transparency_group)(dev->child, pgs); return 0; } @@ -615,7 +615,7 @@ int default_subclass_begin_transparency_mask(gx_device *dev, const gx_transparen const gs_rect *pbbox, gs_gstate *pgs, gs_memory_t *mem) { if (dev->child) - return dev->child->procs.begin_transparency_mask(dev->child, ptmp, pbbox, pgs, mem); + return dev_proc(dev->child, begin_transparency_mask)(dev->child, ptmp, pbbox, pgs, mem); return 0; } @@ -623,14 +623,14 @@ int default_subclass_begin_transparency_mask(gx_device *dev, const gx_transparen int default_subclass_end_transparency_mask(gx_device *dev, gs_gstate *pgs) { if (dev->child) - return dev->child->procs.end_transparency_mask(dev->child, pgs); + return dev_proc(dev->child, end_transparency_mask)(dev->child, pgs); return 0; } int default_subclass_discard_transparency_layer(gx_device *dev, gs_gstate *pgs) { if (dev->child) - return dev->child->procs.discard_transparency_layer(dev->child, pgs); + return dev_proc(dev->child, discard_transparency_layer)(dev->child, pgs); return 0; } @@ -638,7 +638,7 @@ int default_subclass_discard_transparency_layer(gx_device *dev, gs_gstate *pgs) const gx_cm_color_map_procs *default_subclass_get_color_mapping_procs(const gx_device *dev) { if (dev->child) { - return dev->child->procs.get_color_mapping_procs(dev->child); + return dev_proc(dev->child, get_color_mapping_procs)(dev->child); } else return gx_default_DevGray_get_color_mapping_procs(dev); @@ -648,7 +648,7 @@ const gx_cm_color_map_procs *default_subclass_get_color_mapping_procs(const gx_d int default_subclass_get_color_comp_index(gx_device *dev, const char * pname, int name_size, int component_type) { if (dev->child) { - return dev->child->procs.get_color_comp_index(dev->child, pname, name_size, component_type); + return dev_proc(dev->child, get_color_comp_index)(dev->child, pname, name_size, component_type); } else return gx_error_get_color_comp_index(dev, pname, name_size, component_type); @@ -658,7 +658,7 @@ int default_subclass_get_color_comp_index(gx_device *dev, const char * pname, i gx_color_index default_subclass_encode_color(gx_device *dev, const gx_color_value colors[]) { if (dev->child) { - return dev->child->procs.encode_color(dev->child, colors); + return dev_proc(dev->child, encode_color)(dev->child, colors); } else return gx_error_encode_color(dev, colors); @@ -668,7 +668,7 @@ gx_color_index default_subclass_encode_color(gx_device *dev, const gx_color_valu int default_subclass_decode_color(gx_device *dev, gx_color_index cindex, gx_color_value colors[]) { if (dev->child) - return dev->child->procs.decode_color(dev->child, cindex, colors); + return dev_proc(dev->child, decode_color)(dev->child, cindex, colors); else { memset(colors, 0, sizeof(gx_color_value[GX_DEVICE_COLOR_MAX_COMPONENTS])); } @@ -680,7 +680,7 @@ int default_subclass_pattern_manage(gx_device *dev, gx_bitmap_id id, gs_pattern1_instance_t *pinst, pattern_manage_t function) { if (dev->child) - return dev->child->procs.pattern_manage(dev->child, id, pinst, function); + return dev_proc(dev->child, pattern_manage)(dev->child, id, pinst, function); return 0; } @@ -689,7 +689,7 @@ int default_subclass_fill_rectangle_hl_color(gx_device *dev, const gs_fixed_rect const gs_gstate *pgs, const gx_drawing_color *pdcolor, const gx_clip_path *pcpath) { if (dev->child) - return dev->child->procs.fill_rectangle_hl_color(dev->child, rect, pgs, pdcolor, pcpath); + return dev_proc(dev->child, fill_rectangle_hl_color)(dev->child, rect, pgs, pdcolor, pcpath); else return_error(gs_error_rangecheck); @@ -699,7 +699,7 @@ int default_subclass_fill_rectangle_hl_color(gx_device *dev, const gs_fixed_rect int default_subclass_include_color_space(gx_device *dev, gs_color_space *cspace, const byte *res_name, int name_length) { if (dev->child) - return dev->child->procs.include_color_space(dev->child, cspace, res_name, name_length); + return dev_proc(dev->child, include_color_space)(dev->child, cspace, res_name, name_length); return 0; } @@ -709,7 +709,7 @@ int default_subclass_fill_linear_color_scanline(gx_device *dev, const gs_fill_at int32_t cg_den) { if (dev->child) { - return dev->child->procs.fill_linear_color_scanline(dev->child, fa, i, j, w, c0, c0_f, cg_num, cg_den); + return dev_proc(dev->child, fill_linear_color_scanline)(dev->child, fa, i, j, w, c0, c0_f, cg_num, cg_den); } else return gx_default_fill_linear_color_scanline(dev, fa, i, j, w, c0, c0_f, cg_num, cg_den); @@ -723,7 +723,7 @@ int default_subclass_fill_linear_color_trapezoid(gx_device *dev, const gs_fill_a const frac31 *c2, const frac31 *c3) { if (dev->child) { - return dev->child->procs.fill_linear_color_trapezoid(dev->child, fa, p0, p1, p2, p3, c0, c1, c2, c3); + return dev_proc(dev->child, fill_linear_color_trapezoid)(dev->child, fa, p0, p1, p2, p3, c0, c1, c2, c3); } else return gx_default_fill_linear_color_trapezoid(dev, fa, p0, p1, p2, p3, c0, c1, c2, c3); @@ -735,7 +735,7 @@ int default_subclass_fill_linear_color_triangle(gx_device *dev, const gs_fill_at const gs_fixed_point *p2, const frac31 *c0, const frac31 *c1, const frac31 *c2) { if (dev->child) { - return dev->child->procs.fill_linear_color_triangle(dev->child, fa, p0, p1, p2, c0, c1, c2); + return dev_proc(dev->child, fill_linear_color_triangle)(dev->child, fa, p0, p1, p2, c0, c1, c2); } else return gx_default_fill_linear_color_triangle(dev, fa, p0, p1, p2, c0, c1, c2); @@ -745,7 +745,7 @@ int default_subclass_fill_linear_color_triangle(gx_device *dev, const gs_fill_at int default_subclass_update_spot_equivalent_colors(gx_device *dev, const gs_gstate * pgs) { if (dev->child) - return dev->child->procs.update_spot_equivalent_colors(dev->child, pgs); + return dev_proc(dev->child, update_spot_equivalent_colors)(dev->child, pgs); return 0; } @@ -753,7 +753,7 @@ int default_subclass_update_spot_equivalent_colors(gx_device *dev, const gs_gsta gs_devn_params *default_subclass_ret_devn_params(gx_device *dev) { if (dev->child) - return dev->child->procs.ret_devn_params(dev->child); + return dev_proc(dev->child, ret_devn_params)(dev->child); return 0; } @@ -761,7 +761,7 @@ gs_devn_params *default_subclass_ret_devn_params(gx_device *dev) int default_subclass_fillpage(gx_device *dev, gs_gstate * pgs, gx_device_color *pdevc) { if (dev->child) { - return dev->child->procs.fillpage(dev->child, pgs, pdevc); + return dev_proc(dev->child, fillpage)(dev->child, pgs, pdevc); } else return gx_default_fillpage(dev, pgs, pdevc); @@ -771,7 +771,7 @@ int default_subclass_fillpage(gx_device *dev, gs_gstate * pgs, gx_device_color * int default_subclass_push_transparency_state(gx_device *dev, gs_gstate *pgs) { if (dev->child) - return dev->child->procs.push_transparency_state(dev->child, pgs); + return dev_proc(dev->child, push_transparency_state)(dev->child, pgs); return 0; } @@ -779,7 +779,7 @@ int default_subclass_push_transparency_state(gx_device *dev, gs_gstate *pgs) int default_subclass_pop_transparency_state(gx_device *dev, gs_gstate *pgs) { if (dev->child) - return dev->child->procs.pop_transparency_state(dev->child, pgs); + return dev_proc(dev->child, pop_transparency_state)(dev->child, pgs); return 0; } @@ -789,7 +789,7 @@ int default_subclass_put_image(gx_device *dev, const byte **buffers, int num_cha int alpha_plane_index, int tag_plane_index) { if (dev->child) - return dev->child->procs.put_image(dev->child, buffers, num_chan, x, y, width, height, row_stride, alpha_plane_index, tag_plane_index); + return dev_proc(dev->child, put_image)(dev->child, buffers, num_chan, x, y, width, height, row_stride, alpha_plane_index, tag_plane_index); return 0; } @@ -797,7 +797,7 @@ int default_subclass_put_image(gx_device *dev, const byte **buffers, int num_cha int default_subclass_dev_spec_op(gx_device *dev, int op, void *data, int datasize) { if (dev->child) - return dev->child->procs.dev_spec_op(dev->child, op, data, datasize); + return dev_proc(dev->child, dev_spec_op)(dev->child, op, data, datasize); return 0; } @@ -806,7 +806,7 @@ int default_subclass_copy_planes(gx_device *dev, const byte *data, int data_x, i int x, int y, int width, int height, int plane_height) { if (dev->child) - return dev->child->procs.copy_planes(dev->child, data, data_x, raster, id, x, y, width, height, plane_height); + return dev_proc(dev->child, copy_planes)(dev->child, data, data_x, raster, id, x, y, width, height, plane_height); return 0; } @@ -814,7 +814,7 @@ int default_subclass_copy_planes(gx_device *dev, const byte *data, int data_x, i int default_subclass_get_profile(gx_device *dev, cmm_dev_profile_t **dev_profile) { if (dev->child) { - return dev->child->procs.get_profile(dev->child, dev_profile); + return dev_proc(dev->child, get_profile)(dev->child, dev_profile); } else { return gx_default_get_profile(dev, dev_profile); @@ -841,7 +841,7 @@ void default_subclass_set_graphics_type_tag(gx_device *dev, gs_graphics_type_tag dev->graphics_type_tag = (dev->graphics_type_tag & GS_DEVICE_ENCODES_TAGS) | tag; if (dev->child) - dev->child->procs.set_graphics_type_tag(dev->child, tag); + dev_proc(dev->child, set_graphics_type_tag)(dev->child, tag); return; } @@ -853,14 +853,14 @@ int default_subclass_strip_copy_rop2(gx_device *dev, const byte *sdata, int sour if (!dev->child) return 0; - return dev->child->procs.strip_copy_rop2(dev->child, sdata, sourcex, sraster, id, scolors, textures, tcolors, x, y, width, height, phase_x, phase_y, lop, planar_height); + return dev_proc(dev->child, strip_copy_rop2)(dev->child, sdata, sourcex, sraster, id, scolors, textures, tcolors, x, y, width, height, phase_x, phase_y, lop, planar_height); } int default_subclass_strip_tile_rect_devn(gx_device *dev, const gx_strip_bitmap *tiles, int x, int y, int width, int height, const gx_drawing_color *pdcolor0, const gx_drawing_color *pdcolor1, int phase_x, int phase_y) { if (dev->child) - return dev->child->procs.strip_tile_rect_devn(dev->child, tiles, x, y, width, height, pdcolor0, pdcolor1, phase_x, phase_y); + return dev_proc(dev->child, strip_tile_rect_devn)(dev->child, tiles, x, y, width, height, pdcolor0, pdcolor1, phase_x, phase_y); else return gx_default_strip_tile_rect_devn(dev->child, tiles, x, y, width, height, pdcolor0, pdcolor1, phase_x, phase_y); @@ -872,7 +872,7 @@ int default_subclass_copy_alpha_hl_color(gx_device *dev, const byte *data, int d const gx_drawing_color *pdcolor, int depth) { if (dev->child) - return dev->child->procs.copy_alpha_hl_color(dev->child, data, data_x, raster, id, x, y, width, height, pdcolor, depth); + return dev_proc(dev->child, copy_alpha_hl_color)(dev->child, data, data_x, raster, id, x, y, width, height, pdcolor, depth); else return_error(gs_error_rangecheck); @@ -882,7 +882,7 @@ int default_subclass_copy_alpha_hl_color(gx_device *dev, const byte *data, int d int default_subclass_process_page(gx_device *dev, gx_process_page_options_t *options) { if (dev->child) - return dev->child->procs.process_page(dev->child, options); + return dev_proc(dev->child, process_page)(dev->child, options); return 0; } diff --git a/base/gdevvec.c b/base/gdevvec.c index a180b6f5d..7d3efaab4 100644 --- a/base/gdevvec.c +++ b/base/gdevvec.c @@ -244,8 +244,8 @@ void gdev_vector_init(gx_device_vector * vdev) { gdev_vector_reset(vdev); - if (vdev->procs.dev_spec_op == gx_default_dev_spec_op) - vdev->procs.dev_spec_op = gdev_vector_dev_spec_op; + if (dev_proc(vdev, dev_spec_op) == gx_default_dev_spec_op) + set_dev_proc(vdev, dev_spec_op, gdev_vector_dev_spec_op); vdev->scale.x = vdev->scale.y = 1.0; vdev->in_page = false; diff --git a/base/gsdevice.c b/base/gsdevice.c index 00b5f2e10..ea986a715 100644 --- a/base/gsdevice.c +++ b/base/gsdevice.c @@ -360,7 +360,7 @@ gx_device_make_struct_type(gs_memory_struct_type_t *st, procs = &dev->procs; if (dev->stype) *st = *dev->stype; - else if (procs->get_xfont_procs == gx_forward_get_xfont_procs) + else if (dev_proc(dev, get_xfont_procs) == gx_forward_get_xfont_procs) *st = st_device_forward; else *st = st_device; @@ -668,9 +668,9 @@ gs_make_null_device(gx_device_null *dev_null, gx_device *dev, set_dev_proc(dn, pattern_manage, gx_default_pattern_manage); set_dev_proc(dn, push_transparency_state, gx_default_push_transparency_state); set_dev_proc(dn, pop_transparency_state, gx_default_pop_transparency_state); -#if 0 set_dev_proc(dn, put_image, gx_default_put_image); -#endif + set_dev_proc(dn, copy_planes, gx_default_copy_planes); + set_dev_proc(dn, copy_alpha_hl_color, gx_default_no_copy_alpha_hl_color); dn->graphics_type_tag = dev->graphics_type_tag; /* initialize to same as target */ gx_device_copy_color_params(dn, dev); } diff --git a/base/gsdparam.c b/base/gsdparam.c index 2efc8d4b4..821fbfec7 100644 --- a/base/gsdparam.c +++ b/base/gsdparam.c @@ -284,7 +284,7 @@ int gx_default_get_param(gx_device *dev, char *Param, void *list) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile != NULL) { + if (dev_proc(dev, get_profile) != NULL) { int code; code = dev_proc(dev, get_profile)(dev, &dev_profile); if (code < 0) @@ -554,7 +554,7 @@ gx_default_get_params(gx_device * dev, gs_param_list * plist) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile != NULL) { + if (dev_proc(dev, get_profile) != NULL) { code = dev_proc(dev, get_profile)(dev, &dev_profile); if (dev_profile == NULL) { code = gsicc_init_device_profile_struct(dev, NULL, 0); @@ -1006,7 +1006,7 @@ gx_default_put_graydetection(bool graydetection, gx_device * dev) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1042,7 +1042,7 @@ gx_default_put_graytok(bool graytok, gx_device * dev) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1080,7 +1080,7 @@ gx_default_put_prebandthreshold(bool prebandthreshold, gx_device * dev) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1118,7 +1118,7 @@ gx_default_put_usefastcolor(bool fastcolor, gx_device * dev) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1156,7 +1156,7 @@ gx_default_put_simulateoverprint(bool sim_overprint, gx_device * dev) * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1195,7 +1195,7 @@ gx_default_put_intent(gsicc_rendering_intents_t icc_intent, gx_device * dev, * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1231,7 +1231,7 @@ gx_default_put_blackpreserve(gsicc_blackpreserve_t blackpreserve, gx_device * de * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with @@ -1272,7 +1272,7 @@ gx_default_put_blackptcomp(gsicc_blackptcomp_t blackptcomp, gx_device * dev, * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { /* This is an odd case where the device has not yet fully been set up with its procedures yet. We want to make sure that we catch this so we assume here that we are dealing with diff --git a/base/gsicc_manage.c b/base/gsicc_manage.c index 0fbcdf105..a3bc449b5 100644 --- a/base/gsicc_manage.c +++ b/base/gsicc_manage.c @@ -1350,7 +1350,7 @@ gsicc_set_device_blackpreserve(gx_device *dev, gsicc_blackpreserve_t blackpreser * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { profile_struct = dev->icc_struct; } else { code = dev_proc(dev, get_profile)(dev, &profile_struct); @@ -1374,7 +1374,7 @@ gsicc_set_device_profile_intent(gx_device *dev, gsicc_rendering_intents_t intent * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { profile_struct = dev->icc_struct; } else { code = dev_proc(dev, get_profile)(dev, &profile_struct); @@ -1398,7 +1398,7 @@ gsicc_set_device_blackptcomp(gx_device *dev, gsicc_blackptcomp_t blackptcomp, * gx_device_fill_in_procs is called, and its possible for us to get here before this * happens, so we *must* make sure the method is not NULL before we use it. */ - if (dev->procs.get_profile == NULL) { + if (dev_proc(dev, get_profile) == NULL) { profile_struct = dev->icc_struct; } else { code = dev_proc(dev, get_profile)(dev, &profile_struct); diff --git a/base/gxclist.c b/base/gxclist.c index 063e8b5f3..0b9316b04 100644 --- a/base/gxclist.c +++ b/base/gxclist.c @@ -322,7 +322,7 @@ clist_init_bands(gx_device * dev, gx_device_memory *bdev, uint data_size, int nbands; ulong space; - if (dev->procs.open_device == pattern_clist_open_device) { + if (dev_proc(dev, open_device) == pattern_clist_open_device) { /* We don't need bands really. */ cdev->page_band_height = dev->height; cdev->nbands = 1; @@ -416,7 +416,7 @@ clist_init_data(gx_device * dev, byte * init_data, uint data_size) /* copy_alpha in the commmand list device as well. */ if (dev_proc(pbdev, copy_alpha) == gx_no_copy_alpha) cdev->disable_mask |= clist_disable_copy_alpha; - if (cdev->procs.open_device == pattern_clist_open_device) { + if (dev_proc(cdev, open_device) == pattern_clist_open_device) { bits_size = data_size / 2; cdev->page_line_ptrs_offset = 0; } else { @@ -745,7 +745,7 @@ clist_close(gx_device *dev) if (cdev->do_not_open_or_close_bandfiles) return 0; - if (cdev->procs.open_device == pattern_clist_open_device) { + if (dev_proc(cdev, open_device) == pattern_clist_open_device) { gs_free_object(cdev->bandlist_memory, cdev->data, "clist_close"); cdev->data = NULL; } diff --git a/base/gxclrect.c b/base/gxclrect.c index a19b17ab3..8b27bf1da 100644 --- a/base/gxclrect.c +++ b/base/gxclrect.c @@ -638,7 +638,7 @@ clist_dev_spec_op(gx_device *pdev, int dev_spec_op, void *data, int size) /* forward to the appropriate super class */ if (cdev->is_printer) return gdev_prn_forwarding_dev_spec_op(pdev, dev_spec_op, data, size); - if (cdev->procs.open_device == pattern_clist_open_device) + if (dev_proc(cdev, open_device) == pattern_clist_open_device) return pattern_accum_dev_spec_op(pdev, dev_spec_op, data, size); return gx_default_dev_spec_op(pdev, dev_spec_op, data, size); } diff --git a/base/gxcmap.c b/base/gxcmap.c index 8d0b3df91..a9b7b4e84 100644 --- a/base/gxcmap.c +++ b/base/gxcmap.c @@ -1445,12 +1445,7 @@ devicen_has_cmyk(gx_device * dev) { gs_devn_params *devn_params; - /* Device may not have ret_devn_params! */ - if (dev->procs.ret_devn_params != NULL) { - devn_params = dev_proc(dev, ret_devn_params)(dev); - } else { - return false; - } + devn_params = dev_proc(dev, ret_devn_params)(dev); if (devn_params == NULL) { return false; } diff --git a/base/gxdevice.h b/base/gxdevice.h index 8b5a6a68d..917dbbfcd 100644 --- a/base/gxdevice.h +++ b/base/gxdevice.h @@ -671,7 +671,7 @@ typedef struct { } generic_subclass_data; -int gx_copy_device_procs(gx_device_procs *dest_procs, gx_device_procs *src_procs, gx_device_procs *prototype_procs); +int gx_copy_device_procs(gx_device *dest, gx_device *src, gx_device *prototype); int gx_device_subclass(gx_device *dev_to_subclass, gx_device *new_prototype, unsigned int private_data_size); int gx_device_unsubclass(gx_device *dev); int gx_update_from_subclass(gx_device *dev); diff --git a/base/gxfapi.c b/base/gxfapi.c index 88fc6f598..82cd3df3a 100644 --- a/base/gxfapi.c +++ b/base/gxfapi.c @@ -262,8 +262,8 @@ using_transparency_pattern(gs_gstate *pgs) gx_device *dev = gs_currentdevice_inline(pgs); return ((!gs_color_writes_pure(pgs)) - && dev->procs.begin_transparency_group != gx_default_begin_transparency_group - && dev->procs.end_transparency_group != gx_default_end_transparency_group); + && dev_proc(dev, begin_transparency_group) != gx_default_begin_transparency_group + && dev_proc(dev, end_transparency_group) != gx_default_end_transparency_group); } static bool diff --git a/base/gxfill.c b/base/gxfill.c index 2bd0b4b07..0c879fbb9 100644 --- a/base/gxfill.c +++ b/base/gxfill.c @@ -199,7 +199,7 @@ is_spotan_device(gx_device * dev) * is allocaded on the stack i.e. has no block header with a descriptor * but has dev->memory set like a heap-allocated device. */ - return dev->procs.open_device == san_open; + return dev_proc(dev, open_device) == san_open; } /* Forward declarations */ diff --git a/base/gxp1fill.c b/base/gxp1fill.c index db4a24afa..3deaf82af 100644 --- a/base/gxp1fill.c +++ b/base/gxp1fill.c @@ -256,7 +256,7 @@ tile_colored_fill(const tile_fill_state_t * ptfs, bool full_transfer = (w == ptfs->w0 && h == ptfs->h0); int code = 0; - if (source == NULL && lop_no_S_is_T(lop) && dev->procs.copy_planes != gx_default_copy_planes && + if (source == NULL && lop_no_S_is_T(lop) && dev_proc(dev, copy_planes) != gx_default_copy_planes && ptfs->num_planes > 0) { code = (*dev_proc(ptfs->pcdev, copy_planes)) (ptfs->pcdev, data + bits->raster * yoff, xoff, diff --git a/base/gxpcmap.c b/base/gxpcmap.c index 8669f7ff7..65e9dca70 100644 --- a/base/gxpcmap.c +++ b/base/gxpcmap.c @@ -243,12 +243,12 @@ static void gx_pattern_accum_finalize_cw(gx_device * dev) bool gx_device_is_pattern_accum(gx_device *dev) { - return dev->procs.open_device == pattern_accum_open; + return dev_proc(dev, open_device) == pattern_accum_open; } bool gx_device_is_pattern_clist(gx_device *dev) { - return dev->procs.open_device == pattern_clist_open_device; + return dev_proc(dev, open_device) == pattern_clist_open_device; } /* Allocate a pattern accumulator, with an initial refct of 0. */ @@ -326,7 +326,7 @@ gx_pattern_accum_alloc(gs_memory_t * mem, gs_memory_t * storage_memory, } cwdev = (gx_device_clist_writer *)cdev; cwdev->finalize = gx_pattern_accum_finalize_cw; - cwdev->procs.open_device = pattern_clist_open_device; + set_dev_proc(cwdev, open_device, pattern_clist_open_device); fdev = (gx_device_forward *)cdev; } fdev->log2_align_mod = tdev->log2_align_mod; @@ -1019,7 +1019,7 @@ gx_pattern_cache_add_entry(gs_gstate * pgs, return code; pcache = pgs->pattern_cache; - if (fdev->procs.open_device != pattern_clist_open_device) { + if (dev_proc(fdev, open_device) != pattern_clist_open_device) { gx_device_pattern_accum *padev = (gx_device_pattern_accum *)fdev; mbits = padev->bits; @@ -1094,7 +1094,7 @@ gx_pattern_cache_add_entry(gs_gstate * pgs, ctile->blending_mode = ((pdf14_device *)(pgs->device))->blend_mode; else ctile->blending_mode = 0; - if (fdev->procs.open_device != pattern_clist_open_device) { + if (dev_proc(fdev, open_device) != pattern_clist_open_device) { if (mbits != 0) { make_bitmap(&ctile->tbits, mbits, gs_next_ids(pgs->memory, 1)); mbits->bitmap_memory = 0; /* don't free the bits */ @@ -1482,7 +1482,7 @@ gx_pattern_load(gx_device_color * pdc, const gs_gstate * pgs, } } #ifdef DEBUG - if (gs_debug_c('B') && adev->procs.open_device == pattern_accum_open) { + if (gs_debug_c('B') && dev_proc(adev, open_device) == pattern_accum_open) { gx_device_pattern_accum *pdev = (gx_device_pattern_accum *)adev; if (pdev->mask) @@ -1503,7 +1503,7 @@ gx_pattern_load(gx_device_color * pdc, const gs_gstate * pgs, gs_gstate_free_chain(saved); return code; fail: - if (adev->procs.open_device == pattern_clist_open_device) { + if (dev_proc(adev, open_device) == pattern_clist_open_device) { gx_device_clist *cdev = (gx_device_clist *)adev; gs_free_object(cdev->writer.bandlist_memory, cdev->common.data, "gx_pattern_load"); diff --git a/devices/gdevdsp.c b/devices/gdevdsp.c index 2ba989b3c..fb931fc56 100644 --- a/devices/gdevdsp.c +++ b/devices/gdevdsp.c @@ -1401,7 +1401,7 @@ display_alloc_bitmap(gx_device_display * ddev, gx_device * param_dev) ? gx_max_color_value : 0; dev_proc(ddev, fill_rectangle)((gx_device *)ddev, 0, 0, ddev->width, ddev->height, - ddev->procs.encode_color((gx_device *)ddev, cv)); + dev_proc(ddev, encode_color)((gx_device *)ddev, cv)); } return ccode; diff --git a/devices/gdevplib.c b/devices/gdevplib.c index 6796b425d..fadb4c797 100644 --- a/devices/gdevplib.c +++ b/devices/gdevplib.c @@ -655,8 +655,8 @@ plib_create_buf_device(gx_device **pbdev, gx_device *target, int y, mem, color_usage); if (code < 0) return code; - if ((*pbdev)->procs.get_bits_rectangle == mem_get_bits_rectangle) - (*pbdev)->procs.get_bits_rectangle = plib_get_bits_rectangle_mem; + if (dev_proc((*pbdev), get_bits_rectangle) == mem_get_bits_rectangle) + set_dev_proc((*pbdev), get_bits_rectangle, plib_get_bits_rectangle_mem); return 0; } diff --git a/devices/gdevtifs.c b/devices/gdevtifs.c index 396dc3404..f1bd9ce88 100644 --- a/devices/gdevtifs.c +++ b/devices/gdevtifs.c @@ -57,11 +57,11 @@ tiff_open(gx_device *pdev) return code; if (update_procs) { if (pdev->ObjectHandlerPushed) { - gx_copy_device_procs(&pdev->parent->procs, &pdev->procs, (gx_device_procs *)&gs_obj_filter_device.procs); + gx_copy_device_procs(pdev->parent, pdev, &gs_obj_filter_device); pdev = pdev->parent; } if (pdev->PageHandlerPushed) - gx_copy_device_procs(&pdev->parent->procs, &pdev->procs, (gx_device_procs *)&gs_flp_device.procs); + gx_copy_device_procs(pdev->parent, pdev, &gs_flp_device); } if (ppdev->OpenOutputFile) code = gdev_prn_open_printer_seekable(pdev, 1, true); diff --git a/devices/gdevtsep.c b/devices/gdevtsep.c index 15e78ee38..d825bfc0c 100644 --- a/devices/gdevtsep.c +++ b/devices/gdevtsep.c @@ -1173,9 +1173,9 @@ tiffsep1_put_params(gx_device * pdev, gs_param_list * plist) return code; /* put_params may have changed the fill_path proc -- we need it set to ours */ - if (pdev->procs.fill_path != sep1_fill_path) { - tfdev->fill_path = pdev->procs.fill_path; - pdev->procs.fill_path = sep1_fill_path; + if (dev_proc(pdev, fill_path) != sep1_fill_path) { + set_dev_proc(tfdev, fill_path, dev_proc(pdev, fill_path)); + set_dev_proc(pdev, fill_path, sep1_fill_path); } return code; @@ -1240,9 +1240,9 @@ tiffsep1_prn_open(gx_device * pdev) pdev->icc_struct->supports_devn = true; /* gdev_prn_open_planae may have changed the fill_path proc -- we need it set to ours */ - if (pdev->procs.fill_path != sep1_fill_path) { - pdev_sep->fill_path = pdev->procs.fill_path; - pdev->procs.fill_path = sep1_fill_path; + if (dev_proc(pdev, fill_path) != sep1_fill_path) { + set_dev_proc(pdev_sep, fill_path, pdev->procs.fill_path); + set_dev_proc(pdev, fill_path, sep1_fill_path); } return code; } diff --git a/devices/gdevwpr2.c b/devices/gdevwpr2.c index 4eb3d9fd6..58b4a230d 100644 --- a/devices/gdevwpr2.c +++ b/devices/gdevwpr2.c @@ -789,19 +789,19 @@ win_pr2_set_bpp(gx_device * dev, int depth) wdev->selected_bpp = depth; /* copy encode/decode procedures */ - dev->procs.encode_color = dev->procs.map_rgb_color; - dev->procs.decode_color = dev->procs.map_color_rgb; + set_dev_proc(dev, encode_color, dev_proc(dev, map_rgb_color)); + set_dev_proc(dev, decode_color, dev_proc(dev, map_color_rgb)); if (depth == 1) { - dev->procs.get_color_mapping_procs = - gx_default_DevGray_get_color_mapping_procs; - dev->procs.get_color_comp_index = - gx_default_DevGray_get_color_comp_index; + set_dev_proc(dev, get_color_mapping_procs, + gx_default_DevGray_get_color_mapping_procs); + set_dev_proc(dev, get_color_comp_index, + gx_default_DevGray_get_color_comp_index); } else { - dev->procs.get_color_mapping_procs = - gx_default_DevRGB_get_color_mapping_procs; - dev->procs.get_color_comp_index = - gx_default_DevRGB_get_color_comp_index; + set_dev_proc(dev, get_color_mapping_procs, + gx_default_DevRGB_get_color_mapping_procs); + set_dev_proc(dev, get_color_comp_index, + gx_default_DevRGB_get_color_comp_index); } return(code); } |