SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/hplip/stuff/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch	Sun Mar 24 15:17:37 2024 +0000
     1.3 @@ -0,0 +1,113 @@
     1.4 +From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
     1.5 +From: Didier Raboud <odyx@debian.org>
     1.6 +Date: Tue, 21 Aug 2018 18:18:10 +0200
     1.7 +Subject: Remove all ImageProcessor functionality, which is closed-source
     1.8 +
     1.9 +---
    1.10 + Makefile.am                  | 14 ++------------
    1.11 + prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
    1.12 + 2 files changed, 2 insertions(+), 33 deletions(-)
    1.13 +
    1.14 +diff --git a/Makefile.am b/Makefile.am
    1.15 +index 1b097c4f9..8d5d78c9f 100644
    1.16 +--- a/Makefile.am
    1.17 ++++ b/Makefile.am
    1.18 +@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
    1.19 + dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
    1.20 + endif #HPLIP_CLASS_DRIVER
    1.21 + 
    1.22 +-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
    1.23 ++dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
    1.24 + 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
    1.25 + 
    1.26 + if !HPLIP_CLASS_DRIVER
    1.27 +@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
    1.28 + 	prnt/hpcups/ImageProcessor.h
    1.29 + 
    1.30 + hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
    1.31 +-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
    1.32 ++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
    1.33 + #else
    1.34 + #hpcupsdir = $(cupsfilterdir)
    1.35 + #hpcups_PROGRAMS = hpcups
    1.36 +@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
    1.37 + 
    1.38 + install-data-hook:
    1.39 + if HPLIP_BUILD
    1.40 +-	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
    1.41 +-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
    1.42 +-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
    1.43 +-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
    1.44 +-	fi; \
    1.45 +-	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
    1.46 +-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
    1.47 +-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
    1.48 +-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
    1.49 +-	fi
    1.50 + if !HPLIP_CLASS_DRIVER
    1.51 + #	   If scanner build, add hpaio entry to sane dll.conf.
    1.52 + 	if [ "$(scan_build)" = "yes" ]; then \
    1.53 +diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
    1.54 +index 5b282d83f..0bacfafac 100644
    1.55 +--- a/prnt/hpcups/HPCupsFilter.cpp
    1.56 ++++ b/prnt/hpcups/HPCupsFilter.cpp
    1.57 +@@ -31,7 +31,6 @@
    1.58 + \*****************************************************************************/
    1.59 + 
    1.60 + #include "HPCupsFilter.h"
    1.61 +-#include "ImageProcessor.h"
    1.62 + 
    1.63 + #include <signal.h>
    1.64 + #include <sys/wait.h>
    1.65 +@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
    1.66 + 
    1.67 + 
    1.68 +     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
    1.69 +-    image_processor_t* imageProcessor = imageProcessorCreate();
    1.70 + 
    1.71 +     while (cupsRasterReadHeader2(cups_raster, &cups_header))
    1.72 +     {
    1.73 + 
    1.74 +-        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
    1.75 +-        if (result != IPE_SUCCESS){
    1.76 +-            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
    1.77 +-        }
    1.78 +-
    1.79 +         current_page_number++;
    1.80 + 
    1.81 +         if (current_page_number == 1) {
    1.82 +@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
    1.83 +             color_raster = rgbRaster;
    1.84 +             black_raster = kRaster;
    1.85 + 
    1.86 +-            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
    1.87 +-            if (result != IPE_SUCCESS){
    1.88 +-                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
    1.89 +-            }
    1.90 +-
    1.91 +-
    1.92 +             if ((y == 0) && !is_ljmono) {
    1.93 +                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
    1.94 +                 //may not skip blank lines before actual data
    1.95 +@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
    1.96 +             }
    1.97 +         }  // for() loop end
    1.98 + 
    1.99 +-        result = imageProcessorEndPage(imageProcessor);
   1.100 +-        if (result != IPE_SUCCESS){
   1.101 +-                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
   1.102 +-        }
   1.103 +-
   1.104 +-
   1.105 +         m_Job.NewPage();
   1.106 +         if (err != NO_ERROR) {
   1.107 +             break;
   1.108 +@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
   1.109 +         rgbRaster = NULL;
   1.110 +     }
   1.111 + 
   1.112 +-    imageProcessorDestroy(imageProcessor);
   1.113 +-
   1.114 +     unlink(hpPreProcessedRasterFile);
   1.115 +     return ret_status;
   1.116 + }