Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
2031ee25ab
|
@ -1412,7 +1412,8 @@ namespace hg_imgproc
|
||||||
std::vector<cv::Mat> mats(mats_);
|
std::vector<cv::Mat> mats(mats_);
|
||||||
mats_.clear();
|
mats_.clear();
|
||||||
|
|
||||||
CImageApplyColorCastCorrect::PreScheme deviceType = CImageApplyColorCastCorrect::G200;
|
int tmp = -1;
|
||||||
|
CImageApplyColorCastCorrect::PreScheme deviceType = (CImageApplyColorCastCorrect::PreScheme)tmp;
|
||||||
if (0x300 == pid_)
|
if (0x300 == pid_)
|
||||||
{
|
{
|
||||||
deviceType = CImageApplyColorCastCorrect::G300_D8;
|
deviceType = CImageApplyColorCastCorrect::G300_D8;
|
||||||
|
|
Loading…
Reference in New Issue