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

disable GeneralizedHough tests on gcc 4.7

Browse Source
This commit is contained in:
Vladislav Vinogradov
2014-04-07 09:49:17 +04:00
parent f8d922ad3e
commit d822d6f101
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/perf/perf_imgproc.cpp
View File

@@ -1832,6 +1832,8 @@ PERF_TEST_P(Sz_Dp_MinDist, ImgProc_HoughCircles,
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// GeneralizedHough // GeneralizedHough
#if !defined(__GNUC__) || (__GNUC__ * 10 + __GNUC_MINOR__ != 47)
CV_FLAGS(GHMethod, GHT_POSITION, GHT_SCALE, GHT_ROTATION) CV_FLAGS(GHMethod, GHT_POSITION, GHT_SCALE, GHT_ROTATION)
DEF_PARAM_TEST(Method_Sz, GHMethod, cv::Size); DEF_PARAM_TEST(Method_Sz, GHMethod, cv::Size);
@@ -1918,3 +1920,5 @@ PERF_TEST_P(Method_Sz, DISABLED_ImgProc_GeneralizedHough,
CPU_SANITY_CHECK(positions); CPU_SANITY_CHECK(positions);
} }
} }
#endif

4
modules/gpu/test/test_hough.cpp
View File

@@ -185,6 +185,8 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, HoughCircles, testing::Combine(
/////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////
// GeneralizedHough // GeneralizedHough
#if !defined(__GNUC__) || (__GNUC__ * 10 + __GNUC_MINOR__ != 47)
PARAM_TEST_CASE(GeneralizedHough, cv::gpu::DeviceInfo, UseRoi) PARAM_TEST_CASE(GeneralizedHough, cv::gpu::DeviceInfo, UseRoi)
{ {
}; };
@@ -252,4 +254,6 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, GeneralizedHough, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
WHOLE_SUBMAT)); WHOLE_SUBMAT));
#endif
#endif // HAVE_CUDA #endif // HAVE_CUDA