tjh.dev
1From 207aa582477dd874d1651db2d0654c5d6adb6e0a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
3Date: Fri, 20 Dec 2019 13:13:52 +0000
4Subject: [PATCH] remove imageprocessor
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
10---
11 Makefile.am | 4 ++--
12 Makefile.in | 2 +-
13 prnt/hpcups/HPCupsFilter.cpp | 19 -------------------
14 3 files changed, 3 insertions(+), 22 deletions(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 891660d..484a051 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
21 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
22 endif #HPLIP_CLASS_DRIVER
23
24-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
25+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
26 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
27
28 if !HPLIP_CLASS_DRIVER
29@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
30 prnt/hpcups/ImageProcessor.h
31
32 hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
33-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
34+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
35 #else
36 #hpcupsdir = $(cupsfilterdir)
37 #hpcups_PROGRAMS = hpcups
38diff --git a/Makefile.in b/Makefile.in
39index 16c39f0..46a767e 100644
40--- a/Makefile.in
41+++ b/Makefile.in
42@@ -4814,7 +4814,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs
43 @HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
44
45 @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
46-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
47+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
48 #else
49 #hpcupsdir = $(cupsfilterdir)
50 #hpcups_PROGRAMS = hpcups
51diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
52index 5b282d8..153ee3a 100644
53--- a/prnt/hpcups/HPCupsFilter.cpp
54+++ b/prnt/hpcups/HPCupsFilter.cpp
55@@ -31,7 +31,6 @@
56 \*****************************************************************************/
57
58 #include "HPCupsFilter.h"
59-#include "ImageProcessor.h"
60
61 #include <signal.h>
62 #include <sys/wait.h>
63@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
64
65
66 sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
67- image_processor_t* imageProcessor = imageProcessorCreate();
68
69 while (cupsRasterReadHeader2(cups_raster, &cups_header))
70 {
71
72- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
73- if (result != IPE_SUCCESS){
74- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
75- }
76-
77 current_page_number++;
78
79 if (current_page_number == 1) {
80@@ -745,11 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
81 color_raster = rgbRaster;
82 black_raster = kRaster;
83
84- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
85- if (result != IPE_SUCCESS){
86- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
87- }
88-
89
90 if ((y == 0) && !is_ljmono) {
91 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
92@@ -780,11 +768,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
93 }
94 } // for() loop end
95
96- result = imageProcessorEndPage(imageProcessor);
97- if (result != IPE_SUCCESS){
98- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
99- }
100-
101
102 m_Job.NewPage();
103 if (err != NO_ERROR) {
104@@ -800,8 +783,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
105 rgbRaster = NULL;
106 }
107
108- imageProcessorDestroy(imageProcessor);
109-
110 unlink(hpPreProcessedRasterFile);
111 return ret_status;
112 }
113--
1142.24.1
115