清空图像队列,放到启动扫描之前
This commit is contained in:
parent
8e2401be4f
commit
f768977515
|
@ -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_;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -319,6 +319,7 @@ int hg_scanner_300::start(void)
|
|||
return ret;
|
||||
|
||||
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<std::mutex> 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)
|
||||
{
|
||||
|
|
|
@ -1126,6 +1126,7 @@ int hg_scanner_302::stop(void)
|
|||
}
|
||||
int hg_scanner_302::reset(void)
|
||||
{
|
||||
imgs_.Clear(); // move from scanning done
|
||||
final_imgs_.clear();
|
||||
discard_all_images();
|
||||
|
||||
|
|
Loading…
Reference in New Issue