diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index cd6690a..5806af3 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -1121,9 +1121,9 @@ void hg_scanner::working_begin(void*) } void hg_scanner::working_done(void*) { - imgs_.Clear(); - if(user_cancel_) - final_imgs_.clear(); +// imgs_.Clear(); // do before start ... +// if(user_cancel_) +// final_imgs_.clear(); if (status_ == SCANNER_ERR_OK && stop_fatal_) status_ = stop_fatal_; @@ -5205,4 +5205,4 @@ int hg_scanner::image_configuration(SCANCONF& ic) VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "ic.is_colorcast =%d\r\n", ic.is_colorcast); VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "ic.isuoloadexceptionimage=%d\r\n", ic.isuoloadexceptionimage); return ret; -} \ No newline at end of file +} diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index 8fdc74e..6601820 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -277,6 +277,8 @@ int hg_scanner_200::start(void) //discard_prev(); user_cancel_ = false; + imgs_.Clear(); // move from scanning done + final_imgs_.clear(); // move from scanning done ret = writedown_device_configuration(true); if (ret == SCANNER_ERR_OK) writedown_image_configuration(); @@ -1052,4 +1054,4 @@ int hg_scanner_200::get_roller_num(int& val) } val = usbcb.u32_Data; return ret; -} \ No newline at end of file +} diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 71d9cc1..27dedf0 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1486,6 +1486,7 @@ int hg_scanner_239::stop(void) } int hg_scanner_239::reset(void) { + imgs_.Clear(); // move from scanning done final_imgs_.clear(); discard_all_images(); diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 86e7dd2..196d48a 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -318,7 +318,8 @@ int hg_scanner_300::start(void) if (handled) return ret; - final_imgs_.clear(); + final_imgs_.clear(); + imgs_.Clear(); // move from scanning done //if (is_read_int) //{ @@ -387,6 +388,7 @@ int hg_scanner_300::stop(void) std::lock_guard lock(io_lock_); ret = writeusb(usbcb); } + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Write stop command = %d\n", ret); if (status_ == SCANNER_ERR_DEVICE_BUSY) { diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp index 38ceee1..f8b8abe 100644 --- a/hgdriver/hgdev/hg_scanner_302.cpp +++ b/hgdriver/hgdev/hg_scanner_302.cpp @@ -1126,7 +1126,8 @@ int hg_scanner_302::stop(void) } int hg_scanner_302::reset(void) { - final_imgs_.clear(); + imgs_.Clear(); // move from scanning done + final_imgs_.clear(); discard_all_images(); return status_; @@ -1395,4 +1396,4 @@ int hg_scanner_302::get_history_scan_count(int& val) std::lock_guard lock(io_lock_); int ret = read_register(setting3399::SR_GET_SCANN_NUM, &val); return ret; -} \ No newline at end of file +}