Merge branch 'master' of http://192.168.10.5:8099/sane/code_app
This commit is contained in:
commit
7bb7a48095
|
@ -102,5 +102,6 @@
|
||||||
<file>image_rsc/scroll/vScrollSlider_Normal.png</file>
|
<file>image_rsc/scroll/vScrollSlider_Normal.png</file>
|
||||||
<file>image_rsc/scroll/vScrollSlider_Push.png</file>
|
<file>image_rsc/scroll/vScrollSlider_Push.png</file>
|
||||||
<file>image_rsc/action/btnEdit.png</file>
|
<file>image_rsc/action/btnEdit.png</file>
|
||||||
|
<file>image_rsc/logo/Microtek_logo.ico</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
|
@ -116,8 +116,12 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
|
||||||
|
|
||||||
HGImgFmt_CloseImageWriter(writer);
|
HGImgFmt_CloseImageWriter(writer);
|
||||||
|
|
||||||
createOcrPdf(tmpFileName, getStdString(fileName).c_str());
|
bool result = createOcrPdf(tmpFileName, getStdString(fileName).c_str());
|
||||||
QFile::remove(tmpFileName);
|
QFile::remove(tmpFileName);
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
ret = HGIMGPROC_ERR_OCR;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
HGOCRMgr ocrMgr = nullptr;
|
HGOCRMgr ocrMgr = nullptr;
|
||||||
ret = HGImgProc_CreateOCRMgr(0, &ocrMgr);
|
ret = HGImgProc_CreateOCRMgr(0, &ocrMgr);
|
||||||
|
|
|
@ -433,9 +433,9 @@ HGResult MainWindow::saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool
|
||||||
HGChar tmpFileName[256];
|
HGChar tmpFileName[256];
|
||||||
HGBase_GetTmpFileName("bmp", tmpFileName, 256);
|
HGBase_GetTmpFileName("bmp", tmpFileName, 256);
|
||||||
ret = HGImgFmt_SaveImage(image, 0, info, tmpFileName);
|
ret = HGImgFmt_SaveImage(image, 0, info, tmpFileName);
|
||||||
createOcrPdf(tmpFileName, fileName);
|
bool result = createOcrPdf(tmpFileName, fileName);
|
||||||
QFile::remove(tmpFileName);
|
QFile::remove(tmpFileName);
|
||||||
return ret;
|
return (result) ? HGBASE_ERR_OK : HGIMGPROC_ERR_OCR;
|
||||||
#else
|
#else
|
||||||
// 韫囩晫鏆恑nfo
|
// 韫囩晫鏆恑nfo
|
||||||
HGOCRMgr ocrMgr = nullptr;
|
HGOCRMgr ocrMgr = nullptr;
|
||||||
|
|
Loading…
Reference in New Issue