Merge pull request #917 from SpecLad:cuda-4-build

This commit is contained in:
Roman Donchenko 2013-05-23 15:15:00 +04:00 committed by OpenCV Buildbot
commit cfa985db43

View File

@ -1581,7 +1581,7 @@ namespace
(void)src;
(void)dst;
(void)st;
CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );
CV_Error( Error::StsBadFlag, "Unknown/unsupported color conversion code" );
#else
CV_Assert(src.type() == CV_8UC4 || src.type() == CV_16UC4);