diff options
Diffstat (limited to 'base/gdevprn.c')
| -rw-r--r-- | base/gdevprn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/base/gdevprn.c b/base/gdevprn.c index 296e9734..e2d1da4a 100644 --- a/base/gdevprn.c +++ b/base/gdevprn.c @@ -303,7 +303,7 @@ gdev_prn_allocate(gx_device *pdev, gdev_space_params *new_space_params, ppdev->orig_procs = pdev->procs; for ( pass = 1; pass <= (reallocate ? 2 : 1); ++pass ) { ulong mem_space; - ulong pdf14_trans_buffer_size = 0; + size_t pdf14_trans_buffer_size = 0; byte *base = 0; bool bufferSpace_is_default = false; gdev_space_params space_params; @@ -335,7 +335,7 @@ gdev_prn_allocate(gx_device *pdev, gdev_space_params *new_space_params, mem_space = buf_space.bits + buf_space.line_ptrs; if (ppdev->page_uses_transparency) { pdf14_trans_buffer_size = (ESTIMATED_PDF14_ROW_SPACE(max(1, pdev->width), pdev->color_info.num_components, deep ? 16 : 8) >> 3); - if (new_height < (max_ulong - mem_space) / pdf14_trans_buffer_size) { + if (new_height < (max_size_t - mem_space) / pdf14_trans_buffer_size) { pdf14_trans_buffer_size *= pdev->height; } else { size_ok = 0; @@ -457,6 +457,7 @@ gdev_prn_allocate(gx_device *pdev, gdev_space_params *new_space_params, pdev->procs = ppdev->orig_procs; ppdev->orig_procs.open_device = 0; /* prevent uninit'd restore of procs */ gs_free_object(pdev->memory->non_gc_memory, ppdev->bg_print, "prn bg_print"); + ppdev->bg_print = NULL; return_error(code); } } @@ -505,6 +506,7 @@ gdev_prn_allocate(gx_device *pdev, gdev_space_params *new_space_params, } if (code < 0) { gs_free_object(pdev->memory->non_gc_memory, ppdev->bg_print, "prn bg_print"); + ppdev->bg_print = NULL; } return code; } @@ -1802,8 +1804,8 @@ gdev_prn_initialize_device_procs_gray(gx_device *dev) set_dev_proc(dev, map_rgb_color, gx_default_gray_map_rgb_color); set_dev_proc(dev, map_color_rgb, gx_default_gray_map_color_rgb); - set_dev_proc(dev, encode_color, gx_default_gray_map_rgb_color); - set_dev_proc(dev, decode_color, gx_default_gray_map_color_rgb); + set_dev_proc(dev, encode_color, gx_default_gray_encode_color); + set_dev_proc(dev, decode_color, gx_default_gray_decode_color); } void gdev_prn_initialize_device_procs_gray_bg(gx_device *dev) |