diff --git a/build.sh b/build.sh index b6b71b6..eee5417 100644 --- a/build.sh +++ b/build.sh @@ -18,7 +18,7 @@ cd .. mkdir wrapper cd wrapper rm -rf * -cmake ../../device/hgdriver/huagaoxxx_warraper_ex +cmake ../../device/hgdriver/wrapper make cd .. diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 1a5ae83..10f41a4 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1770,6 +1770,8 @@ int hg_scanner_239::set_sleep_time(int setsleepime) int ret = write_register(SR_SET_SLEEPTIME, setsleepime); HG_VLOG_MINI_2(HG_LOG_LEVEL_DEBUG_INFO, "set sleep time to %d = %s\n", setsleepime, hg_scanner::strerr((hg_err)ret).c_str()); + + return ret; } int hg_scanner_239::get_dogear_distance(void) { diff --git a/hgdriver/huagaoxxx_warraper_ex/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt similarity index 100% rename from hgdriver/huagaoxxx_warraper_ex/CMakeLists.txt rename to hgdriver/wrapper/CMakeLists.txt diff --git a/hgdriver/huagaoxxx_warraper_ex/hg_log.cpp b/hgdriver/wrapper/hg_log.cpp similarity index 100% rename from hgdriver/huagaoxxx_warraper_ex/hg_log.cpp rename to hgdriver/wrapper/hg_log.cpp diff --git a/hgdriver/huagaoxxx_warraper_ex/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp similarity index 100% rename from hgdriver/huagaoxxx_warraper_ex/huagaoxxx_warraper_ex.cpp rename to hgdriver/wrapper/huagaoxxx_warraper_ex.cpp diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index e4103de..5736cb1 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -1531,9 +1531,9 @@ SANE_Option_Descriptor* hg_sane_middleware::from_json(scanner_handle h, json* js ret->cap |= SANE_CAP_ADVANCED; } - if (strcmp(ret->title, "分辨率") == 0) + if (strcmp(ret->title, "\345\210\206\350\276\250\347\216\207") == 0) { - hg_log::log(HG_LOG_LEVEL_DEBUG_INFO, "set 分辨率 unit to DPI\n"); + hg_log::log(HG_LOG_LEVEL_DEBUG_INFO, "set \345\210\206\350\276\250\347\216\207 unit to DPI\n"); ret->unit = SANE_UNIT_DPI; }