fixed build with CUDA 4.2
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 7 Aug 2012 12:08:22 +0000 (16:08 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 7 Aug 2012 12:08:22 +0000 (16:08 +0400)
modules/gpu/src/color.cpp

index 403e2df..cb2ae33 100644 (file)
@@ -1161,7 +1161,7 @@ namespace
             (void)src;\r
             (void)dst;\r
             (void)dcn;\r
-            (void)stream;\r
+            (void)st;\r
             CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );\r
         #else\r
             CV_Assert(src.depth() == CV_8U);\r
@@ -1197,7 +1197,7 @@ namespace
             (void)src;\r
             (void)dst;\r
             (void)dcn;\r
-            (void)stream;\r
+            (void)st;\r
             CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );\r
         #else\r
             CV_Assert(src.depth() == CV_8U);\r
@@ -1233,7 +1233,7 @@ namespace
             (void)src;\r
             (void)dst;\r
             (void)dcn;\r
-            (void)stream;\r
+            (void)st;\r
             CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );\r
         #else\r
             CV_Assert(src.depth() == CV_8U);\r
@@ -1272,7 +1272,7 @@ namespace
             (void)src;\r
             (void)dst;\r
             (void)dcn;\r
-            (void)stream;\r
+            (void)st;\r
             CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );\r
         #else\r
             CV_Assert(src.depth() == CV_8U);\r
@@ -1310,7 +1310,7 @@ namespace
     #if (CUDA_VERSION < 5000)\r
         (void)src;\r
         (void)dst;\r
-        (void)stream;\r
+        (void)st;\r
         CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );\r
     #else\r
         CV_Assert(src.type() == CV_8UC4 || src.type() == CV_16UC4);\r