Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop

This commit is contained in:
TinyOh 2019-01-29 17:31:45 +08:00
commit 4b161693b1

View File

@ -155,8 +155,8 @@ bool DisparityProcessor::OnProcess(
tmp2 = input->second;
} else if (input->first.channels() >= 3) {
// s210
cv::cvtColor(input->first, tmp1, CV_RGB2GRAY);
cv::cvtColor(input->second, tmp2, CV_RGB2GRAY);
cv::cvtColor(input->first, tmp1, cv::COLOR_RGB2GRAY);
cv::cvtColor(input->second, tmp2, cv::COLOR_RGB2GRAY);
}
bm_matcher->compute(tmp1, tmp2, disparity);
} else {