This commit is contained in:
13038267101 2022-08-02 11:07:22 +08:00
parent ff5f2e7314
commit b1402c2605
3 changed files with 16 additions and 11 deletions

File diff suppressed because one or more lines are too long

View File

@ -275,7 +275,7 @@ namespace hg_imgproc
}
int split(int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399)
int split(int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399,bool fpga_ver)
{
std::vector<cv::Mat> mats(mats_);
CImageApplySplit split(multioutputtype, is_msplit, is_multiout_red, colortype);;
@ -301,6 +301,13 @@ namespace hg_imgproc
if(!matex.mat.empty())
mats_.push_back(matex.mat);
}
if(fpga_ver)
{
CImageApplyRotation Rotation(CImageApplyRotation::RotationType::Rotate_90_clockwise,img_conf_.is_backrotate180,img_conf_.resolution_native,"./tessdata");
Rotation.apply(mats_,img_conf_.is_duplex);
}
return SCANNER_ERR_OK;
}
int fadeback(int range,bool is_duplex)
@ -992,9 +999,9 @@ namespace hg_imgproc
{
return ((imgproc*)himg)->correct_text();
}
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399)
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399,bool fpga_ver)
{
return ((imgproc*)himg)->split( multioutputtype, is_msplit, is_multiout_red, colortype,is_duplex,split3399);
return ((imgproc*)himg)->split( multioutputtype, is_msplit, is_multiout_red, colortype,is_duplex,split3399,fpga_ver);
}
int fadeback(HIMGPRC himg,int range,bool is_duplex)
{

View File

@ -170,7 +170,7 @@ namespace hg_imgproc
int correct_text(HIMGPRC himg);
//拆分
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399);
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399,bool fpga_ver = false);
int fadeback(HIMGPRC himg,int range,bool is_duplex);
int multi_out(HIMGPRC himg);
int multi_out(HIMGPRC himg,int out_type);