Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
7fd4343f24
|
@ -43,13 +43,14 @@ HGResult HGAPI HGBase_CreateDll(const HGChar* fileName, HGDll* dll)
|
|||
void* hDll = dlopen(fileName, RTLD_LAZY);
|
||||
if (NULL == hDll)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "dlopen Failed, err=%s", dlerror());
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "dlopen Failed, err=%s", dlerror());
|
||||
return HGBASE_ERR_FAIL;
|
||||
}
|
||||
#else
|
||||
HMODULE hDll = LoadLibraryExA((const char *)fileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
|
||||
if (NULL == hDll)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "dlopen Failed, err=%u", GetLastError());
|
||||
return HGBASE_ERR_FAIL;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -43,8 +43,7 @@ HGResult HGInfoImpl::Enable()
|
|||
HGBase_GetProfileInt(cfgPath, "info", "writeLog", 1, &writeLog);
|
||||
HGBool writeConsole;
|
||||
HGBase_GetProfileInt(cfgPath, "info", "writeConsole", 0, &writeConsole);
|
||||
HGUInt defType = HGBASE_INFOTYPE_FATAL | HGBASE_INFOTYPE_ERROR | HGBASE_INFOTYPE_WARNING
|
||||
| HGBASE_INFOTYPE_DESC | HGBASE_INFOTYPE_DEBUG;
|
||||
HGUInt defType = HGBASE_INFOTYPE_FATAL | HGBASE_INFOTYPE_ERROR | HGBASE_INFOTYPE_WARNING;
|
||||
HGBase_GetProfileInt(cfgPath, "info", "type", (HGInt)defType, (HGInt*)&m_type);
|
||||
HGBase_GetProfileInt(cfgPath, "info", "showTime", 1, &m_showTime);
|
||||
HGBase_GetProfileInt(cfgPath, "info", "showId", 0, &m_showId);
|
||||
|
|
|
@ -64,7 +64,7 @@ HGResult HGPdfReaderImpl::Open(const HGChar* fileName)
|
|||
HGResult ret = HGBase_CreateDll(dllPath, &m_dll);
|
||||
if (HGBASE_ERR_OK != ret)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "Load PDF Library Failed, path=%s", dllPath);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "Load PDF Library Failed, path=%s", dllPath);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -568,7 +568,7 @@ HGResult HGPdfImageWriterImpl::Open(const HGChar* fileName)
|
|||
HGResult ret = HGBase_CreateDll(dllPath, &m_dll);
|
||||
if (HGBASE_ERR_OK != ret)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "Load PDF Library Failed, path=%s", dllPath);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "Load PDF Library Failed, path=%s", dllPath);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -47,13 +47,13 @@ HGResult HGOCRHanvon::Init()
|
|||
HGResult ret = HGBase_CreateDll(dllPath, &m_dll);
|
||||
if (HGBASE_ERR_OK != ret)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "Load OCR Library Failed, path=%s", dllPath);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "Load OCR Library Failed, path=%s", dllPath);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (0 != HWOCR_SDKInitialize(&m_ocrHandle))
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "Init OCR Library Failed");
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "Init OCR Library Failed");
|
||||
HGBase_DestroyDll(m_dll);
|
||||
m_dll = NULL;
|
||||
return HGIMGPROC_ERR_FAIL;
|
||||
|
|
|
@ -30,7 +30,7 @@ HGResult HGOCRTesseract::Init()
|
|||
m_baseApi = TessBaseAPICreate();
|
||||
if (NULL == m_baseApi)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "Init OCR Library Failed");
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "Init OCR Library Failed");
|
||||
return HGIMGPROC_ERR_FAIL;
|
||||
}
|
||||
|
||||
|
@ -43,7 +43,7 @@ HGResult HGOCRTesseract::Init()
|
|||
int rc = TessBaseAPIInit3(m_baseApi, dataPath, "chi_sim");
|
||||
if (0 != rc)
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "Init OCR Library Failed 2");
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "Init OCR Library Failed 2");
|
||||
TessBaseAPIDelete(m_baseApi);
|
||||
m_baseApi = NULL;
|
||||
return HGIMGPROC_ERR_FAIL;
|
||||
|
|
|
@ -39,7 +39,7 @@ bool WebServer::Open(HGUShort port)
|
|||
if (-1 == sockServer)
|
||||
#endif
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 1, port=%u", port);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 1, port=%u", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -63,7 +63,7 @@ bool WebServer::Open(HGUShort port)
|
|||
#else
|
||||
close(sockServer);
|
||||
#endif
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 2, port=%u", port);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 2, port=%u", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -75,7 +75,7 @@ bool WebServer::Open(HGUShort port)
|
|||
#else
|
||||
close(sockServer);
|
||||
#endif
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 3, port=%u", port);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 3, port=%u", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -135,6 +135,10 @@ namespace ver_2
|
|||
ret = sqlite3_finalize(stmt);
|
||||
assert(0 == ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open database failed");
|
||||
}
|
||||
|
||||
m_bindFolder.clear();
|
||||
m_bindNameMode.clear();
|
||||
|
|
|
@ -44,7 +44,7 @@ bool WebServer::Open(HGUShort port)
|
|||
if (-1 == sockServer)
|
||||
#endif
|
||||
{
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 1, port=%u", port);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 1, port=%u", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -68,7 +68,7 @@ bool WebServer::Open(HGUShort port)
|
|||
#else
|
||||
close(sockServer);
|
||||
#endif
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 2, port=%u", port);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 2, port=%u", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ bool WebServer::Open(HGUShort port)
|
|||
#else
|
||||
close(sockServer);
|
||||
#endif
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 3, port=%u", port);
|
||||
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 3, port=%u", port);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue