Hello community, here is the log from the commit of package hplip for openSUSE:Leap:15.2 checked in at 2020-05-29 18:48:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/hplip (Old) and /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Fri May 29 18:48:59 2020 rev:28 rq:778889 version:3.19.12 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/hplip/hplip.changes 2020-01-15 15:11:22.530105259 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip.changes 2020-05-29 18:49:02.084178151 +0200 @@ -1,0 +2,381 @@ +Mon Jan 13 22:01:08 UTC 2020 - Martin Wilck <[email protected]> + +- Use /etc/sane.d/dll.d/hpaio to register SANE backend rather + than modifying /etc/sane/dll.conf +- SANE backend must be configured in hplip-sane package (bsc#1160708) + +------------------------------------------------------------------- +Mon Jan 13 17:27:20 UTC 2020 - Martin Wilck <[email protected]> + +- Revert changes from 3.18.5 that break hp-setup for fax devices + (bsc#1107711, lp#1773320) + * Added patch: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch + +------------------------------------------------------------------- +Fri Jan 10 13:52:53 UTC 2020 - Martin Wilck <[email protected]> + +- Fix crash if python3-reportlab is missing (bsc#1159240, lp#1859179) + * Added hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch + * Added recommends on python3-reportlab + +------------------------------------------------------------------- +Thu Jan 9 11:54:45 UTC 2020 - Johannes Weberhofer <[email protected]> + +- updated to 3.19.12 + + Rendering print jobs with cupsfilter command + Added support for the following new Printers: + + * HP Color LaserJet Pro M256dn + * HP Color LaserJet Pro M255dn + * HP Color LaserJet Pro M256nw + * HP Color LaserJet Pro M255nw + * HP Color LaserJet Pro M256dw + * HP Color LaserJet Pro M255dw + * HP Color LaserJet Pro M155a + * HP Color LaserJet Pro M156a + * HP Color LaserJet Pro M155nw + * HP Color LaserJet Pro M156nw + * HP Color LaserJet Pro MFP M282nw + * HP Color LaserJet Pro MFP M284nw + * HP Color LaserJet Pro MFP M283fdn + * HP Color LaserJet Pro MFP M285fdn + * HP Color LaserJet Pro MFP M283fdw + * HP Color LaserJet Pro MFP M285fdw + * HP Color LaserJet Pro MFP M283cdw + * HP Color LaserJet Pro MFP M285cdw + * HP Color LaserJet Pro MFP M182n + * HP Color LaserJet Pro MFP M184n + * HP Color LaserJet Pro MFP M182nw + * HP Color LaserJet Pro MFP M184nw + * HP Color LaserJet Pro MFP M183fw + * HP Color LaserJet Pro MFP M185fw + +- updated to 3.19.11 + + Added Supported for “hp-uiscan” to scan only backside of a page + + Added support for the following new Printers: + * HP Color LaserJet MFP M776dn + * HP Color LaserJet Flow MFP M776z + * HP Color LaserJet Flow MFP M776zs + * HP Color LaserJet M856dn + * HP Color LaserJet M856x + * HP Color LaserJet E85055dn + + Added Job Accounting Support for the following devices: + * HP LaserJet Managed Flow MFP E77822-28-30 Printer + * HP LaserJet Managed MFP E77822-28-30 Printer + * HP LaserJet Managed Flow MFP E87640-50-60 Printer + * HP LaserJet Managed MFP E87640-50-60 Printer + * HP LaserJet Managed Flow MFP E82540-50-60 Printer + * HP LaserJet Managed MFP E82540-50-60 Printer + * HP LaserJet Managed Flow MFP E72525-30-35 Printer + * HP LaserJet Managed MFP E72525-30-35 Printer + +- updated to 3.19.8 + hp-uiscan will fetch the paper sizes from the device dynamically for ScanJet devices. + hp-uiscan will prompt error message when paper jam occurs for ScanJet devices. + + Added support for the following new Printers: + * HP DesignJet T1530 Postscript + * HP DesignJet T1600 Postscript Printer + * HP DesignJet T1600dr Postscript Printer + * HP DesignJet T2530 Postscript + * HP DesignJet T2600 Postscript MFP + * HP DesignJet T930 Postscript + * HP LaserJet Pro M304a + * HP LaserJet Pro M305d + * HP LaserJet Pro M305dn + * HP LaserJet Pro M305dw + * HP LaserJet Pro MFP M329dn + * HP LaserJet Pro MFP M329dw + +------------------------------------------------------------------- +Sun Dec 15 14:46:50 UTC 2019 - Stefan Brüns <[email protected]> + +- Pass Python includedir in CFLAGS to fix broken lookup of Python.h + in configure, fails with Python 3.8 (boo#1159242). + +------------------------------------------------------------------- +Wed Oct 16 07:48:29 UTC 2019 - Andreas Schneider <[email protected]> + +- Added missing requirement lsb-release (needed for root password + prompt, e.g. hp-plugin). +- Changed the pgp server to pool.sks-keyservers.net to avoid timeouts + from pgp.mit.edu + * New patch: hplip-change-pgp-server.patch + +------------------------------------------------------------------- +Thu Aug 29 20:33:04 UTC 2019 - Martin Wilck <[email protected]> + +- Renamed "hplip-scan" to "hplip-scan-utils" to express the + purpose of the package more clearly in the name. + "hplip-scan" has never been in public repos. + +------------------------------------------------------------------- +Thu Aug 29 20:24:48 UTC 2019 - Martin Wilck <[email protected]> + +- Added conditional BuildRequires on "cups-rpm-helper". + Recently a bug in python-pycups was fixed that had prevented + autogeneration of Provides: tags in printer drivers by means + of "BuildRequires: python3-cups". See OBS sr#726727. This + dependency must be conditional for now, as cups-rpm-helper + is not available in every project yet. +- Ran spec-cleaner. + +------------------------------------------------------------------- +Wed Aug 28 21:32:04 UTC 2019 - Martin Wilck <[email protected]> + +- Removed compatibility code for SLE12/Leap42 and earlier + As we are now using rpm 4.13 (A and B) syntax, we can't support + these any more anyway. + +------------------------------------------------------------------- +Tue Aug 27 10:48:46 UTC 2019 - Martin Wilck <[email protected]> + +- Moved hp-scan and hp-uiscan to a separate package "hp-scan". + These tools pull in PIL and python3-scikit-image, which causes + a rather big dependency list, which is only available in openSUSE. + This allows us also to get rid of the non-functional "hp-scan" tool + in SLE. +- Fixed --with-htmldir so that documentation is packaged +- Improved package descriptions and summaries + * Clarified the relationship of hplip-hpijs, hplip-sane, and hplip + * Shortened the descriptions + * Removed reference to HTML documention in package description +- Added -devel dependencies as required by post-build-checks +- Minor spec file cleanup (macro usage) +- Fixed build failures on non-standard architectures by adding BuildIgnore + These failures are actually caused by some ports catching up + slowly with package updates. But our BuildIgnores are helpful + nonetheless, making the build environment leaner. + +------------------------------------------------------------------- +Mon Aug 12 12:53:35 UTC 2019 - Johannes Weberhofer <[email protected]> + +- updated to 3.19.6 + Added support for the following new Printers: + * HP Color LaserJet Enterprise M751dn + * HP Color LaserJet Enterprise M751n + * HP Color LaserJet Managed E75245dn + * HP Color LaserJet Pro M453cdn + * HP Color LaserJet Pro M453cdw + * HP Color LaserJet Pro M454cdn + * HP Color LaserJet Pro M454cdw + * HP Color LaserJet Pro M454dn + * HP Color LaserJet Pro M454dw + * HP Color LaserJet Pro M454nw + * HP Color LaserJet Pro MFP M478fcdn + * HP Color LaserJet Pro MFP M478fcdw + * HP Color LaserJet Pro MFP M479dw + * HP Color LaserJet Pro MFP M479fcdn + * HP Color LaserJet Pro MFP M479fcdw + * HP Color LaserJet Pro MFP M479fdn + * HP Color LaserJet Pro MFP M479fdw + * HP Color LaserJet Pro MFP M479fnw + * HP DesignJet T2600dr Postscript MFP + * HP DesignJet XL 3600 PS MFP + * HP Laser NS 1020 + * HP Laser NS 1020w + * HP Laser NS MFP 1005 + * HP Laser NS MFP 1005w + * HP LaserJet Enterprise Flow MFP M528c + * HP LaserJet Enterprise Flow MFP M528z + * HP LaserJet Enterprise M507dn + * HP LaserJet Enterprise M507dng + * HP LaserJet Enterprise M507n + * HP LaserJet Enterprise M507x + * HP LaserJet Enterprise MFP M528dn + * HP LaserJet Enterprise MFP M528f + * HP LaserJet Managed E50145dn + * HP LaserJet Managed E50145x + * HP LaserJet Managed Flow MFP E52645c + * HP LaserJet Managed MFP E52645dn + * HP LaserJet Pro M404c1 + * HP LaserJet Pro M404c2 + * HP LaserJet Pro M404c3 ++++ 184 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/hplip/hplip.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip.changes Old: ---- hplip-3.18.6.tar.gz hplip-3.18.6.tar.gz.asc New: ---- Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch hplip-3.19.12.tar.gz hplip-3.19.12.tar.gz.asc hplip-change-pgp-server.patch hplip-orblite-return-null.diff hplip-remove-imageprocessor.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ ++++ 714 lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/hplip/hplip.spec ++++ and /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip.spec ++++++ Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch ++++++ >From af8ddd502a88f8dc0910c2c9a91471be8434af61 Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Mon, 13 Jan 2020 18:20:22 +0100 Subject: [PATCH] Revert changes from 3.18.5 that break hp-setup for fax devices See bsc#1107711, lp#1773320 https://launchpadlibrarian.net/371794274/hplip-use-binary-str.patch Credits: Eric Schirra <[email protected]> --- base/utils.py | 5 +---- fax/pmlfax.py | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/base/utils.py b/base/utils.py index f268cf8..cc77820 100644 --- a/base/utils.py +++ b/base/utils.py @@ -954,10 +954,7 @@ else: def printable(s): - if s: - return s.translate(identity, unprintable) - else: - return "" + return s.translate(identity, unprintable) def any(S,f=lambda x:x): diff --git a/fax/pmlfax.py b/fax/pmlfax.py index adcc1cb..b68ff6a 100644 --- a/fax/pmlfax.py +++ b/fax/pmlfax.py @@ -143,8 +143,8 @@ class PMLFaxDevice(FaxDevice): def getPhoneNum(self): if PY3: - data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1]) - return data + data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1].encode('utf-8')) + return data.decode('utf-8') else: return utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1]) phone_num = property(getPhoneNum, setPhoneNum, doc="OID_FAX_LOCAL_PHONE_NUM") @@ -155,8 +155,8 @@ class PMLFaxDevice(FaxDevice): def getStationName(self): if PY3: - data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1]) - return data + data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1].encode('utf-8')) + return data.decode('utf-8') else: return utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1]) -- 2.24.1 ++++++ hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch ++++++ >From 8b1bbbb9a3659475367a6f58986ac8248576663b Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Fri, 10 Jan 2020 14:44:51 +0100 Subject: [PATCH] hp-sendfax: avoid crash if python-reportlab is missing Avoids this crash: warning: Reportlab not installed. Fax coverpages disabled. warning: Please install version 2.0+ of Reportlab for coverpage support. qt.qpa.xcb: QXcbConnection: XCB error: 3 (BadWindow), sequence: 669, resource id: 13465094, major code: 40 (TranslateCoords), minor code: 0 Traceback (most recent call last): File "/usr/share/hplip/ui5/sendfaxdialog.py", line 375, in FilesTable_fileListChanged self.toggleCoverPage(self.FilesTable.isMIMETypeInList(MIME_TYPE_COVERPAGE)) File "/usr/share/hplip/ui5/sendfaxdialog.py", line 328, in toggleCoverPage --- ui5/sendfaxdialog.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui5/sendfaxdialog.py b/ui5/sendfaxdialog.py index 4248907..3c3e880 100644 --- a/ui5/sendfaxdialog.py +++ b/ui5/sendfaxdialog.py @@ -325,9 +325,11 @@ class SendFaxDialog(QDialog, Ui_Dialog): def toggleCoverPage(self, b): # XXX: qt5port: disconnect method requires attention - self.CoverPageGroupBox.toggled[bool].disconnect(self.CoverPageGroupBox_toggled) + if coverpages_enabled: + self.CoverPageGroupBox.toggled[bool].disconnect(self.CoverPageGroupBox_toggled) self.CoverPageGroupBox.setChecked(b) - self.CoverPageGroupBox.toggled[bool].connect(self.CoverPageGroupBox_toggled) + if coverpages_enabled: + self.CoverPageGroupBox.toggled[bool].connect(self.CoverPageGroupBox_toggled) # -- 2.24.1 ++++++ hplip-3.18.6.tar.gz -> hplip-3.19.12.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/hplip/hplip-3.18.6.tar.gz /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip-3.19.12.tar.gz differ: char 5, line 1 ++++++ hplip-change-pgp-server.patch ++++++ Index: hplip-3.19.6/base/validation.py =================================================================== --- hplip-3.19.6.orig/base/validation.py 2019-06-26 15:07:10.000000000 +0200 +++ hplip-3.19.6/base/validation.py 2019-10-16 09:53:51.966435988 +0200 @@ -42,7 +42,7 @@ class DigiSign_Verification(object): class GPG_Verification(DigiSign_Verification): - def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): + def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): self.__pgp_site = pgp_site self.__key = key self.__gpg = utils.which('gpg',True) ++++++ hplip-misc-missing-includes-and-definitions.patch ++++++ --- /var/tmp/diff_new_pack.bcDil0/_old 2020-05-29 18:49:02.852180355 +0200 +++ /var/tmp/diff_new_pack.bcDil0/_new 2020-05-29 18:49:02.852180355 +0200 @@ -1,19 +1,7 @@ -From 6dd5de8c21284530a7d9716b979812446cc4eb79 Mon Sep 17 00:00:00 2001 -From: Martin Wilck <[email protected]> -Date: Wed, 21 Mar 2018 23:56:05 +0100 -Subject: [PATCH] hplip: misc missing #includes and definitions - ---- - protocol/discovery/mdns.c | 1 + - protocol/discovery/mdns.h | 1 + - scan/sane/hpaio.c | 1 + - scan/sane/http.c | 1 + - 4 files changed, 4 insertions(+) - -Index: b/protocol/discovery/mdns.c -=================================================================== ---- a/protocol/discovery/mdns.c -+++ b/protocol/discovery/mdns.c +Only in hplip-3.18.12/: Makefile.am.orig +diff -ur hplip-3.18.12-orig/protocol/discovery/mdns.c hplip-3.18.12/protocol/discovery/mdns.c +--- hplip-3.18.12-orig/protocol/discovery/mdns.c 2018-12-08 14:56:48.794408994 +0100 ++++ hplip-3.18.12/protocol/discovery/mdns.c 2018-12-08 14:56:28.785871912 +0100 @@ -37,6 +37,7 @@ #include <arpa/inet.h> #include "mdns.h" @@ -22,33 +10,32 @@ /* Convert "www.google.com" to "3www6google3com". */ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name) -Index: b/protocol/discovery/mdns.h -=================================================================== ---- a/protocol/discovery/mdns.h -+++ b/protocol/discovery/mdns.h -@@ -100,5 +100,6 @@ static void mdns_parse_respponse(unsign +diff -ur hplip-3.18.12-orig/protocol/discovery/mdns.h hplip-3.18.12/protocol/discovery/mdns.h +--- hplip-3.18.12-orig/protocol/discovery/mdns.h 2018-12-03 08:08:49.000000000 +0100 ++++ hplip-3.18.12/protocol/discovery/mdns.h 2018-12-08 14:56:28.785871912 +0100 +@@ -100,5 +100,6 @@ static void mdns_rr_cleanup(DNS_RECORD *rr); static DNS_RECORD *mdns_read_responses(int udp_socket, int mode); static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len); +int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count); #endif // _DISCOVERY_MDNS_H -Index: b/scan/sane/hpaio.c -=================================================================== ---- a/scan/sane/hpaio.c -+++ b/scan/sane/hpaio.c -@@ -46,6 +46,7 @@ +diff -ur hplip-3.18.12-orig/scan/sane/hpaio.c hplip-3.18.12/scan/sane/hpaio.c +--- hplip-3.18.12-orig/scan/sane/hpaio.c 2018-12-03 08:10:22.000000000 +0100 ++++ hplip-3.18.12/scan/sane/hpaio.c 2018-12-08 14:58:23.952963358 +0100 +@@ -45,6 +45,7 @@ #include "sclpml.h" #include "escl.h" #include "io.h" +#include "mdns.h" + #include "orblitei.h" - #define DEBUG_DECLARE_ONLY - #include "sanei_debug.h" -Index: b/scan/sane/http.c -=================================================================== ---- a/scan/sane/http.c -+++ b/scan/sane/http.c + +Only in hplip-3.18.12/scan/sane: hpaio.c.orig +Only in hplip-3.18.12/scan/sane: hpaio.c.rej +diff -ur hplip-3.18.12-orig/scan/sane/http.c hplip-3.18.12/scan/sane/http.c +--- hplip-3.18.12-orig/scan/sane/http.c 2018-12-03 08:10:22.000000000 +0100 ++++ hplip-3.18.12/scan/sane/http.c 2018-12-08 14:56:28.789872019 +0100 @@ -33,6 +33,7 @@ #include <stdio.h> ++++++ hplip-orblite-return-null.diff ++++++ diff -ur hplip-3.19.3-orig/scan/sane/orblite.c hplip-3.19.3/scan/sane/orblite.c --- hplip-3.19.3-orig/scan/sane/orblite.c 2019-03-14 10:28:56.000000000 +0100 +++ hplip-3.19.3/scan/sane/orblite.c 2019-04-12 18:59:07.734202665 +0200 @@ -331,6 +331,7 @@ return &g_handle->Options[option]; } //return g_handle->bb_orblite_get_option_descriptor(g_handle, option); + return NULL; } ++++++ hplip-remove-imageprocessor.diff ++++++ >From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 From: Didier Raboud <[email protected]> Date: Tue, 21 Aug 2018 18:18:10 +0200 Subject: Remove all ImageProcessor functionality, which is closed-source --- Makefile.am | 14 ++------------ prnt/hpcups/HPCupsFilter.cpp | 21 --------------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1b097c4f9..8d5d78c9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py endif #HPLIP_CLASS_DRIVER -dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv if !HPLIP_CLASS_DRIVER @@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp prnt/hpcups/ImageProcessor.h hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) #else #hpcupsdir = $(cupsfilterdir) #hpcups_PROGRAMS = hpcups @@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER install-data-hook: if HPLIP_BUILD - if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ - cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ - chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ - ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ - fi; \ - if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ - cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ - fi if !HPLIP_CLASS_DRIVER # If scanner build, add hpaio entry to sane dll.conf. if [ "$(scan_build)" = "yes" ]; then \ diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 5b282d83f..0bacfafac 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -31,7 +31,6 @@ \*****************************************************************************/ #include "HPCupsFilter.h" -#include "ImageProcessor.h" #include <signal.h> #include <sys/wait.h> @@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); - image_processor_t* imageProcessor = imageProcessorCreate(); while (cupsRasterReadHeader2(cups_raster, &cups_header)) { - IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); - if (result != IPE_SUCCESS){ - dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result); - } - current_page_number++; if (current_page_number == 1) { @@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) color_raster = rgbRaster; black_raster = kRaster; - result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine); - if (result != IPE_SUCCESS){ - dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result); - } - - if ((y == 0) && !is_ljmono) { //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer //may not skip blank lines before actual data @@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) } } // for() loop end - result = imageProcessorEndPage(imageProcessor); - if (result != IPE_SUCCESS){ - dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result); - } - - m_Job.NewPage(); if (err != NO_ERROR) { break; @@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) rgbRaster = NULL; } - imageProcessorDestroy(imageProcessor); - unlink(hpPreProcessedRasterFile); return ret_status; }
