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

cfa985db · Roman Donchenko · OpenCV Buildbot · 4da0cdb9 · dad58d89 · cfa985db
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

modules/gpu/src/color.cpp modules/gpu/src/color.cpp +1 -1

未找到文件。
--- a/modules/gpu/src/color.cpp
+++ b/modules/gpu/src/color.cpp
@@ -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);