diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-03-19 13:53:45 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-13 11:28:25 +0200 |
| commit | dc2ba49207af71193f1390d84bba4e15aeea0ce0 (patch) | |
| tree | 79c2a51cb5fa2b87800b1113e0015a7108cd2eb3 /devices/gdevclj.c | |
| parent | Import Ghostscript 9.50 (diff) | |
| download | ghostscript-gpl-patches-dc2ba49207af71193f1390d84bba4e15aeea0ce0.tar.gz ghostscript-gpl-patches-dc2ba49207af71193f1390d84bba4e15aeea0ce0.tar.bz2 ghostscript-gpl-patches-dc2ba49207af71193f1390d84bba4e15aeea0ce0.zip | |
Import Ghostscript 9.52ghostscript-9.52
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'devices/gdevclj.c')
| -rw-r--r-- | devices/gdevclj.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/devices/gdevclj.c b/devices/gdevclj.c index d5b46689..542bb8ed 100644 --- a/devices/gdevclj.c +++ b/devices/gdevclj.c @@ -247,15 +247,24 @@ clj_get_params(gx_device *pdev, gs_param_list *plist) * on error. */ static int -clj_media_size(float mediasize[2], gs_param_list *plist) +clj_media_size(float mediasize[2], gs_param_list *plist, gx_device *dev) { gs_param_float_array fres; gs_param_float_array fsize; gs_param_int_array hwsize; int have_pagesize = 0; + float res[2]; - if ( (param_read_float_array(plist, "HWResolution", &fres) == 0) && - !is_supported_resolution(fres.data) ) + if ( param_read_float_array(plist, "HWResolution", &fres) == 0) { + res[0] = fres.data[0]; + res[1] = fres.data[1]; + } + else + { + res[0] = dev->HWResolution[0]; + res[1] = dev->HWResolution[1]; + } + if (!is_supported_resolution(res) ) return_error(gs_error_rangecheck); if ( (param_read_float_array(plist, "PageSize", &fsize) == 0) || @@ -266,8 +275,8 @@ clj_media_size(float mediasize[2], gs_param_list *plist) } if (param_read_int_array(plist, "HWSize", &hwsize) == 0) { - mediasize[0] = ((float)hwsize.data[0]) * 72 / fres.data[0]; - mediasize[1] = ((float)hwsize.data[1]) * 72 / fres.data[1]; + mediasize[0] = ((float)hwsize.data[0]) * 72 / res[0]; + mediasize[1] = ((float)hwsize.data[1]) * 72 / res[1]; have_pagesize = 1; } @@ -286,7 +295,7 @@ clj_put_params( { float mediasize[2]; bool rotate = false; - int have_pagesize = clj_media_size(mediasize, plist); + int have_pagesize = clj_media_size(mediasize, plist, pdev); if (have_pagesize < 0) return have_pagesize; @@ -419,6 +428,7 @@ clj_print_page( double fs_res = pdev->HWResolution[0] / 72.0; double ss_res = pdev->HWResolution[1] / 72.0; int imageable_width, imageable_height; + int code = 0; /* no paper size at this point is a serious error */ if (psize == 0) @@ -470,7 +480,9 @@ clj_print_page( for (i = 0; i < imageable_height; i++) { int clen[3]; - gdev_prn_copy_scan_lines(pdev, i, data, lsize); + code = gdev_prn_copy_scan_lines(pdev, i, data, lsize); + if (code < 0) + goto xit; /* The 'lsize' bytes of data have the blank margin area at the end due */ /* to the 'initial_matrix' offsets that are applied. */ @@ -494,11 +506,12 @@ clj_print_page( /* PCL will take care of blank lines at the end */ gp_fputs("\033*rC\f", prn_stream); +xit: /* free the buffers used */ gs_free_object(mem, cdata[0], "clj_print_page(cdata)"); gs_free_object(mem, data, "clj_print_page(data)"); - return 0; + return code; } /* CLJ device methods */ @@ -623,7 +636,7 @@ clj_pr_put_params( float mediasize[2]; int code = 0; bool rotate = false; - int have_pagesize = clj_media_size(mediasize, plist); + int have_pagesize = clj_media_size(mediasize, plist, pdev); if (have_pagesize < 0) return have_pagesize; |