lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows ocr取消进度条有问题，先禁用

This commit is contained in:
luoliangyi 2022-08-23 11:30:50 +08:00
parent bda7f11f7e
commit 37602926de
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/imgproc/HGOCRHanvon.cpp
View File

@ -8,7 +8,7 @@
#include "../imgfmt/HGJpeg.h" #include "../imgfmt/HGJpeg.h"
HGUInt HGOCRHanvon::m_refCount = 0; HGUInt HGOCRHanvon::m_refCount = 0;
HGOCRHanvon* HGOCRHanvon::m_OCR = NULL; //HGOCRHanvon* HGOCRHanvon::m_OCR = NULL;
HGOCRHanvon::HGOCRHanvon() HGOCRHanvon::HGOCRHanvon()
{ {
@ -17,7 +17,7 @@ HGOCRHanvon::HGOCRHanvon()
m_imageList.clear(); m_imageList.clear();
m_func = NULL; m_func = NULL;
m_param = NULL; m_param = NULL;
m_FuncRet = 0; //m_FuncRet = 0;
} }
HGOCRHanvon::~HGOCRHanvon() HGOCRHanvon::~HGOCRHanvon()
@ -259,7 +259,7 @@ HGResult HGOCRHanvon::ImageListOCRToFile(HGUInt outType, const HGChar* outFileNa
return HGBASE_ERR_FAIL; return HGBASE_ERR_FAIL;
} }
m_OCR = this; //m_OCR = this;
m_func = func; m_func = func;
m_param = param; m_param = param;
@ -280,14 +280,14 @@ HGResult HGOCRHanvon::ImageListOCRToFile(HGUInt outType, const HGChar* outFileNa
delete[] ppImageFiles; delete[] ppImageFiles;
m_param = NULL; m_param = NULL;
m_func = NULL; m_func = NULL;
m_OCR = NULL; //m_OCR = NULL;
return HGIMGPROC_ERR_FAIL; return HGIMGPROC_ERR_FAIL;
} }
delete[] ppImageFiles; delete[] ppImageFiles;
m_param = NULL; m_param = NULL;
m_func = NULL; m_func = NULL;
m_OCR = NULL; //m_OCR = NULL;
return HGBASE_ERR_OK; return HGBASE_ERR_OK;
} }
@ -427,15 +427,11 @@ int HGOCRHanvon::HWOCR_RecognizeFileBatch(char** ppImageFiles, unsigned char* Ou
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
int HGOCRHanvon::RecogProgress(int nPercent) int HGOCRHanvon::RecogProgress(int nPercent)
{ {
if (NULL != m_OCR->m_func)
m_OCR->m_FuncRet = m_OCR->m_func((HGUInt)m_OCR->m_imageList.size(), (HGUInt)nPercent, m_OCR->m_param);
return 0; return 0;
} }
int HGOCRHanvon::IsCanceled() int HGOCRHanvon::IsCanceled()
{ {
if (0 != m_OCR->m_FuncRet)
return 1;
return 0; return 0;
} }
#endif #endif

4
modules/imgproc/HGOCRHanvon.hpp
View File

@ -48,13 +48,13 @@ private:
private: private:
static HGUInt m_refCount; static HGUInt m_refCount;
static HGOCRHanvon* m_OCR; //static HGOCRHanvon* m_OCR;
HGDll m_dll; HGDll m_dll;
void* m_ocrHandle; void* m_ocrHandle;
std::vector<std::string> m_imageList; std::vector<std::string> m_imageList;
HGImageListOcrFunc m_func; HGImageListOcrFunc m_func;
HGPointer m_param; HGPointer m_param;
HGInt m_FuncRet; //HGInt m_FuncRet;
}; };
#endif /* __HGOCRHANVON_HPP__ */ #endif /* __HGOCRHANVON_HPP__ */