disable gpu::GeneralizedHough compilation on gcc 4.7

pull/2572/head
Vladislav Vinogradov 11 years ago
parent a8cb5c3983
commit f8d922ad3e
  1. 4
      modules/gpu/src/cuda/generalized_hough.cu
  2. 4
      modules/gpu/src/generalized_hough.cpp

@ -40,6 +40,10 @@
//
//M*/
#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47)
# define CUDA_DISABLER
#endif
#if !defined CUDA_DISABLER
#include <thrust/device_ptr.h>

@ -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<GeneralizedHough_GPU> cv::gpu::GeneralizedHough_GPU::create(int) { throw_nogpu(); return Ptr<GeneralizedHough_GPU>(); }

Loading…
Cancel
Save