diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 42ccd67..2e8d1d8 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -456,12 +456,12 @@ int hg_scanner::hg_version_init_handle() { int ret = SCANNER_ERR_OK; #ifndef WIN32 - string scanner_path = hg_log::get_module_full_path(LIBNAME); + string scanner_path = hg_log::get_module_full_path(MODULE_NAME_SCANNER); if (scanner_path.empty()) { return SCANNER_ERR_OUT_OF_RANGE; } - scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(LIBNAME)); + scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(MODULE_NAME_SCANNER)); string HGVersionlib_path = scanner_path + HGVERSION_LIBNANE; if (access(HGVersionlib_path.c_str(), F_OK) != 0) @@ -482,8 +482,8 @@ int hg_scanner::hg_version_init_handle() HGVersion_Free_ = (SDKHGVersion_Free_)dlsym(Dynamicopen_HGVersion_pHandle_, "HGVersion_DestroyMgr"); #else - string scanner_path = hg_log::get_module_full_path(LIBNAME); - scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(LIBNAME)); + string scanner_path = hg_log::get_module_full_path(MODULE_NAME_SCANNER); + scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(MODULE_NAME_SCANNER)); string HGVersionlib_path = scanner_path + HGVERSION_LIBNANE; wchar_t* Prclibbuffer = new wchar_t[HGVersionlib_path.length() + 1]; diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 2e38fd8..6b50b0b 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -866,8 +866,8 @@ int hg_scanner_300::initdevice() { if (fw.substr(4, 6) == "230303") { - string scanner_path = hg_log::get_module_full_path(LIBNAME); - scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(LIBNAME)); + string scanner_path = hg_log::get_module_full_path(MODULE_NAME_SCANNER); + scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(MODULE_NAME_SCANNER)); scanner_path += "update.zip"; set_firmware_upgrade(scanner_path); return SCANNER_ERR_OK; @@ -1558,8 +1558,8 @@ int hg_scanner_300::set_updata0303(void) { if (fw.substr(4, 6) == "230303") { - string scanner_path = hg_log::get_module_full_path(LIBNAME); - scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(LIBNAME)); + string scanner_path = hg_log::get_module_full_path(MODULE_NAME_SCANNER); + scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(MODULE_NAME_SCANNER)); scanner_path += "update.zip"; set_firmware_upgrade(scanner_path); } diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index 9ed38a6..e3b116a 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -353,8 +353,8 @@ namespace hg_imgproc HGBase_FreeImg = (SDKHGBase_FreeImage_)dlsym(Dynamicopen_HGBase_pHandle_,"HGBase_DestroyImage"); #else - string scanner_path = hg_log::get_module_full_path("scanner.dll"); - scanner_path = scanner_path.substr(0, scanner_path.size() - strlen("scanner.dll")); + string scanner_path = hg_log::get_module_full_path(MODULE_NAME_SCANNER); + scanner_path = scanner_path.substr(0, scanner_path.size() - strlen(MODULE_NAME_SCANNER)); string HGImagePrclib_path = scanner_path + IMGPRC_LIBNANE; string HGBaselib_path = scanner_path + HGBASE_LIBNAME; diff --git a/sdk/hginclude/huagaoxxx_warraper_ex.h b/sdk/hginclude/huagaoxxx_warraper_ex.h index 1aa1b9b..897e572 100644 --- a/sdk/hginclude/huagaoxxx_warraper_ex.h +++ b/sdk/hginclude/huagaoxxx_warraper_ex.h @@ -31,7 +31,7 @@ #if defined(WIN32) || defined(_WIN64) #include "../../../sdk/include/huagao/brand.h" #ifndef HGSCANNER_EXPORT -#pragma comment(lib, "scanner.lib") +#pragma comment(lib, "scannerqd.lib") #endif #define VERSION_MAJOR VERSION_MAIN #define VERSION_MINOR VERSION_SUB