diff --git a/hgdriver/wrapper/hg_log.cpp b/hgdriver/wrapper/hg_log.cpp index db4ab0a..2f48875 100644 --- a/hgdriver/wrapper/hg_log.cpp +++ b/hgdriver/wrapper/hg_log.cpp @@ -523,6 +523,10 @@ extern "C" return home; } + std::string temporary_path(void) + { + return simple_ini::temporary_path(); + } int init(void) { @@ -534,7 +538,7 @@ extern "C" if (type == LOG_TYPE_FILE) { std::string name(""), - paths[] = { local_data_path(), pe_path(&name), get_scanner_path(), simple_ini::temporary_path()}; + paths[] = { local_data_path(), pe_path(&name), get_scanner_path(), temporary_path()}; int ind = 0; if (!path.empty() && create_folder(path.c_str())) diff --git a/hgdriver/wrapper/hg_log.h b/hgdriver/wrapper/hg_log.h index 7d123ef..9ad0e90 100644 --- a/hgdriver/wrapper/hg_log.h +++ b/hgdriver/wrapper/hg_log.h @@ -50,6 +50,7 @@ extern "C" std::string get_module_full_path(const char* module_part_name); std::string get_scanner_path(void); std::string local_data_path(void); + std::string temporary_path(void); unsigned int get_page_size(void); unsigned long long available_memory(void); void str_tolower(std::string& str); diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp index eec4c1f..253ed73 100644 --- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp +++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp @@ -169,6 +169,7 @@ extern "C" RETURN_IF(err, SCANNER_ERR_CREATE_FILE_FAILED); RETURN_IF(err, SCANNER_ERR_WRITE_FILE_FAILED); RETURN_IF(err, SCANNER_ERR_DATA_DAMAGED); + RETURN_IF(err, SCANNER_ERR_OPENED_BY_OTHER_PROCESS); RETURN_IF(err, SCANNER_ERR_USB_INIT_FAILED); RETURN_IF(err, SCANNER_ERR_USB_REGISTER_PNP_FAILED); RETURN_IF(err, SCANNER_ERR_USB_CLAIM_INTERFACE_FAILED); @@ -229,6 +230,7 @@ extern "C" RETURN_DESC_IF(err, SCANNER_ERR_CREATE_FILE_FAILED); RETURN_DESC_IF(err, SCANNER_ERR_WRITE_FILE_FAILED); RETURN_DESC_IF(err, SCANNER_ERR_DATA_DAMAGED); + RETURN_DESC_IF(err, SCANNER_ERR_OPENED_BY_OTHER_PROCESS); RETURN_DESC_IF(err, SCANNER_ERR_USB_INIT_FAILED); RETURN_DESC_IF(err, SCANNER_ERR_USB_REGISTER_PNP_FAILED); RETURN_DESC_IF(err, SCANNER_ERR_USB_CLAIM_INTERFACE_FAILED);