Commit f8d922ad authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

disable gpu::GeneralizedHough compilation on gcc 4.7

parent a8cb5c39
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
// //
//M*/ //M*/
#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47)
# define CUDA_DISABLER
#endif
#if !defined CUDA_DISABLER #if !defined CUDA_DISABLER
#include <thrust/device_ptr.h> #include <thrust/device_ptr.h>
......
...@@ -46,6 +46,10 @@ using namespace std; ...@@ -46,6 +46,10 @@ using namespace std;
using namespace cv; using namespace cv;
using namespace cv::gpu; using namespace cv::gpu;
#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47)
# define CUDA_DISABLER
#endif
#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) #if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
Ptr<GeneralizedHough_GPU> cv::gpu::GeneralizedHough_GPU::create(int) { throw_nogpu(); return Ptr<GeneralizedHough_GPU>(); } Ptr<GeneralizedHough_GPU> cv::gpu::GeneralizedHough_GPU::create(int) { throw_nogpu(); return Ptr<GeneralizedHough_GPU>(); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment