G200适配拆分
This commit is contained in:
parent
3b211a4437
commit
e06247e28c
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue