From 76d46e20de34297235594fafb8f83e36d85a560e Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 7 Aug 2012 16:08:22 +0400 Subject: [PATCH] fixed build with CUDA 4.2 --- modules/gpu/src/color.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gpu/src/color.cpp b/modules/gpu/src/color.cpp index 403e2dfae3..cb2ae33d71 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);