pi>=500 、最大扫描尺寸、最大扫描尺寸裁切、三联试卷下屏蔽 除摩尔纹、除网纹,

This commit is contained in:
13038267101 2023-06-25 01:19:38 +08:00
parent c84ff12641
commit 6f857d2432
5 changed files with 36 additions and 19 deletions

View File

@ -2907,7 +2907,16 @@ void hg_scanner::init_settings(const char* json_setting_text)
jsn_children_.clear(); jsn_children_.clear();
setting_jsn_ = jsonconfig::load_json_from_text(json_setting_text, &jsn_children_); setting_jsn_ = jsonconfig::load_json_from_text(json_setting_text, &jsn_children_);
} }
if (!is_kernelsnap_239_220830_ && pid_ == 0x239)
{
setting_jsn_.erase(SANE_STD_OPT_NAME_WAIT_TO_SCAN);
setting_jsn_.erase(SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH);
setting_jsn_.erase(SANE_STD_OPT_NAME_FEED_STRENGTH);
}
if (!is_kernelsnap_239_220429_ && pid_ == 0x239)
{
setting_jsn_.erase(SANE_STD_OPT_NAME_IS_FILL_COLOR);
}
VLOG_MINI_1(LOG_LEVEL_ALL, "Initialize %d settings ...\n", jsn_children_.size() - 1); VLOG_MINI_1(LOG_LEVEL_ALL, "Initialize %d settings ...\n", jsn_children_.size() - 1);
notify_setting_result_ = false; notify_setting_result_ = false;
change_setting_language(true); change_setting_language(true);
@ -4842,6 +4851,14 @@ int hg_scanner::image_configuration(SCANCONF& ic)
ic.is_colorcast = false; ic.is_colorcast = false;
} }
if (ic.resolution_dst >= 500
|| image_prc_param_.bits.paper == PAPER_MAX_SIZE
|| image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
|| image_prc_param_.bits.paper == PAPER_TRIGEMINY)
{
ic.removeMorr = 0;
ic.textureRemove = 0;
}
//自定义裁切 //自定义裁切
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
|| image_prc_param_.bits.paper == PAPER_MAX_SIZE || image_prc_param_.bits.paper == PAPER_MAX_SIZE

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long