diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index dceeb01..1cb3a03 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -4877,6 +4877,11 @@ int hg_scanner::image_configuration(SCANCONF& ic) ic.fold_concatmode = fold_type_; ic.HsvFilterType = 0;//暂定为0 ic.is_colorcast = color_correction_; + if (ic.en_fold) + { + ic.splitImage = false; + } + //多流输出优先级最高 if (is_multiout) { diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index 67df4d3..2a62779 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -946,6 +946,13 @@ namespace hg_imgproc Rotation.apply(mats,img_conf_.is_duplex); mats_ = mats; + if (mats_.size() % 2 == 0 + && ((CImageApplyRotation::RotationType)img_conf_.imageRotateDegree == CImageApplyRotation::RotationType::Rotate_90_clockwise + || (CImageApplyRotation::RotationType)img_conf_.imageRotateDegree == CImageApplyRotation::RotationType::Rotate_90_anti_clockwise)) + { + cv::flip(mats_[1], mats_[1],0); + cv::flip(mats_[1], mats_[1], 1); + } if (mats_.empty()) {