From f8d922ad3ee26f8e3f0f01d9b41ab45497034dc5 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Fri, 4 Apr 2014 10:31:33 +0400 Subject: [PATCH] disable gpu::GeneralizedHough compilation on gcc 4.7 --- modules/gpu/src/cuda/generalized_hough.cu | 4 ++++ modules/gpu/src/generalized_hough.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/gpu/src/cuda/generalized_hough.cu b/modules/gpu/src/cuda/generalized_hough.cu index 5e2041eae4..b07ef0f6b9 100644 --- a/modules/gpu/src/cuda/generalized_hough.cu +++ b/modules/gpu/src/cuda/generalized_hough.cu @@ -40,6 +40,10 @@ // //M*/ +#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47) +# define CUDA_DISABLER +#endif + #if !defined CUDA_DISABLER #include diff --git a/modules/gpu/src/generalized_hough.cpp b/modules/gpu/src/generalized_hough.cpp index a92c37d1a5..6f48161c9e 100644 --- a/modules/gpu/src/generalized_hough.cpp +++ b/modules/gpu/src/generalized_hough.cpp @@ -46,6 +46,10 @@ using namespace std; using namespace cv; using namespace cv::gpu; +#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47) +# define CUDA_DISABLER +#endif + #if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) Ptr cv::gpu::GeneralizedHough_GPU::create(int) { throw_nogpu(); return Ptr(); }