generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed not defined macro warningds

Browse Source
This commit is contained in:
marina.kolpakova 2012-08-06 18:08:57 +04:00
parent 51433a9331
commit a9764dd910
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/test/test_color.cpp
View File

@ -1628,7 +1628,7 @@ TEST_P(CvtColor, BGR2Lab)
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
#if (CUDA_VERSION < 5000) #if defined (CUDA_VERSION) && (CUDA_VERSION < 5000)
ASSERT_EQ(CV_StsBadFlag, e.code); ASSERT_EQ(CV_StsBadFlag, e.code);
#else #else
FAIL(); FAIL();
@ -1655,7 +1655,7 @@ TEST_P(CvtColor, RGB2Lab)
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
#if (CUDA_VERSION < 5000) #if defined (CUDA_VERSION) && (CUDA_VERSION < 5000)
ASSERT_EQ(CV_StsBadFlag, e.code); ASSERT_EQ(CV_StsBadFlag, e.code);
#else #else
FAIL(); FAIL();
@ -1682,7 +1682,7 @@ TEST_P(CvtColor, BGR2Luv)
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
#if (CUDA_VERSION < 5000) #if defined (CUDA_VERSION) && (CUDA_VERSION < 5000)
ASSERT_EQ(CV_StsBadFlag, e.code); ASSERT_EQ(CV_StsBadFlag, e.code);
#else #else
FAIL(); FAIL();
@ -1709,7 +1709,7 @@ TEST_P(CvtColor, RGB2Luv)
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
#if (CUDA_VERSION < 5000) #if defined (CUDA_VERSION) && (CUDA_VERSION < 5000)
ASSERT_EQ(CV_StsBadFlag, e.code); ASSERT_EQ(CV_StsBadFlag, e.code);
#else #else
FAIL(); FAIL();
@ -1736,7 +1736,7 @@ TEST_P(CvtColor, RGBA2mRGBA)
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
#if (CUDA_VERSION < 5000) #if defined (CUDA_VERSION) && (CUDA_VERSION < 5000)
ASSERT_EQ(CV_StsBadFlag, e.code); ASSERT_EQ(CV_StsBadFlag, e.code);
#else #else
FAIL(); FAIL();