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

动态加载dll改为绝对路径

This commit is contained in:
luoliangyi 2022-07-30 09:36:16 +08:00
parent c6242a99ed
commit efffae7369
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/imgfmt/HGPdfImpl.cpp
View File

@ -61,20 +61,17 @@ HGResult HGPdfReaderImpl::Open(const HGChar* fileName)
assert(NULL == m_dll); assert(NULL == m_dll);
HGChar oldDir[256];
HGBase_GetCurrentDir(oldDir, 256);
HGChar moduleName[256]; HGChar moduleName[256];
HGBase_GetModuleName(union_cast<void*>(&HGPdfReaderImpl::Open), moduleName, 256); HGBase_GetModuleName(union_cast<void*>(&HGPdfReaderImpl::Open), moduleName, 256);
HGChar newDir[256]; HGChar dllPath[256];
HGBase_GetFilePath(moduleName, newDir, 256); HGBase_GetFilePath(moduleName, dllPath, 256);
HGBase_SetCurrentDir(newDir);
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
HGResult ret = HGBase_CreateDll("libmupdf.dll", &m_dll); strcat(dllPath, "libmupdf.dll");
#else #else
HGResult ret = HGBase_CreateDll("libmupdf.so", &m_dll); strcat(dllPath, "libmupdf.so");
#endif #endif
HGBase_SetCurrentDir(oldDir); HGResult ret = HGBase_CreateDll(dllPath, &m_dll);
if (HGBASE_ERR_OK != ret) if (HGBASE_ERR_OK != ret)
{ {
return ret; return ret;
@ -561,20 +558,17 @@ HGResult HGPdfImageWriterImpl::Open(const HGChar* fileName)
assert(NULL == m_dll); assert(NULL == m_dll);
HGChar oldDir[256];
HGBase_GetCurrentDir(oldDir, 256);
HGChar moduleName[256]; HGChar moduleName[256];
HGBase_GetModuleName(union_cast<void*>(&HGPdfImageWriterImpl::Open), moduleName, 256); HGBase_GetModuleName(union_cast<void*>(&HGPdfImageWriterImpl::Open), moduleName, 256);
HGChar newDir[256]; HGChar dllPath[256];
HGBase_GetFilePath(moduleName, newDir, 256); HGBase_GetFilePath(moduleName, dllPath, 256);
HGBase_SetCurrentDir(newDir);
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
HGResult ret = HGBase_CreateDll("pdflib.dll", &m_dll); strcat(dllPath, "pdflib.dll");
#else #else
HGResult ret = HGBase_CreateDll("libpdf.so", &m_dll); strcat(dllPath, "pdflib.so");
#endif #endif
HGBase_SetCurrentDir(oldDir); HGResult ret = HGBase_CreateDll(dllPath, &m_dll);
if (HGBASE_ERR_OK != ret) if (HGBASE_ERR_OK != ret)
{ {
return ret; return ret;

13
modules/imgproc/HGOCRHanvon.cpp
View File

@ -38,20 +38,17 @@ HGResult HGOCRHanvon::Init()
assert(NULL == m_dll); assert(NULL == m_dll);
HGChar oldDir[256];
HGBase_GetCurrentDir(oldDir, 256);
HGChar moduleName[256]; HGChar moduleName[256];
HGBase_GetModuleName(union_cast<void*>(&HGOCRHanvon::Init), moduleName, 256); HGBase_GetModuleName(union_cast<void*>(&HGOCRHanvon::Init), moduleName, 256);
HGChar newDir[256]; HGChar dllPath[256];
HGBase_GetFilePath(moduleName, newDir, 256); HGBase_GetFilePath(moduleName, dllPath, 256);
HGBase_SetCurrentDir(newDir);
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
HGResult ret = HGBase_CreateDll("hanwangOCRdetect.dll", &m_dll); strcat(dllPath, "hanwangOCRdetect.dll");
#else #else
HGResult ret = HGBase_CreateDll("libhwocrdetect.so", &m_dll); strcat(dllPath, "libhwocrdetect.so");
#endif #endif
HGBase_SetCurrentDir(oldDir); HGResult ret = HGBase_CreateDll(dllPath, &m_dll);
if (HGBASE_ERR_OK != ret) if (HGBASE_ERR_OK != ret)
{ {
return ret; return ret;