diff options
Diffstat (limited to 'source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch')
| -rw-r--r-- | source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch b/source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch index 5bf433281..8d3b4d7bf 100644 --- a/source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch +++ b/source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch @@ -1,4 +1,4 @@ -From b78107ce36b7a8602479222f1ee806566727c8de Mon Sep 17 00:00:00 2001 +From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 21 Aug 2018 18:18:10 +0200 Subject: Remove all ImageProcessor functionality, which is closed-source @@ -9,10 +9,10 @@ Subject: Remove all ImageProcessor functionality, which is closed-source 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 7eb645149..cc7e89611 100644 +index 1b097c4f9..8d5d78c9f 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -164,7 +164,7 @@ if !HPLIP_CLASS_DRIVER +@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py endif #HPLIP_CLASS_DRIVER @@ -21,16 +21,16 @@ index 7eb645149..cc7e89611 100644 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 -@@ -588,7 +588,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp +@@ -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) -@@ -681,16 +681,6 @@ endif #HPLIP_CLASS_DRIVER + #hpcups_PROGRAMS = hpcups +@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER install-data-hook: if HPLIP_BUILD @@ -48,7 +48,7 @@ index 7eb645149..cc7e89611 100644 # 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 413daa3c5..7c1e8566c 100644 +index 5b282d83f..0bacfafac 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -31,7 +31,6 @@ @@ -59,7 +59,7 @@ index 413daa3c5..7c1e8566c 100644 #include <signal.h> #include <sys/wait.h> -@@ -637,17 +636,11 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) +@@ -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); @@ -67,7 +67,6 @@ index 413daa3c5..7c1e8566c 100644 while (cupsRasterReadHeader2(cups_raster, &cups_header)) { - dbglog("DEBUG: SHIVA inside the while loop"); - IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); - if (result != IPE_SUCCESS){ @@ -77,7 +76,7 @@ index 413daa3c5..7c1e8566c 100644 current_page_number++; if (current_page_number == 1) { -@@ -746,12 +739,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) +@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) color_raster = rgbRaster; black_raster = kRaster; @@ -90,7 +89,7 @@ index 413daa3c5..7c1e8566c 100644 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 -@@ -781,12 +768,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) +@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) } } // for() loop end @@ -103,7 +102,7 @@ index 413daa3c5..7c1e8566c 100644 m_Job.NewPage(); if (err != NO_ERROR) { break; -@@ -801,8 +782,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) +@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) rgbRaster = NULL; } |