From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Tue, 7 Aug 2012 12:08:22 +0000 (+0400)
Subject: fixed build with CUDA 4.2
X-Git-Tag: accepted/2.0/20130307.220821~364^2~272^2~20^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76d46e20de34297235594fafb8f83e36d85a560e;p=profile%2Fivi%2Fopencv.git

fixed build with CUDA 4.2
---

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