调整旋转尺寸检测 在选择幅面会导致闪退

This commit is contained in:
13038267101 2022-07-07 17:29:12 +08:00
parent 980ffe8156
commit a651b16904
2 changed files with 4 additions and 7 deletions

View File

@ -393,7 +393,6 @@ void hg_scanner::get_range(int setting_no, std::vector<std::string>& range, std:
{
char sn[20];
std::string type("");
sprintf(sn, "%d", setting_no);
range.clear();
if (setting_jsn_.at(sn).contains("range"))
@ -472,8 +471,7 @@ void hg_scanner::get_range(int setting_no, std::vector<std::string>& range, std:
}
else if(type == "string")
setting_jsn_.at(sn).at("default").get_to(def_val);
VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "setting %d has %d range(s) and default value is '%s'\n", setting_no, range.size(), def_val.c_str());
//VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "setting %d has %d range(s) and default value is '%s'\n", setting_no, range.size(), def_val.c_str());
}
bool hg_scanner::check_range(int setting_no, bool& val)
{
@ -1096,10 +1094,10 @@ int hg_scanner::setting_paper(int sn, void* data)
}
else if (!exact)
ret = SCANNER_ERR_NOT_EXACT;
if (save_sizecheck)
{
invoke_setting_xxx(&hg_scanner::setting_paper_check, &save_sizecheck);
setting_paper_check(0,(void*)&save_sizecheck);
//invoke_setting_xxx(&hg_scanner::setting_paper_check, &save_sizecheck);
}
VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "Change paper from %s to %s = %s\n", paper_string(old).c_str(), (char*)data, hg_scanner_err_name(ret));
@ -1119,7 +1117,6 @@ int hg_scanner::setting_paper_check(int sn, void* data)
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "Change paper size-checking %s = %s\n", *((bool*)data) ? "enabled" : "disabled", hg_scanner_err_name(ret));
*((bool*)data) = use;
save_sizecheck = use;
return ret;

File diff suppressed because one or more lines are too long