Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
30bdd96e62
|
@ -2370,7 +2370,7 @@ int hg_scanner::setting_color_correction(void* data, long* len)
|
||||||
}
|
}
|
||||||
if (pid_ == 0x239 || pid_ == 0x439)
|
if (pid_ == 0x239 || pid_ == 0x439)
|
||||||
{
|
{
|
||||||
if (is_kernelsnap_239_3C_)
|
if (!is_kernelsnap_239_3C_)
|
||||||
{
|
{
|
||||||
*((bool*)data) = color_correction_ = false;
|
*((bool*)data) = color_correction_ = false;
|
||||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||||
|
|
|
@ -503,9 +503,9 @@ void hg_scanner_239::init_version(void)
|
||||||
//is_kernelsnap_439_3C0606 = date >= "C0606" ? true : false;
|
//is_kernelsnap_439_3C0606 = date >= "C0606" ? true : false;
|
||||||
is_kernelsnap_239_3C_ = date >= "C0606" ? true : false;
|
is_kernelsnap_239_3C_ = date >= "C0606" ? true : false;
|
||||||
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO \
|
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO \
|
||||||
, "is_kernelsnap_439_3C0606:%d \
|
, "is_kernelsnap_239_3C_:%d \
|
||||||
, is_kernelsnap_439_220430_:%d\r\n" \
|
, is_kernelsnap_439_220430_:%d\r\n" \
|
||||||
, is_kernelsnap_439_3C0606 \
|
, is_kernelsnap_239_3C_ \
|
||||||
, is_kernelsnap_439_220430_);
|
, is_kernelsnap_439_220430_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -511,7 +511,7 @@ namespace hg_imgproc
|
||||||
rmc = cv::IMREAD_COLOR;
|
rmc = cv::IMREAD_COLOR;
|
||||||
}
|
}
|
||||||
cv::Mat mat(cv::imdecode(*buf, rmc));
|
cv::Mat mat(cv::imdecode(*buf, rmc));
|
||||||
cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\imdecode.jpg",mat);
|
//cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\imdecode.jpg",mat);
|
||||||
|
|
||||||
if (mat.empty())
|
if (mat.empty())
|
||||||
{
|
{
|
||||||
|
@ -525,7 +525,7 @@ namespace hg_imgproc
|
||||||
else if (pid == 0x100 || pid == 0x200 || pid == 0x139 || pid == 0x239 || pid_ == 0x439)
|
else if (pid == 0x100 || pid == 0x200 || pid == 0x139 || pid == 0x239 || pid_ == 0x439)
|
||||||
{
|
{
|
||||||
Temp_mat.push_back(mat);
|
Temp_mat.push_back(mat);
|
||||||
cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\decode1.jpg",mat);
|
//cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\decode1.jpg",mat);
|
||||||
}
|
}
|
||||||
else if (pid == 0x300 || pid == 0x400 || pid == 0x402 || pid == 0x302)
|
else if (pid == 0x300 || pid == 0x400 || pid == 0x402 || pid == 0x302)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue