Bug#816870: hplip: contains non-free code

[Didier 'OdyX' Raboud]

Control: tags -1 +pending +patch.

Hi Julian,

Le dimanche, 6 mars 2016, 02.26:14 h CEST Julian Andres Klode a écrit :
> In prnt/hpcups, the headers of ErnieFilter.cpp and .h say:
> 
> // This software is licensed solely for use with HP products. Redistribution
> // and use with HP products in source and binary forms, with or without //
> modification, are permitted provided that the following conditions are met:
> 
> As such, the code is non-free because I cannot safely redistribute it. 

Without any indication of progress from upstream, I went and checked if it was 
possible to compile hplip without these two files, it seems possible.

I'll go ahead and upload a new repack'ed package without these two files and 
the attached patch. We'll see if that brings regressions.

--
Cheers,
    OdyX
Description: Cope with prnt/hpcups/ErnieFilter.{cpp,h} removal by disabling the
 functionality
Origin: vendor
Author: Didier Raboud <o...@debian.org>
Last-Update: 2016-07-10

--- a/Makefile.am
+++ b/Makefile.am
@@ -519,7 +519,7 @@
 	prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \
 	prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \
 	prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \
-	prnt/hpcups/ErnieFilter.cpp prnt/hpcups/ErnieFilter.h prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
+	prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
 	prnt/hpcups/Encapsulator.cpp prnt/hpcups/Encapsulator.h prnt/hpcups/Pcl3.cpp prnt/hpcups/Pcl3.h \
 	prnt/hpcups/Pcl3Gui.cpp prnt/hpcups/Pcl3Gui.h prnt/hpcups/Pcl3Gui2.cpp prnt/hpcups/Pcl3Gui2.h \
 	prnt/hpcups/LJMono.cpp prnt/hpcups/LJMono.h prnt/hpcups/LJColor.cpp prnt/hpcups/LJColor.h \
--- a/prnt/hpcups/Pcl3Gui2.cpp
+++ b/prnt/hpcups/Pcl3Gui2.cpp
@@ -30,7 +30,6 @@
 
 #include "CommonDefinitions.h"
 #include "Pcl3Gui2.h"
-#include "ErnieFilter.h"
 #include "Mode10.h"
 #include "Mode9.h"
 #include "PrinterCommands.h"
@@ -38,7 +37,6 @@
 Pcl3Gui2::Pcl3Gui2() : Encapsulator()
 {
     speed_mech_enabled = true;
-    m_run_ernie_filter = true;
     crd_type = eCrd_both;
     strcpy(m_szLanguage, "PCL3GUI");
 }
@@ -59,21 +57,6 @@
     }
 
     width = m_pMA->printable_width;;
-    if (m_run_ernie_filter) {
-	    ErnieFilter    *pErnie;
-
-       // Normal: threshold = (resolution) * (0.0876) - 2
-       int threshold = ((m_pQA->horizontal_resolution * 876) / 10000) - 2;
-
-       pErnie = new ErnieFilter (width, eBGRPixelData, threshold);
-       p = new Pipeline (pErnie);
-       if (head) {
-          head->AddPhase (p);
-       }
-       else {
-           head = p;
-       }
-    }
 
     if (crd_type != eCrd_black_only) {
         Mode10    *pMode10;
--- a/prnt/hpcups/Pcl3Gui2.h
+++ b/prnt/hpcups/Pcl3Gui2.h
@@ -60,7 +60,6 @@
     DRIVER_ERROR encapsulateRaster(BYTE *input_raster, unsigned int num_bytes, COLORTYPE c_type);
     bool    speed_mech_enabled;
     int     page_number;
-    bool    m_run_ernie_filter;
     eCrdType    crd_type;
 };
 

signature.asc
Description: This is a digitally signed message part.