From 1b390962756bf10ac30a386225e20cbc72840fe7 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Sun, 20 Dec 2020 14:18:21 +0100 Subject: [PATCH] libcupsfilters: In the PPD generator give priority to Apple Raster against PDF --- NEWS | 2 ++ cupsfilters/ppdgenerator.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index e0a8eebd6..b86b42c9e 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ NEWS - OpenPrinting CUPS Filters v1.27.5 - 2020-06-05 CHANGES IN V2.0.0 + - libcupsfilters, libppd: In the PPD generators give priority + to Apple Raster against PDF (Issue #331). - libcupsfilters: In the cupsRasterParseIPPOptions() map the color spaces the same way as in the PPD generator (Issue #326, Pull request #327). diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c index 597ab987a..4e163836f 100644 --- a/cupsfilters/ppdgenerator.c +++ b/cupsfilters/ppdgenerator.c @@ -1951,7 +1951,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ formatfound = 1; is_pdf = 1; } else if (cupsArrayFind(pdl_list, "application/pdf")) { - cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 0 -\"\n"); + cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 100 -\"\n"); manual_copies = 0; formatfound = 1; is_pdf = 1; @@ -1992,7 +1992,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ if (cupsArrayCount(current_res) > 0 && joinResolutionArrays(&common_res, ¤t_res, &common_def, ¤t_def)) { - cupsFilePuts(fp, "*cupsFilter2: \"image/urf image/urf 100 -\"\n"); + cupsFilePuts(fp, "*cupsFilter2: \"image/urf image/urf 0 -\"\n"); if (formatfound == 0) manual_copies = 1; formatfound = 1; is_apple = 1; @@ -2010,7 +2010,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ if ((current_res = ippResolutionListToArray(attr)) != NULL && joinResolutionArrays(&common_res, ¤t_res, &common_def, ¤t_def)) { - cupsFilePuts(fp, "*cupsFilter2: \"image/pwg-raster image/pwg-raster 0 -\"\n"); + cupsFilePuts(fp, "*cupsFilter2: \"image/pwg-raster image/pwg-raster 10 -\"\n"); if (formatfound == 0) manual_copies = 1; formatfound = 1; is_pwg = 1; -- 2.47.3