From d822d6f1013badd5c48531c0f1e27f0eb2f27129 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 7 Apr 2014 09:49:17 +0400 Subject: [PATCH] disable GeneralizedHough tests on gcc 4.7 --- modules/gpu/perf/perf_imgproc.cpp | 4 ++++ modules/gpu/test/test_hough.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/gpu/perf/perf_imgproc.cpp b/modules/gpu/perf/perf_imgproc.cpp index fa0a42cfef..01327d2a93 100644 --- a/modules/gpu/perf/perf_imgproc.cpp +++ b/modules/gpu/perf/perf_imgproc.cpp @@ -1832,6 +1832,8 @@ PERF_TEST_P(Sz_Dp_MinDist, ImgProc_HoughCircles, ////////////////////////////////////////////////////////////////////// // GeneralizedHough +#if !defined(__GNUC__) || (__GNUC__ * 10 + __GNUC_MINOR__ != 47) + CV_FLAGS(GHMethod, GHT_POSITION, GHT_SCALE, GHT_ROTATION) DEF_PARAM_TEST(Method_Sz, GHMethod, cv::Size); @@ -1918,3 +1920,5 @@ PERF_TEST_P(Method_Sz, DISABLED_ImgProc_GeneralizedHough, CPU_SANITY_CHECK(positions); } } + +#endif diff --git a/modules/gpu/test/test_hough.cpp b/modules/gpu/test/test_hough.cpp index f876a7a2b0..4ae00cfd08 100644 --- a/modules/gpu/test/test_hough.cpp +++ b/modules/gpu/test/test_hough.cpp @@ -185,6 +185,8 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, HoughCircles, testing::Combine( /////////////////////////////////////////////////////////////////////////////////////////////////////// // GeneralizedHough +#if !defined(__GNUC__) || (__GNUC__ * 10 + __GNUC_MINOR__ != 47) + PARAM_TEST_CASE(GeneralizedHough, cv::gpu::DeviceInfo, UseRoi) { }; @@ -252,4 +254,6 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, GeneralizedHough, testing::Combine( ALL_DEVICES, WHOLE_SUBMAT)); +#endif + #endif // HAVE_CUDA