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

G200适配拆分

This commit is contained in:
13038267101 2022-09-19 16:23:36 +08:00
parent 3b211a4437
commit e06247e28c
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/hg_scanner_200.cpp
View File

@ -665,7 +665,7 @@ void hg_scanner_200::image_process(std::shared_ptr<tiny_buffer>& buffer)
if(img_conf_.filter == RID_COLOR_NONE)
colormode=img_conf_.pixtype;
err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,0);
err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,0,true);
VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "img split-> multiOutput is:%d splitImage is:%d multi_output_red is:%d pixtype is:%d is_duplex:%d\r\n"
,img_conf_.multiOutput
,img_conf_.splitImage

2
hgdriver/hgdev/hg_scanner_402.cpp
View File

@ -812,7 +812,7 @@ void hg_scanner_402::image_process(std::shared_ptr<tiny_buffer>& buff)
int colormode=1;
if(img_conf_.filter == RID_COLOR_NONE)
colormode=img_conf_.pixtype;
err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,-1,is_kernelsnap_211209_);
err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,-1,true);
VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "img split-> multiOutput is:%d splitImage is:%d multi_output_red is:%d pixtype is:%d is_duplex:%d\r\n"
,img_conf_.multiOutput
,img_conf_.splitImage

14
hgdriver/hgdev/image_process.cpp
View File

@ -351,9 +351,19 @@ namespace hg_imgproc
mats_.push_back(matex.mat);
i++;
}
if(fpga_ver || pid_ == 0x402)
if(fpga_ver)
{
CImageApplyRotation Rotation(CImageApplyRotation::RotationType::Rotate_90_clockwise,img_conf_.is_backrotate180,img_conf_.resolution_native,"./tessdata");
CImageApplyRotation::RotationType rotatetype = CImageApplyRotation::RotationType::Invalid;
switch (pid_)
{
case 0x100:
rotatetype = CImageApplyRotation::RotationType::Rotate_90_anti_clockwise;
break;
case 0x402:
rotatetype = CImageApplyRotation::RotationType::Rotate_90_clockwise;
break;
}
CImageApplyRotation Rotation(rotatetype,img_conf_.is_backrotate180,img_conf_.resolution_native,"./tessdata");
Rotation.apply(mats_,img_conf_.is_duplex);
}