147 lines
6.5 KiB
Diff
147 lines
6.5 KiB
Diff
--- a/Makefile.am 2020-04-14 13:27:46.599954079 +0300
|
|
+++ b/Makefile.am 2020-04-14 13:33:57.864969783 +0300
|
|
@@ -166,7 +166,7 @@
|
|
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 @@
|
|
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
|
|
@@ -684,16 +684,6 @@
|
|
|
|
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 \
|
|
--- a/Makefile.in 2020-04-14 14:02:23.563041928 +0300
|
|
+++ b/Makefile.in 2020-04-14 14:14:16.635072088 +0300
|
|
@@ -103,7 +103,7 @@
|
|
|
|
# ip library
|
|
@HPLIP_BUILD_TRUE@am__append_12 = libhpip.la
|
|
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
|
|
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_14 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ installer/text_install.py \
|
|
@@ -728,8 +728,7 @@
|
|
am__dist_models_DATA_DIST = data/models/models.dat
|
|
am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \
|
|
prnt/drv/hpcups.drv.in.template \
|
|
- prnt/hpcups/libImageProcessor-x86_64.so \
|
|
- prnt/hpcups/libImageProcessor-x86_32.so scan/sane/hpaio.desc \
|
|
+ scan/sane/hpaio.desc \
|
|
installer/text_install.py data/localization/hplip_de.ts \
|
|
data/localization/hplip_es.ts data/localization/hplip_fr.ts \
|
|
data/localization/hplip_it.ts data/localization/hplip_pt.ts \
|
|
@@ -4814,7 +4813,7 @@
|
|
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
|
|
|
|
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
|
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
|
|
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
|
|
#else
|
|
#hpcupsdir = $(cupsfilterdir)
|
|
#hpcups_PROGRAMS = hpcups
|
|
@@ -9585,16 +9584,6 @@
|
|
|
|
|
|
install-data-hook:
|
|
-@HPLIP_BUILD_TRUE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
|
|
-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
|
|
-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
|
|
-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
|
|
-@HPLIP_BUILD_TRUE@ fi; \
|
|
-@HPLIP_BUILD_TRUE@ if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
|
|
-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
|
|
-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
|
|
-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
|
|
-@HPLIP_BUILD_TRUE@ fi
|
|
# If scanner build, add hpaio entry to sane dll.conf.
|
|
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \
|
|
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
|
|
--- a/prnt/hpcups/HPCupsFilter.cpp 2020-04-14 13:28:25.108955708 +0300
|
|
+++ b/prnt/hpcups/HPCupsFilter.cpp 2020-04-14 13:37:24.727978532 +0300
|
|
@@ -31,7 +31,6 @@
|
|
\*****************************************************************************/
|
|
|
|
#include "HPCupsFilter.h"
|
|
-#include "ImageProcessor.h"
|
|
|
|
#include <signal.h>
|
|
#include <sys/wait.h>
|
|
@@ -637,16 +636,10 @@
|
|
|
|
|
|
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 @@
|
|
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 @@
|
|
}
|
|
} // 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 @@
|
|
rgbRaster = NULL;
|
|
}
|
|
|
|
- imageProcessorDestroy(imageProcessor);
|
|
-
|
|
unlink(hpPreProcessedRasterFile);
|
|
return ret_status;
|
|
}
|