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

解决多流输出时黑白阈值不生效的问题；BUG-816

This commit is contained in:
yangjiaxuan 2023-12-07 11:00:16 +08:00
parent 800fca0a0e
commit bfe3819be3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/hg_scanner.cpp
View File

@ -5438,7 +5438,7 @@ void hg_scanner::image_process(std::shared_ptr<tiny_buffer>& buffer, uint32_t id
if (is_multiout)//239 if (is_multiout)//239
{ {
int multi_out = img_conf_.multiOutput; int multi_out = img_conf_.multiOutput;
err = hg_imgproc::multi_out(ImagePrc_pHandle_, multi_out); err = hg_imgproc::multi_out(ImagePrc_pHandle_, multi_out, bw_threshold_);
(this->*dump_img_)(ImagePrc_pHandle_, "multi_out"); (this->*dump_img_)(ImagePrc_pHandle_, "multi_out");
} }
} }

8
hgdriver/hgdev/image_process.cpp
View File

@ -758,13 +758,13 @@ namespace hg_imgproc
} }
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int multi_out(int out_type) int multi_out(int out_type, int bw_threshold)
{ {
std::vector<cv::Mat> mats(mats_); std::vector<cv::Mat> mats(mats_);
std::vector<cv::Mat> mat; std::vector<cv::Mat> mat;
mats_.clear(); mats_.clear();
IMageMulti output(out_type); IMageMulti output(out_type, bw_threshold);
for(size_t i = 0;i < mats.size();i++) for(size_t i = 0;i < mats.size();i++)
{ {
@ -1973,9 +1973,9 @@ namespace hg_imgproc
{ {
return ((imgproc*)himg)->fadeback(); return ((imgproc*)himg)->fadeback();
} }
int multi_out(HIMGPRC himg,int out_type) int multi_out(HIMGPRC himg, int out_type, int bw_threshold)
{ {
return ((imgproc*)himg)->multi_out(out_type); return ((imgproc*)himg)->multi_out(out_type, bw_threshold);
} }
int multi_out_red(HIMGPRC himg) int multi_out_red(HIMGPRC himg)
{ {

2
hgdriver/hgdev/image_process.h
View File

@ -182,7 +182,7 @@ namespace hg_imgproc
//拆分 //拆分
int split(HIMGPRC himg,int split3399); int split(HIMGPRC himg,int split3399);
int fadeback(HIMGPRC himg); int fadeback(HIMGPRC himg);
int multi_out(HIMGPRC himg,int out_type); int multi_out(HIMGPRC himg,int out_type, int bw_threshold);
int multi_out_red(HIMGPRC himg); int multi_out_red(HIMGPRC himg);
int auto_matic_color(HIMGPRC himg,int color_type); int auto_matic_color(HIMGPRC himg,int color_type);
int auto_crop(HIMGPRC himg, float dpi); int auto_crop(HIMGPRC himg, float dpi);