|
 |
faa6c09 |
diff -up hplip-3.18.12/Makefile.am.libimageprocessor-removal hplip-3.18.12/Makefile.am
|
|
|
faa6c09 |
--- hplip-3.18.12/Makefile.am.libimageprocessor-removal 2019-01-08 12:51:08.629447883 +0100
|
|
|
faa6c09 |
+++ hplip-3.18.12/Makefile.am 2019-01-08 12:51:08.710447208 +0100
|
|
|
faa6c09 |
@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
|
|
|
faa6c09 |
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
|
|
|
faa6c09 |
endif #HPLIP_CLASS_DRIVER
|
|
|
faa6c09 |
|
|
|
faa6c09 |
-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
|
|
|
faa6c09 |
+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
|
|
|
faa6c09 |
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
|
|
|
faa6c09 |
|
|
|
faa6c09 |
if !HPLIP_CLASS_DRIVER
|
|
|
faa6c09 |
@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
|
|
|
faa6c09 |
prnt/hpcups/ImageProcessor.h
|
|
|
faa6c09 |
|
|
|
faa6c09 |
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
|
|
faa6c09 |
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
|
|
|
faa6c09 |
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
|
|
|
faa6c09 |
#else
|
|
|
faa6c09 |
#hpcupsdir = $(cupsfilterdir)
|
|
|
faa6c09 |
#hpcups_PROGRAMS = hpcups
|
|
|
faa6c09 |
@@ -684,16 +684,6 @@ endif #HPLIP_CLASS_DRIVER
|
|
|
faa6c09 |
|
|
|
faa6c09 |
install-data-hook:
|
|
|
faa6c09 |
if HPLIP_BUILD
|
|
|
faa6c09 |
- if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
|
|
|
faa6c09 |
- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
|
|
|
faa6c09 |
- chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
|
|
|
faa6c09 |
- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
|
|
|
faa6c09 |
- fi; \
|
|
|
faa6c09 |
- if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
|
|
|
faa6c09 |
- cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
|
|
|
faa6c09 |
- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
|
|
|
faa6c09 |
- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
|
|
|
faa6c09 |
- fi
|
|
|
faa6c09 |
if !HPLIP_CLASS_DRIVER
|
|
|
faa6c09 |
# If scanner build, add hpaio entry to sane dll.conf.
|
|
|
faa6c09 |
if [ "$(scan_build)" = "yes" ]; then \
|
|
|
faa6c09 |
diff -up hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp.libimageprocessor-removal hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp
|
|
|
faa6c09 |
--- hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp.libimageprocessor-removal 2019-01-08 12:51:08.619447966 +0100
|
|
|
faa6c09 |
+++ hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp 2019-01-08 12:52:39.321686854 +0100
|
|
|
faa6c09 |
@@ -31,7 +31,6 @@
|
|
|
faa6c09 |
\*****************************************************************************/
|
|
|
faa6c09 |
|
|
|
faa6c09 |
#include "HPCupsFilter.h"
|
|
|
faa6c09 |
-#include "ImageProcessor.h"
|
|
|
faa6c09 |
|
|
|
faa6c09 |
#include <signal.h>
|
|
|
faa6c09 |
#include <sys/wait.h>
|
|
|
faa6c09 |
@@ -645,16 +644,10 @@ int HPCupsFilter::processRasterData(cups
|
|
|
faa6c09 |
|
|
|
faa6c09 |
|
|
|
faa6c09 |
snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
|
|
|
faa6c09 |
- image_processor_t* imageProcessor = imageProcessorCreate();
|
|
|
faa6c09 |
|
|
|
faa6c09 |
while (cupsRasterReadHeader2(cups_raster, &cups_header))
|
|
|
faa6c09 |
{
|
|
|
faa6c09 |
|
|
|
faa6c09 |
- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
|
|
|
faa6c09 |
- if (result != IPE_SUCCESS){
|
|
|
faa6c09 |
- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
|
|
|
faa6c09 |
- }
|
|
|
faa6c09 |
-
|
|
|
faa6c09 |
current_page_number++;
|
|
|
faa6c09 |
|
|
|
faa6c09 |
if (current_page_number == 1) {
|
|
|
faa6c09 |
@@ -753,12 +746,6 @@ int HPCupsFilter::processRasterData(cups
|
|
|
faa6c09 |
color_raster = rgbRaster;
|
|
|
faa6c09 |
black_raster = kRaster;
|
|
|
faa6c09 |
|
|
|
faa6c09 |
- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
|
|
|
faa6c09 |
- if (result != IPE_SUCCESS){
|
|
|
faa6c09 |
- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
|
|
|
faa6c09 |
- }
|
|
|
faa6c09 |
-
|
|
|
faa6c09 |
-
|
|
|
faa6c09 |
if ((y == 0) && !is_ljmono) {
|
|
|
faa6c09 |
//For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
|
|
|
faa6c09 |
//may not skip blank lines before actual data
|
|
|
faa6c09 |
@@ -788,12 +775,6 @@ int HPCupsFilter::processRasterData(cups
|
|
|
faa6c09 |
}
|
|
|
faa6c09 |
} // for() loop end
|
|
|
faa6c09 |
|
|
|
faa6c09 |
- result = imageProcessorEndPage(imageProcessor);
|
|
|
faa6c09 |
- if (result != IPE_SUCCESS){
|
|
|
faa6c09 |
- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
|
|
|
faa6c09 |
- }
|
|
|
faa6c09 |
-
|
|
|
faa6c09 |
-
|
|
|
faa6c09 |
m_Job.NewPage();
|
|
|
faa6c09 |
if (err != NO_ERROR) {
|
|
|
faa6c09 |
break;
|
|
|
faa6c09 |
@@ -808,8 +789,6 @@ int HPCupsFilter::processRasterData(cups
|
|
|
faa6c09 |
rgbRaster = NULL;
|
|
|
faa6c09 |
}
|
|
|
faa6c09 |
|
|
|
faa6c09 |
- imageProcessorDestroy(imageProcessor);
|
|
|
faa6c09 |
-
|
|
|
faa6c09 |
unlink(hpPreProcessedRasterFile);
|
|
|
faa6c09 |
return ret_status;
|
|
|
faa6c09 |
}
|