diff --git a/changelog.txt b/changelog.txt index 71c00078..75a9625a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -75,4 +75,7 @@ 1.添加设置锁定接口 -- 22.11.01 2022年11月6日 pm 1. 针对G300 3288 版本 增加200 300真实DPI; - 2. 开放速度优先以及画质优先模式; \ No newline at end of file + 2. 开放速度优先以及画质优先模式; +2022年11月28日 jzq + 1.修复单面扫描 拆分 多流除红 出图不一致问题 -- 22.11.28 + 2.修复跳过空白页首选项配置保存问题 -- 22.11.28 \ No newline at end of file diff --git a/huagao/Device/GScanO1003399.cpp b/huagao/Device/GScanO1003399.cpp index 23a21c91..6759f8c8 100644 --- a/huagao/Device/GScanO1003399.cpp +++ b/huagao/Device/GScanO1003399.cpp @@ -963,10 +963,6 @@ void GScanO1003399::imgproce(std::shared_ptr>& buff) cv::Mat ret = m_mlt.GetMultiFilterMat(mats[i], 2); mats[i].release(); if (!ret.empty()) { - if (!m_param.is_duplex && i == 1) { - ret.release(); - break; - } Mat2Bmp mb(ret, m_param.resolution_dst); m_imagedata.Put(mb.getBmpDataBuffer()); ret.release(); diff --git a/huagao/GscanJsonConfig.cpp b/huagao/GscanJsonConfig.cpp index bd25c5cf..2397f2f3 100644 --- a/huagao/GscanJsonConfig.cpp +++ b/huagao/GscanJsonConfig.cpp @@ -102,6 +102,7 @@ void GscanJsonConfig::SaveGscanCapConfig(const GScanCap & gcap, const std::strin outJson["Config"].Add(DUPLEX, (bool)(gcap.is_duplex),false); outJson["Config"].Add(DISCARBLANK, (bool)(gcap.is_autodiscradblank_normal), false); outJson["Config"].Add(DISCARBLANKVINCE, (bool)(gcap.is_autodiscradblank_vince), false); + outJson["Config"].Add(DISCARBLANK_VALUE, (int)gcap.discardblank_percent); //outJson["Config"].Add(DB_AREANUM, (int)(pConfigItem->DBlank_AreaNum)); //outJson["Config"].Add(DB_DEVNMAX, (int)(pConfigItem->DBlank_DevnMax)); outJson["Config"].Add(FLOD, (bool)(gcap.en_fold), false); @@ -115,7 +116,7 @@ void GscanJsonConfig::SaveGscanCapConfig(const GScanCap & gcap, const std::strin outJson["Config"].Add(AUTOCONTRAST, (bool)(gcap.is_autocontrast), false); outJson["Config"].Add(CONTRAST, (double)(gcap.contrast)); outJson["Config"].Add(GAMMA_, (double)(gcap.gamma)); - + outJson["Config"].Add(FILTERTYPE, (int)(gcap.filter)); outJson["Config"].Add(ENHANCECOLOR,((int)gcap.enhance_color)); outJson["Config"].Add(SHARPENTYPE, (int)(gcap.sharpen));