lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev

This commit is contained in:
yangjiaxuan 2023-12-11 15:50:32 +08:00
parent 7de448dca7 913b16b21e
commit 5669ff2464
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgdriver/hgdev/hg_scanner_306.cpp
View File

@ -477,7 +477,7 @@ int hg_scanner_306::get_img_data_7010()
std::lock_guard<std::mutex> lock(io_lock_);
ret = writeusb(usb);
io_->set_timeout(800);
io_->set_timeout(1000);
sw.reset();
int len = sizeof(info);
ret = io_->read_bulk(&info, &len);
@ -513,10 +513,12 @@ int hg_scanner_306::get_img_data_7010()
std::vector<unsigned char>().swap(jpgdata_); //回收空间 clear只能清空元素
return 0;
}
//return 0;
int frame_ind = first_frame_total_ - last_frame_total_;
if (frame_ind < 0)
{
frame_ind = 0;
}
mat_width = frame_width_;
mat_height = (frame_hegiht_ * first_frame_total_) - (frame_hegiht_ * frame_ind);