diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 88705c1..2117fcc 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -3976,14 +3976,16 @@ void hg_scanner::image_process(std::shared_ptr& buffer, uint32_t id if (pid_ != 0x239 && pid_ != 0x439) { - float dpi3288 = 0.0; - if (is_kernelsnap3288_221106_ && pid_==0x300) - dpi3288 = (img_conf_.resolution_dst >= 300) ? 300 : 200; - else if (is_kernelsnap3288_230210_ && pid_==0x300) - dpi3288 = (img_conf_.resolution_dst == 600) ? 600 : (img_conf_.resolution_dst < 600 && img_conf_.resolution_dst >= 300) ? 300 : 200; - else - dpi3288 = 200; - + float dpi3288 = 200; + if (pid_ == 0x300|| pid_== 0x400) + { + if (is_kernelsnap3288_221106_ && pid_ == 0x300) + dpi3288 = (img_conf_.resolution_dst >= 300) ? 300 : 200; + else if (is_kernelsnap3288_230210_ && pid_ == 0x300) + dpi3288 = (img_conf_.resolution_dst == 600) ? 600 : (img_conf_.resolution_dst < 600 && img_conf_.resolution_dst >= 300) ? 300 : 200; + else + dpi3288 = 200; + } ret = hg_imgproc::auto_crop(ImagePrc_pHandle_, dpi3288); (this->*dump_img_)(ImagePrc_pHandle_, "auto_crop"); } @@ -4005,7 +4007,7 @@ void hg_scanner::image_process(std::shared_ptr& buffer, uint32_t id (this->*dump_img_)(ImagePrc_pHandle_, "fadeback"); } - if ( (((img_conf_.resolution_dst != img_conf_.resolution_native) && (pid_ == 0x300 || pid_ == 0x0400)) + if ( (((img_conf_.resolution_dst != img_conf_.resolution_native) && (pid_ == 0x300 || pid_ == 0x0400 || pid_ == 0x302 || pid_ == 0x402)) && !is_kernelsnap3288_221106_ && !is_kernelsnap3288_230210_ ) || (pid_ == 0x300 && is_kernelsnap3288_221106_ && img_conf_.resolution_dst != 200 && img_conf_.resolution_dst != 300)