Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
3faed87207
|
@ -3120,7 +3120,7 @@ int hg_scanner::set_setting_value(const char* name, void* data, long* len)
|
||||||
}
|
}
|
||||||
int hg_scanner::on_scanner_closing(bool force)
|
int hg_scanner::on_scanner_closing(bool force)
|
||||||
{
|
{
|
||||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
return SCANNER_ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void hg_scanner::thread_handle_usb_read(void)
|
void hg_scanner::thread_handle_usb_read(void)
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#endif
|
#endif
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include <exception>
|
||||||
|
|
||||||
|
|
||||||
#define MAKE_VERSION(a, b, c, d) \
|
#define MAKE_VERSION(a, b, c, d) \
|
||||||
|
@ -138,7 +139,26 @@ extern "C"
|
||||||
|
|
||||||
scanner_err hg_scanner_open(scanner_handle* h, const char* name, bool shared, const char* user, const char* pwd, const char* check, char* rsc)
|
scanner_err hg_scanner_open(scanner_handle* h, const char* name, bool shared, const char* user, const char* pwd, const char* check, char* rsc)
|
||||||
{
|
{
|
||||||
return hg_scanner_mgr::instance()->hg_scanner_open(h, name, shared, user, pwd, check, rsc);
|
try
|
||||||
|
{
|
||||||
|
return hg_scanner_mgr::instance()->hg_scanner_open(h, name, shared, user, pwd, check, rsc);
|
||||||
|
}
|
||||||
|
catch (std::exception& e)
|
||||||
|
{
|
||||||
|
if (h)
|
||||||
|
*h = nullptr;
|
||||||
|
VLOG_MINI_2(LOG_LEVEL_FATAL, "Exception occurs when open '%s': %s.\n", name, e.what());
|
||||||
|
|
||||||
|
return SCANNER_ERR_DATA_DAMAGED;
|
||||||
|
}
|
||||||
|
catch (...)
|
||||||
|
{
|
||||||
|
if (h)
|
||||||
|
*h = nullptr;
|
||||||
|
VLOG_MINI_1(LOG_LEVEL_FATAL, "Exception occurs when open '%s'!\n", name);
|
||||||
|
|
||||||
|
return SCANNER_ERR_DATA_DAMAGED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
scanner_err hg_scanner_close(scanner_handle h, bool force)
|
scanner_err hg_scanner_close(scanner_handle h, bool force)
|
||||||
|
|
Loading…
Reference in New Issue