31a7a6c1ee
Since files for Hbpl1 printers were removed until the licensing is cleared up, try to fall back to proprietary plugin.
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index a3be3f1..0c74a12 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -583,10 +583,8 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
|
|
prnt/hpcups/dj3600ColorMaps.cpp prnt/hpcups/dj3320PrintModes.h \
|
|
prnt/hpcups/dj4100PrintModes.h \
|
|
prnt/hpcups/Hbpl1.cpp prnt/hpcups/Hbpl1.h prnt/hpcups/Hbpl1_Wrapper.h prnt/hpcups/PCLmGenerator.h \
|
|
- prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
|
|
- prnt/hpcups/genPCLm.h \
|
|
- common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
|
|
- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
|
|
+ prnt/hpcups/flate_colorspace.h \
|
|
+ common/utils.c common/utils.h \
|
|
prnt/hpcups/ImageProcessor.h
|
|
|
|
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
|
diff --git a/prnt/hpcups/Hbpl1.cpp b/prnt/hpcups/Hbpl1.cpp
|
|
index 74a67f0..48f5f94 100644
|
|
--- a/prnt/hpcups/Hbpl1.cpp
|
|
+++ b/prnt/hpcups/Hbpl1.cpp
|
|
@@ -60,7 +60,7 @@ Hbpl1::Hbpl1 () : Encapsulator ()
|
|
m_ColorMode = COLORTYPE_BOTH; //Grayscale
|
|
m_ColorTheme = NONE;
|
|
|
|
- /*m_hHPLibHandle = load_plugin_library(UTILS_PRINT_PLUGIN_LIBRARY, PRNT_PLUGIN_HBPL1);
|
|
+ m_hHPLibHandle = load_plugin_library(UTILS_PRINT_PLUGIN_LIBRARY, PRNT_PLUGIN_HBPL1);
|
|
if (m_hHPLibHandle)
|
|
{
|
|
dlerror ();
|
|
@@ -71,12 +71,7 @@ Hbpl1::Hbpl1 () : Encapsulator ()
|
|
|
|
if ((m_pHbpl1Wrapper = fptr_create(this)) == NULL)
|
|
m_init = false;
|
|
- }*/
|
|
- m_pHbpl1Wrapper = new Hbpl1Wrapper(this);
|
|
- if(m_pHbpl1Wrapper == NULL)
|
|
- m_init = false;
|
|
- else
|
|
- m_init = true;
|
|
+ }
|
|
}
|
|
|
|
Hbpl1::~Hbpl1()
|
|
@@ -93,8 +88,8 @@ Hbpl1::~Hbpl1()
|
|
if(fptr_destroy)
|
|
fptr_destroy( m_pHbpl1Wrapper );
|
|
|
|
- //unload_library(m_hHPLibHandle);
|
|
- //m_hHPLibHandle = NULL;
|
|
+ unload_library(m_hHPLibHandle);
|
|
+ m_hHPLibHandle = NULL;
|
|
}
|
|
}
|
|
|