rpms/cups-filters
7
0
Fork 0
Code Issues Pull Requests Releases Activity

1756726 - Epson ET 7700 reports pwg support, but pwg does not work

Browse Source
This commit is contained in:
Zdenek Dohnal 2019-11-12 12:53:30 +01:00
parent 2bc24c38e4
commit c80a629db4
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-libcupsfilters-In-generated-PPDs-prefer-Apple-Raster.patch Normal file
View File

@ -0,0 +1,44 @@
diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c
index 934b1ce..8d12193 100644
--- a/cupsfilters/ppdgenerator.c
+++ b/cupsfilters/ppdgenerator.c
@@ -1448,19 +1448,6 @@ ppdCreateFromIPP(char *buffer, /* I - Filename buffer */
formatfound = 1;
is_pdf = 1;
}
- if (cupsArrayFind(pdl_list, "image/pwg-raster")) {
- if ((attr = ippFindAttribute(response, "pwg-raster-document-resolution-supported", IPP_TAG_RESOLUTION)) != NULL) {
- current_def = NULL;
- 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");
- if (formatfound == 0) manual_copies = 1;
- formatfound = 1;
- is_pwg = 1;
- }
- }
- }
#ifdef CUPS_RASTER_HAVE_APPLERASTER
if (cupsArrayFind(pdl_list, "image/urf")) {
if ((attr = ippFindAttribute(response, "urf-supported", IPP_TAG_KEYWORD)) != NULL) {
@@ -1500,6 +1487,19 @@ ppdCreateFromIPP(char *buffer, /* I - Filename buffer */
}
}
#endif
+ if (cupsArrayFind(pdl_list, "image/pwg-raster")) {
+ if ((attr = ippFindAttribute(response, "pwg-raster-document-resolution-supported", IPP_TAG_RESOLUTION)) != NULL) {
+ current_def = NULL;
+ 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");
+ if (formatfound == 0) manual_copies = 1;
+ formatfound = 1;
+ is_pwg = 1;
+ }
+ }
+ }
#ifdef QPDF_HAVE_PCLM
if (cupsArrayFind(pdl_list, "application/PCLm")) {
if ((attr = ippFindAttribute(response, "pclm-source-resolution-supported", IPP_TAG_RESOLUTION)) != NULL) {

10
cups-filters.spec
View File

@ -4,7 +4,7 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.22.5
Release: 7%{?dist}
Release: 8%{?dist}
# For a breakdown of the licensing, see COPYING file
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
@ -36,6 +36,10 @@ Patch04: pdftopdf-nocrypt.patch
Patch05: cups-filters-qpdf-9.patch
# backported from upstream, gs 9.27 uses now setfilladjust2
Patch06: cups-filters-setfilladjust.patch
# several printers report badly that they have pwg-raster support, but printing
# pwg-raster does not work. So now apple-raster is preffered when printer reports
# support of pwg-raster and apple-raster
Patch07: 0001-libcupsfilters-In-generated-PPDs-prefer-Apple-Raster.patch
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
@ -151,6 +155,7 @@ This is the development package for OpenPrinting CUPS filters and backends.
%patch04 -p1 -b .pdftopdf-nocrypt
%patch05 -p1 -b .qpdf-9
%patch06 -p1 -b .setfilladjust
%patch07 -p1 -b .prefer-apple-raster
%build
# work-around Rpath
@ -299,6 +304,9 @@ make check
%{_libdir}/libfontembed.so
%changelog
* Tue Oct 22 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.22.5-8
- 1756726 - Epson ET 7700 reports pwg support, but pwg does not work
* Wed Oct 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.22.5-7
- gs 9.27 now uses setfilladjust2