Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
b545b39865
|
@ -170,7 +170,7 @@ hg_scanner_239::hg_scanner_239(const char* dev_name, int pid,usb_io* io) : hg_sc
|
||||||
init_settings((jsontext4 + jsontext5).c_str());
|
init_settings((jsontext4 + jsontext5).c_str());
|
||||||
}
|
}
|
||||||
hg_version_init_handle();
|
hg_version_init_handle();
|
||||||
//init_version();
|
init_version();
|
||||||
|
|
||||||
//#ifdef OEM_HUAGAO
|
//#ifdef OEM_HUAGAO
|
||||||
// wait_devsislock_.notify();
|
// wait_devsislock_.notify();
|
||||||
|
|
Loading…
Reference in New Issue