From a5dd51e25842c7499917f00e53228695fd113826 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Thu, 21 Jan 2021 15:50:26 +0100 Subject: [PATCH] libcupsfilters: In the PPD generator really give priority to Apple Raster against PDF (cherry picked from commit bcd1aedeecb83fe9499d1d0c3dc0dab1ea32811c) --- cupsfilters/ppdgenerator.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c index 4e163836..ebc2ee1c 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 100 -\"\n"); + cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 200 -\"\n"); manual_copies = 0; formatfound = 1; is_pdf = 1; @@ -2030,7 +2030,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: \"application/PCLm application/PCLm 200 -\"\n"); + cupsFilePuts(fp, "*cupsFilter2: \"application/PCLm application/PCLm 300 -\"\n"); if (formatfound == 0) manual_copies = 1; formatfound = 1; is_pclm = 1; @@ -2049,7 +2049,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ /* We put a high cost factor here as if a printer supports also another format, like PWG or Apple Raster, we prefer it, as some PCL-XL printers have bugs in their PCL-XL interpreters */ - cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/vnd.hp-pclxl 300 gstopxl\"\n"); + cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/vnd.hp-pclxl 400 gstopxl\"\n"); if (formatfound == 0) manual_copies = 1; formatfound = 1; } @@ -2058,7 +2058,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ /* We put a high cost factor here as if a printer supports also another format, like PWG or Apple Raster, we prefer it, as many PostScript printers have bugs in their PostScript interpreters */ - cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-postscript application/postscript 500 -\"\n"); + cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-postscript application/postscript 600 -\"\n"); if (formatfound == 0) manual_copies = 0; formatfound = 1; } @@ -2067,7 +2067,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */ another format, like PWG or Apple Raster, we prefer it, as there are some printers, like HP inkjets which report to accept PCL but do not support PCL 5c/e or PCL-XL */ - cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx\"\n"); + cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-raster application/vnd.hp-pcl 800 rastertopclx\"\n"); if (formatfound == 0) manual_copies = 1; formatfound = 1; } -- 2.26.2