summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2016-07-22 09:32:50 +0200
committerDidier Raboud <odyx@debian.org>2017-10-18 19:07:33 +0200
commit48cc860a8ac35ef02f5b2b460ae31961efe27b25 (patch)
treec76507834e4dfb9e1379a4fa5eb2b4c0a1fc59ac
parent0dc2cd1869b0d4afbf7abfce67aff76aeb91820e (diff)
Cope with prnt/hpcups/ErnieFilter.{cpp,h} removal by disabling the functionality
Origin: vendor Patch-Name: cope-with-ErnieFilter-absence.patch
-rw-r--r--Makefile.am2
-rw-r--r--prnt/hpcups/Pcl3Gui2.cpp17
-rw-r--r--prnt/hpcups/Pcl3Gui2.h1
3 files changed, 1 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index 15287714f..06c1f61c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -519,7 +519,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
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 \
diff --git a/prnt/hpcups/Pcl3Gui2.cpp b/prnt/hpcups/Pcl3Gui2.cpp
index 893bcfd7c..1678c3989 100644
--- 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 @@ DRIVER_ERROR Pcl3Gui2::Configure(Pipeline **pipeline)
}
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;
diff --git a/prnt/hpcups/Pcl3Gui2.h b/prnt/hpcups/Pcl3Gui2.h
index 890707831..543f8bd76 100644
--- a/prnt/hpcups/Pcl3Gui2.h
+++ b/prnt/hpcups/Pcl3Gui2.h
@@ -60,7 +60,6 @@ private:
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;
};