diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index 2b3d96c..ba2b1fd 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -1153,6 +1153,18 @@ else else if ((image_prc_param_.bits.multi_out == MULTI_OUT_ALL ||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_GRAY||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_BW) && is_multiout) { ic.pixtype = 2; + } + //自定义裁切 + 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_CLIP + ||image_prc_param_.bits.paper == PAPER_TRIGEMINY + ||image_prc_param_.bits.paper == PAPER_16K + ||image_prc_param_.bits.paper == PAPER_8K + ||image_prc_param_.bits.paper == PAPER_16K_LATERAL + ) + { + ic.cropRect.enable = false; } img_conf_ = ic; diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index eece70c..596031e 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -924,6 +924,18 @@ else { ic.pixtype = 2; } + //自定义裁切 + 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_CLIP + ||image_prc_param_.bits.paper == PAPER_TRIGEMINY + ||image_prc_param_.bits.paper == PAPER_16K + ||image_prc_param_.bits.paper == PAPER_8K + ||image_prc_param_.bits.paper == PAPER_16K_LATERAL + ) + { + ic.cropRect.enable = false; + } { std::lock_guard lock(io_lock_); @@ -1302,8 +1314,11 @@ int hg_scanner_239::on_paper_check_changed(bool& check) } 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_CLIP - ||image_prc_param_.bits.paper ==PAPER_TRIGEMINY + ||image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP + ||image_prc_param_.bits.paper == PAPER_TRIGEMINY + ||image_prc_param_.bits.paper == PAPER_16K + ||image_prc_param_.bits.paper == PAPER_8K + ||image_prc_param_.bits.paper == PAPER_16K_LATERAL ) { HGSCANCONF *d = &dev_conf_; diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 648ef36..ff870ce 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -1072,7 +1072,18 @@ else { ic.pixtype = 2; } - + //自定义裁切 + 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_CLIP + ||image_prc_param_.bits.paper == PAPER_TRIGEMINY + ||image_prc_param_.bits.paper == PAPER_16K + ||image_prc_param_.bits.paper == PAPER_8K + ||image_prc_param_.bits.paper == PAPER_16K_LATERAL + ) + { + ic.cropRect.enable = false; + } img_conf_ = ic; int ret = agreement((TwSS)img_conf_.papertype,img_conf_.paperAlign); diff --git a/hgdriver/hgdev/hg_scanner_400.cpp b/hgdriver/hgdev/hg_scanner_400.cpp index d4d8eb5..2c6b702 100644 --- a/hgdriver/hgdev/hg_scanner_400.cpp +++ b/hgdriver/hgdev/hg_scanner_400.cpp @@ -1087,6 +1087,18 @@ void hg_scanner_400::writedown_image_configuration(void) else if ((image_prc_param_.bits.multi_out == MULTI_OUT_ALL ||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_GRAY||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_BW) && is_multiout) { ic.pixtype = 2; + } + //自定义裁切 + 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_CLIP + ||image_prc_param_.bits.paper == PAPER_TRIGEMINY + ||image_prc_param_.bits.paper == PAPER_16K + ||image_prc_param_.bits.paper == PAPER_8K + ||image_prc_param_.bits.paper == PAPER_16K_LATERAL + ) + { + ic.cropRect.enable = false; } img_conf_ = ic; diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index ffcd97f..1ca729f 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -24,20 +24,20 @@ static struct std::string rsc; // USB resource, version-addr. e.g. "USB2.0-1" } g_supporting_devices[] = { -//#ifdef OEM_LISICHENG +#ifdef OEM_LISICHENG {0x31c9, 0x8420, SCANNER_NAME_LSC_G42S, "G426xF", ""} , {0x31c9, 0x8520, SCANNER_NAME_LSC_G52S, "G52x0F", ""} , {0x31c9, 0x8620, SCANNER_NAME_LSC_G62S, "G6290U", ""} , {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""} , {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""} , {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""}, -//#endif -//#ifdef OEM_HANWANG +#endif +#ifdef OEM_HANWANG {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""} , {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""} , {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""} , {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""}, -//#endif +#endif {0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""} , {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""} , {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""}