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

Merge branch 'master' of http://192.168.10.5:8099/sane/code_app

This commit is contained in:
luoliangyi 2023-02-17 12:00:06 +08:00
parent b0cfaf2b0f 78c92fbf33
commit 7bb7a48095
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scanner/Scanner_resource.qrc
View File

@ -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>

6
app/scanner/dialog_exportimagefile.cpp
View File

@ -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);

4
app/scanner/mainwindow.cpp
View File

@ -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;