diff options
| author | Roger Leigh <rleigh@debian.org> | 2008-10-26 16:16:09 +0000 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2008-10-26 16:16:09 +0000 |
| commit | 3950c83c2919fe59dbf442c0d4859778fadd0e8d (patch) | |
| tree | a94521b94f4a256b5b6d7f004f4afd5f9aae5db0 /src/main/print-pcl.c | |
| parent | 97aedb05b271e9486f51eac1aee64fce92da64ca (diff) | |
Imported Upstream version 4.3.99+cvs20060521
Diffstat (limited to 'src/main/print-pcl.c')
| -rw-r--r-- | src/main/print-pcl.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c index ea41b4f..1feaacf 100644 --- a/src/main/print-pcl.c +++ b/src/main/print-pcl.c @@ -1,5 +1,5 @@ /* - * "$Id: print-pcl.c,v 1.140 2005/10/18 02:08:17 rlk Exp $" + * "$Id: print-pcl.c,v 1.142 2006/05/12 00:53:18 rlk Exp $" * * Print plug-in HP PCL driver for the GIMP. * @@ -2107,7 +2107,7 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image) stp_deprintf(STP_DBG_PCL, "privdata.do_cret = %d\n", privdata.do_cret); stp_deprintf(STP_DBG_PCL, "privdata.do_cretb = %d\n", privdata.do_cretb); - if (ink_type) + if (ink_type && printing_color) privdata.do_6color = (strcmp(ink_type, "Photo") == 0); else privdata.do_6color = 0; @@ -2534,8 +2534,9 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image) if (privdata.do_cret) /* 4-level printing for 800/1120 */ { - stp_dither_set_inks_simple(v, STP_ECOLOR_Y, 3, dot_sizes_use, 1.0, 0.08); - if (!privdata.do_cretb) + if (yellow) + stp_dither_set_inks_simple(v, STP_ECOLOR_Y, 3, dot_sizes_use, 1.0, 0.08); + if (black && !privdata.do_cretb) stp_dither_set_inks_simple(v, STP_ECOLOR_K, 3, dot_sizes_use, 1.0, 1.0); /* Note: no printer I know of does both CRet (4-level) and 6 colour, but @@ -2550,10 +2551,12 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image) } else { - stp_dither_set_inks_simple(v, STP_ECOLOR_C, 3, dot_sizes_use, 1.0, - 0.31 / .5); - stp_dither_set_inks_simple(v, STP_ECOLOR_M, 3, dot_sizes_use, 1.0, - 0.61 / .7); + if (cyan) + stp_dither_set_inks_simple(v, STP_ECOLOR_C, 3, dot_sizes_use, 1.0, + 0.31 / .5); + if (magenta) + stp_dither_set_inks_simple(v, STP_ECOLOR_M, 3, dot_sizes_use, 1.0, + 0.61 / .7); } } else if (privdata.do_6color) @@ -2714,6 +2717,7 @@ static const stp_printfuncs_t print_pcl_printfuncs = pcl_parameters, stp_default_media_size, pcl_imageable_area, + pcl_imageable_area, pcl_limit, pcl_print, pcl_describe_resolution, |