Skip to content

O
opencv
Commit 76d46e20 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed build with CUDA 4.2

parent 8624d18c
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/gpu/src/color.cpp
View file @ 76d46e20
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment