From a9764dd910b2051486bccc33d3831379418b0740 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Mon, 6 Aug 2012 18:08:57 +0400 Subject: [PATCH] fixed not defined macro warningds --- modules/gpu/test/test_color.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gpu/test/test_color.cpp b/modules/gpu/test/test_color.cpp index 89ca1a79a8..f627326b2e 100644 --- a/modules/gpu/test/test_color.cpp +++ b/modules/gpu/test/test_color.cpp @@ -1628,7 +1628,7 @@ TEST_P(CvtColor, BGR2Lab) } catch (const cv::Exception& e) { -#if (CUDA_VERSION < 5000) +#if defined (CUDA_VERSION) && (CUDA_VERSION < 5000) ASSERT_EQ(CV_StsBadFlag, e.code); #else FAIL(); @@ -1655,7 +1655,7 @@ TEST_P(CvtColor, RGB2Lab) } catch (const cv::Exception& e) { -#if (CUDA_VERSION < 5000) +#if defined (CUDA_VERSION) && (CUDA_VERSION < 5000) ASSERT_EQ(CV_StsBadFlag, e.code); #else FAIL(); @@ -1682,7 +1682,7 @@ TEST_P(CvtColor, BGR2Luv) } catch (const cv::Exception& e) { -#if (CUDA_VERSION < 5000) +#if defined (CUDA_VERSION) && (CUDA_VERSION < 5000) ASSERT_EQ(CV_StsBadFlag, e.code); #else FAIL(); @@ -1709,7 +1709,7 @@ TEST_P(CvtColor, RGB2Luv) } catch (const cv::Exception& e) { -#if (CUDA_VERSION < 5000) +#if defined (CUDA_VERSION) && (CUDA_VERSION < 5000) ASSERT_EQ(CV_StsBadFlag, e.code); #else FAIL(); @@ -1736,7 +1736,7 @@ TEST_P(CvtColor, RGBA2mRGBA) } catch (const cv::Exception& e) { -#if (CUDA_VERSION < 5000) +#if defined (CUDA_VERSION) && (CUDA_VERSION < 5000) ASSERT_EQ(CV_StsBadFlag, e.code); #else FAIL();