真实dpi 设置
This commit is contained in:
parent
b0568dfed7
commit
9856642541
|
@ -3320,7 +3320,8 @@ void hg_scanner::image_process(std::shared_ptr<tiny_buffer>& buffer)
|
|||
(this->*dump_img_)(ImagePrc_pHandle_, "fadeback");
|
||||
}
|
||||
|
||||
if ((img_conf_.resolution_dst != img_conf_.resolution_native) && (pid_ != 0x239 && pid_ != 0x439))
|
||||
if (((img_conf_.resolution_dst != img_conf_.resolution_native) && (pid_ != 0x239 && pid_ != 0x439))
|
||||
&& (!is_kernelsnap3288_221106_ ))
|
||||
{
|
||||
hg_imgproc::resolution_change(ImagePrc_pHandle_);
|
||||
(this->*dump_img_)(ImagePrc_pHandle_, "resolution_change");
|
||||
|
|
|
@ -385,7 +385,7 @@ public:
|
|||
virtual int get_device_code(void); //获取设备编码
|
||||
virtual int get_dogear_distance(void); //获取折角检测最小距离阈值
|
||||
virtual int set_dogear_distance(void); // 设置折角检测最小距离阈值
|
||||
virtual int get_scanner_paperon(SANE_Bool* paperon = NULL);//获取设备有无纸张
|
||||
virtual int get_scanner_paperon(SANE_Bool* paperon = NULL)=0;//获取设备有无纸张
|
||||
virtual int set_scan_when_paper_on(void); //获取是否为检测到进纸盘上有纸即开始扫描
|
||||
virtual int get_scan_when_paper_on(void); //设置是否为检测到进纸盘上有纸即开始扫描
|
||||
virtual int get_scan_with_hole(void); //获取是否为带孔扫描
|
||||
|
|
|
@ -331,8 +331,6 @@ int hg_scanner_400::get_img_data(std::shared_ptr<tiny_buffer> &imagedata)
|
|||
}
|
||||
//io_->set_timeout(500);
|
||||
|
||||
printf_devconfig();
|
||||
|
||||
while (total > 0)
|
||||
{
|
||||
block = 512 * 1024;
|
||||
|
|
|
@ -735,7 +735,7 @@ namespace hg_imgproc
|
|||
std::vector<cv::Mat> mats(mats_);
|
||||
mats_.clear();
|
||||
|
||||
SIZE temp_Size = papersize_.GetPaperSize(img_conf_.papertype,200,img_conf_.paperAlign);
|
||||
SIZE temp_Size = papersize_.GetPaperSize(img_conf_.papertype, img_conf_.resolution_dst,img_conf_.paperAlign);
|
||||
cv::Size cvSize(temp_Size.cx, temp_Size.cy);
|
||||
CImageApplyAutoCrop crop(img_conf_.is_autocrop,img_conf_.autodescrew,img_conf_.fillbackground,cvSize,img_conf_.is_convex,img_conf_.isfillcolor);
|
||||
|
||||
|
@ -1130,18 +1130,6 @@ namespace hg_imgproc
|
|||
mats_.push_back(out);
|
||||
}
|
||||
|
||||
/*if (img_conf_.resolution_dst <= 300)
|
||||
sharpenType = CImageApplyFilter::FilterMode::Sharpen;
|
||||
else if (img_conf_.resolution_dst > 300 && img_conf_.resolution_dst <= 600)
|
||||
sharpenType = CImageApplyFilter::FilterMode::Sharpen_More;
|
||||
|
||||
CImageApplyFilter Filte(sharpenType);
|
||||
for (size_t i = 0; i < saveout.size(); ++i)
|
||||
{
|
||||
Filte.apply(saveout[i], img_conf_.is_duplex);
|
||||
mats_.push_back(saveout[i]);
|
||||
}*/
|
||||
|
||||
if (mats_.empty())
|
||||
{
|
||||
return SCANNER_ERR_NO_DATA;
|
||||
|
|
Loading…
Reference in New Issue