libcupsfilters: In the PPD generator give priority to Apple Raster against PDF

(cherry picked from commit 1b390962756bf10ac30a386225e20cbc72840fe7)

diff --git a/NEWS b/NEWS
index 8f63cc4017e201e971f76757d2a954eeff5ba37b..4bde3f0e69acc8a47a140f996c79b022a016491e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ NEWS - OpenPrinting CUPS Filters v1.28.6 - 2020-12-02
 
 CHANGES IN V1.28.7
 
+       - libcupsfilters: In the PPD generator give priority to Apple
+         Raster against PDF (Issue #331).
        - libcupsfilters: Added NULL check when removing ".Borderless"
          suffixes from page size names (Issue #314, Pull request
          #328).

diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c
index 597ab987acce5d0ea40faf829f96337c31e1fe36..4e163836fff44376adc9ee6aafa987425962ad79 100644 (file)
--- 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, &current_res, &common_def,
                                   &current_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, &current_res, &common_def,
                               &current_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;