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

1调整 A4 幅面下 速度优先画质优先不切换dpi设置 2、调整G239固件更新时锁崩溃（疑是死锁提示）

This commit is contained in:
13038267101 2023-02-15 17:29:34 +08:00
parent 86df6bd156
commit b7733260e5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1684,7 +1684,7 @@ int hg_scanner_239::set_scan_lock_check_val(string check_str)
}
int hg_scanner_239::set_firmware_upgrade(std::string filename)
{
std::lock_guard<std::mutex> lock(io_lock_);
// std::lock_guard<std::mutex> lock(io_lock_);
std::ifstream fwname;
int ret = SCANNER_ERR_OK;

5
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -462,7 +462,8 @@ int hg_scanner_300::writedown_device_configuration(bool type,setting_hardware::H
if (!d)
{
dsp_config.params_3288.lutmode = keep_watermark_;
d = &dsp_config;
setting_hardware::HGSCANCONF_3288 p = dsp_config;
d = &p;
}
if (is_multiout)
{
@ -550,7 +551,7 @@ int hg_scanner_300::on_resolution_changed(int& dpi)
{
int ret = SCANNER_ERR_OK;
if (is_kernelsnap3288_230210_)
dsp_config.params_3288.dpi = dpi == 600 ? 3 : (dpi < 599 && dpi>299) ? 2 : 1;
dsp_config.params_3288.dpi = dpi == 600 ? 3 : (dpi < 599 && dpi>=300) ? 2 : 1;
else if (is_kernelsnap3288_221106_)
dsp_config.params_3288.dpi = (dpi >= 300) ? 2 : 1;
else