lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整90度旋转 对折拆分互斥

This commit is contained in:
13038267101 2023-07-07 18:39:55 +08:00
parent 79c90b0c8d
commit 04f183c2d6
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgdriver/hgdev/hg_scanner.cpp
View File

@ -4877,6 +4877,11 @@ int hg_scanner::image_configuration(SCANCONF& ic)
ic.fold_concatmode = fold_type_; ic.fold_concatmode = fold_type_;
ic.HsvFilterType = 0;//暂定为0 ic.HsvFilterType = 0;//暂定为0
ic.is_colorcast = color_correction_; ic.is_colorcast = color_correction_;
if (ic.en_fold)
{
ic.splitImage = false;
}
//多流输出优先级最高 //多流输出优先级最高
if (is_multiout) if (is_multiout)
{ {

7
hgdriver/hgdev/image_process.cpp
View File

@ -946,6 +946,13 @@ namespace hg_imgproc
Rotation.apply(mats,img_conf_.is_duplex); Rotation.apply(mats,img_conf_.is_duplex);
mats_ = mats; 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()) if (mats_.empty())
{ {