黑名单操作更新
This commit is contained in:
commit
dab0309f69
|
@ -1,4 +1,4 @@
|
||||||
#include "hg_scanner.h"
|
#include "hg_scanner.h"
|
||||||
#include "../wrapper/hg_log.h"
|
#include "../wrapper/hg_log.h"
|
||||||
#include "sane/sane_option_definitions.h"
|
#include "sane/sane_option_definitions.h"
|
||||||
#include "scanner_setting.h"
|
#include "scanner_setting.h"
|
||||||
|
@ -1913,7 +1913,6 @@ int hg_scanner::setting_text_direction(int sn, void* data)
|
||||||
}
|
}
|
||||||
else if (image_prc_param_.bits.text_direction != TEXT_DIRECTION_AUTO && ImagePrc_pHandle_)
|
else if (image_prc_param_.bits.text_direction != TEXT_DIRECTION_AUTO && ImagePrc_pHandle_)
|
||||||
{
|
{
|
||||||
printf("77777777777777777777777777777777\r\n");
|
|
||||||
hg_imgproc::free_auto_txt_hanld(ImagePrc_pHandle_);
|
hg_imgproc::free_auto_txt_hanld(ImagePrc_pHandle_);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -73,19 +73,19 @@ using namespace std;
|
||||||
//动态打开库的命名
|
//动态打开库的命名
|
||||||
#ifdef OEM_HANWANG
|
#ifdef OEM_HANWANG
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define IMGPRC_LIBNANE L"HWImgProc.dll"
|
#define IMGPRC_LIBNANE L"HwImgProc.dll"
|
||||||
#define HGBASE_LIBNAME L"HWBase.dll"
|
#define HGBASE_LIBNAME L"HwBase.dll"
|
||||||
#else
|
#else
|
||||||
#define IMGPRC_LIBNANE "libHWImgProc.so"
|
#define IMGPRC_LIBNANE "libHwImgProc.so"
|
||||||
#define HGBASE_LIBNAME "libHWBase.so"
|
#define HGBASE_LIBNAME "libHwBase.so"
|
||||||
#endif
|
#endif
|
||||||
#elif defined(OEM_LISICHENG)
|
#elif defined(OEM_LISICHENG)
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define IMGPRC_LIBNANE L"LSCImgProc.dll"
|
#define IMGPRC_LIBNANE L"LscImgProc.dll"
|
||||||
#define HGBASE_LIBNAME L"LSCBase.dll"
|
#define HGBASE_LIBNAME L"LscBase.dll"
|
||||||
#else
|
#else
|
||||||
#define IMGPRC_LIBNANE "libLSCImgProc.so"
|
#define IMGPRC_LIBNANE "libLscImgProc.so"
|
||||||
#define HGBASE_LIBNAME "libLSCBase.so"
|
#define HGBASE_LIBNAME "libLscBase.so"
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
@ -208,8 +208,12 @@ namespace hg_imgproc
|
||||||
public:
|
public:
|
||||||
imgproc(int pid) : pid_(pid),papersize_(pid_)
|
imgproc(int pid) : pid_(pid),papersize_(pid_)
|
||||||
, img_statu_(SANE_Image_Statu_OK)
|
, img_statu_(SANE_Image_Statu_OK)
|
||||||
|
,Dynamicopen_HGBase_pHandle_(NULL)
|
||||||
|
,Dynamicopen_HGImageprc_pHandle_(NULL)
|
||||||
|
|
||||||
{
|
{
|
||||||
my_path_ = hg_log::pe_path();
|
my_path_ = hg_log::pe_path();
|
||||||
|
|
||||||
}
|
}
|
||||||
~imgproc()
|
~imgproc()
|
||||||
{
|
{
|
||||||
|
@ -340,20 +344,25 @@ namespace hg_imgproc
|
||||||
}
|
}
|
||||||
int free_auto_txt_hanld()
|
int free_auto_txt_hanld()
|
||||||
{
|
{
|
||||||
int ret = 0;
|
if (Auto_Txt_pHanld)
|
||||||
if (Dynamicopen_HGImageprc_pHandle_ != NULL)
|
|
||||||
{
|
{
|
||||||
#if (!defined WIN32)
|
int ret = ocrexit_(Auto_Txt_pHanld);
|
||||||
|
Auto_Txt_pHanld = NULL;
|
||||||
|
}
|
||||||
|
int ret = 0;
|
||||||
|
if (Dynamicopen_HGImageprc_pHandle_)
|
||||||
|
{
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
ret = dlclose(Dynamicopen_HGImageprc_pHandle_);
|
ret = dlclose(Dynamicopen_HGImageprc_pHandle_);
|
||||||
#else
|
#else
|
||||||
ret = FreeLibrary(Dynamicopen_HGImageprc_pHandle_);
|
ret = FreeLibrary(Dynamicopen_HGImageprc_pHandle_);
|
||||||
#endif
|
#endif
|
||||||
Dynamicopen_HGImageprc_pHandle_ = NULL;
|
Dynamicopen_HGImageprc_pHandle_ = NULL;
|
||||||
}
|
}
|
||||||
|
if (Dynamicopen_HGBase_pHandle_)
|
||||||
if (Dynamicopen_HGBase_pHandle_ != NULL)
|
|
||||||
{
|
{
|
||||||
#if (!defined WIN32)
|
#ifndef WIN32
|
||||||
ret = dlclose(Dynamicopen_HGBase_pHandle_);
|
ret = dlclose(Dynamicopen_HGBase_pHandle_);
|
||||||
#else
|
#else
|
||||||
ret = FreeLibrary(Dynamicopen_HGBase_pHandle_);
|
ret = FreeLibrary(Dynamicopen_HGBase_pHandle_);
|
||||||
|
@ -361,11 +370,7 @@ namespace hg_imgproc
|
||||||
Dynamicopen_HGBase_pHandle_ = NULL;
|
Dynamicopen_HGBase_pHandle_ = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Auto_Txt_pHanld != NULL)
|
|
||||||
{
|
|
||||||
int ret = ocrexit_(Auto_Txt_pHanld);
|
|
||||||
Auto_Txt_pHanld = NULL;
|
|
||||||
}
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
int decode(int pid, LPSCANCONF img_param, LPIMGPRCPARAM param)
|
int decode(int pid, LPSCANCONF img_param, LPIMGPRCPARAM param)
|
||||||
|
|
Loading…
Reference in New Issue