调整拆分
This commit is contained in:
parent
86bbca92cb
commit
980ffe8156
|
@ -706,7 +706,7 @@ void hg_scanner_200::image_process(std::shared_ptr<tiny_buffer>& buffer)
|
||||||
if(img_conf_.filter == RID_COLOR_NONE)
|
if(img_conf_.filter == RID_COLOR_NONE)
|
||||||
colormode=img_conf_.pixtype;
|
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);
|
err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,0);
|
||||||
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"
|
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_.multiOutput
|
||||||
,img_conf_.splitImage
|
,img_conf_.splitImage
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -18,11 +18,11 @@
|
||||||
#define hg_scanner_239 lsc_scanner_239
|
#define hg_scanner_239 lsc_scanner_239
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
class hg_scanner_239 : public hg_scanner
|
class hg_scanner_239 : public hg_scanner
|
||||||
{
|
{
|
||||||
//BlockingQueue<std::shared_ptr<std::vector<unsigned char>>> final_imgs_; // JPG ...
|
//BlockingQueue<std::shared_ptr<std::vector<unsigned char>>> final_imgs_; // JPG ...
|
||||||
// image_data final_imgs_; // JPG ..
|
// image_data final_imgs_; // JPG ..
|
||||||
|
|
||||||
int pid_;
|
int pid_;
|
||||||
HGSCANCONF dev_conf_;
|
HGSCANCONF dev_conf_;
|
||||||
bool rewrite_conf_;
|
bool rewrite_conf_;
|
||||||
|
@ -115,3 +115,5 @@ public:
|
||||||
|
|
||||||
virtual int get_scan_is_sleep(void);//获取设备是否休眠当中
|
virtual int get_scan_is_sleep(void);//获取设备是否休眠当中
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static int split3399_; //3399设备正面和反面图像是相对的,所以对折时反面需要进行特殊处理
|
|
@ -674,7 +674,7 @@ void hg_scanner_300::image_process(std::shared_ptr<tiny_buffer>& buffer)
|
||||||
if(img_conf_.filter == RID_COLOR_NONE)
|
if(img_conf_.filter == RID_COLOR_NONE)
|
||||||
colormode=img_conf_.pixtype;
|
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);
|
err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,0);
|
||||||
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"
|
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_.multiOutput
|
||||||
,img_conf_.splitImage
|
,img_conf_.splitImage
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -265,7 +265,7 @@ namespace hg_imgproc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int split(int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex)
|
int split(int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399)
|
||||||
{
|
{
|
||||||
std::vector<cv::Mat> mats(mats_);
|
std::vector<cv::Mat> mats(mats_);
|
||||||
CImageApplySplit split(multioutputtype, is_msplit, is_multiout_red, colortype);;
|
CImageApplySplit split(multioutputtype, is_msplit, is_multiout_red, colortype);;
|
||||||
|
@ -274,19 +274,15 @@ namespace hg_imgproc
|
||||||
mats_.clear();
|
mats_.clear();
|
||||||
auto matexs = split.SplitMats(mats,is_duplex);
|
auto matexs = split.SplitMats(mats,is_duplex);
|
||||||
std::string filename ;
|
std::string filename ;
|
||||||
int rotation01_ = 0;
|
int rotation01_ = 1;
|
||||||
int rotation02_ = 0;
|
int rotation02_ = 1;
|
||||||
|
|
||||||
if(pid_ == 0x139 || pid_ == 0x239 || pid_ == 0x100 || pid_ == 0x200)
|
if((pid_ == 0x139 || pid_ == 0x239 || pid_ == 0x100 || pid_ == 0x200) && (split3399 % 2 ==0) && img_conf_.is_duplex)
|
||||||
{
|
{
|
||||||
rotation01_ = 0;
|
rotation01_ = 0;
|
||||||
rotation02_ = 1;
|
rotation02_ = 1;
|
||||||
}
|
}
|
||||||
else if(pid_ == 0x300 || pid_ == 0x400)
|
|
||||||
{
|
|
||||||
rotation01_ = 1;
|
|
||||||
rotation02_ = 1;
|
|
||||||
}
|
|
||||||
for(auto &matex : matexs)
|
for(auto &matex : matexs)
|
||||||
{
|
{
|
||||||
cv::flip(matex.mat,matex.mat,rotation01_);
|
cv::flip(matex.mat,matex.mat,rotation01_);
|
||||||
|
@ -689,7 +685,7 @@ namespace hg_imgproc
|
||||||
std::vector<cv::Mat> mats(mats_);
|
std::vector<cv::Mat> mats(mats_);
|
||||||
mats_.clear();
|
mats_.clear();
|
||||||
|
|
||||||
double threshold = 40; //默认<E9BB98>?
|
double threshold = 40;
|
||||||
int edge = 150;
|
int edge = 150;
|
||||||
|
|
||||||
CImageApplyDiscardBlank(threshold,edge,img_conf_.discardblank_percent);
|
CImageApplyDiscardBlank(threshold,edge,img_conf_.discardblank_percent);
|
||||||
|
@ -919,9 +915,9 @@ namespace hg_imgproc
|
||||||
{
|
{
|
||||||
return ((imgproc*)himg)->correct_text();
|
return ((imgproc*)himg)->correct_text();
|
||||||
}
|
}
|
||||||
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex)
|
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399)
|
||||||
{
|
{
|
||||||
return ((imgproc*)himg)->split( multioutputtype, is_msplit, is_multiout_red, colortype,is_duplex);
|
return ((imgproc*)himg)->split( multioutputtype, is_msplit, is_multiout_red, colortype,is_duplex,split3399);
|
||||||
}
|
}
|
||||||
int fadeback(HIMGPRC himg,int range,bool is_duplex)
|
int fadeback(HIMGPRC himg,int range,bool is_duplex)
|
||||||
{
|
{
|
||||||
|
|
|
@ -169,7 +169,7 @@ namespace hg_imgproc
|
||||||
int correct_text(HIMGPRC himg);
|
int correct_text(HIMGPRC himg);
|
||||||
|
|
||||||
//拆分
|
//拆分
|
||||||
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex);
|
int split(HIMGPRC himg,int multioutputtype,bool is_msplit,bool is_multiout_red,int colortype,bool is_duplex,int split3399);
|
||||||
int fadeback(HIMGPRC himg,int range,bool is_duplex);
|
int fadeback(HIMGPRC himg,int range,bool is_duplex);
|
||||||
int multi_out(HIMGPRC himg);
|
int multi_out(HIMGPRC himg);
|
||||||
int multi_out(HIMGPRC himg,int out_type);
|
int multi_out(HIMGPRC himg,int out_type);
|
||||||
|
|
Loading…
Reference in New Issue