SliTaz Repositories

1 From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001

2 From: Didier Raboud <odyx@debian.org>

3 Date: Tue, 21 Aug 2018 18:18:10 +0200

4 Subject: Remove all ImageProcessor functionality, which is closed-source

5

6 ---

7 Makefile.am | 14 ++------------

8 prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------

9 2 files changed, 2 insertions(+), 33 deletions(-)

10

11 diff --git a/Makefile.am b/Makefile.am

12 index 1b097c4f9..8d5d78c9f 100644

13 --- a/Makefile.am

14 +++ b/Makefile.am

15 @@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER

16 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py

17 endif #HPLIP_CLASS_DRIVER

18

19 -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

20 +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template

21 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

22

23 if !HPLIP_CLASS_DRIVER

24 @@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp

25 prnt/hpcups/ImageProcessor.h

26

27 hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)

28 -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)

29 +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)

30 #else

31 #hpcupsdir = $(cupsfilterdir)

32 #hpcups_PROGRAMS = hpcups

33 @@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER

34

35 install-data-hook:

36 if HPLIP_BUILD

37 - if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \

38 - cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \

39 - chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \

40 - ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \

41 - fi; \

42 - if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \

43 - cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \

44 - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \

45 - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \

46 - fi

47 if !HPLIP_CLASS_DRIVER

48 # If scanner build, add hpaio entry to sane dll.conf.

49 if [ "$(scan_build)" = "yes" ]; then \

50 diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp

51 index 5b282d83f..0bacfafac 100644

52 --- a/prnt/hpcups/HPCupsFilter.cpp

53 +++ b/prnt/hpcups/HPCupsFilter.cpp

54 @@ -31,7 +31,6 @@

55 \*****************************************************************************/

56

57 #include "HPCupsFilter.h"

58 -#include "ImageProcessor.h"

59

60 #include <signal.h>

61 #include <sys/wait.h>

62 @@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)

63

64

65 sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);

66 - image_processor_t* imageProcessor = imageProcessorCreate();

67

68 while (cupsRasterReadHeader2(cups_raster, &cups_header))

69 {

70

71 - IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);

72 - if (result != IPE_SUCCESS){

73 - dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);

74 - }

75 -

76 current_page_number++;

77

78 if (current_page_number == 1) {

79 @@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)

80 color_raster = rgbRaster;

81 black_raster = kRaster;

82

83 - result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);

84 - if (result != IPE_SUCCESS){

85 - dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);

86 - }

87 -

88 -

89 if ((y == 0) && !is_ljmono) {

90 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer

91 //may not skip blank lines before actual data

92 @@ -780,12 +767,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 break;

105 @@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)

106 rgbRaster = NULL;

107 }

108

109 - imageProcessorDestroy(imageProcessor);

110 -

111 unlink(hpPreProcessedRasterFile);

112 return ret_status;

113 }