Revert "disable CUDA generalized Hough Transform"

This reverts commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3.

diff --git a/modules/gpu/src/cuda/generalized_hough.cu b/modules/gpu/src/cuda/generalized_hough.cu
index 35451e7..5e2041e 100644 (file)
--- a/modules/gpu/src/cuda/generalized_hough.cu
+++ b/modules/gpu/src/cuda/generalized_hough.cu
@@ -40,8 +40,6 @@
 //
 //M*/
 
-#define CUDA_DISABLER
-
 #if !defined CUDA_DISABLER
 
 #include <thrust/device_ptr.h>

diff --git a/modules/gpu/src/generalized_hough.cpp b/modules/gpu/src/generalized_hough.cpp
index 867ba7e..a92c37d 100644 (file)
--- a/modules/gpu/src/generalized_hough.cpp
+++ b/modules/gpu/src/generalized_hough.cpp
@@ -40,8 +40,6 @@
 //
 //M*/
 
-#define CUDA_DISABLER
-
 #include "precomp.hpp"
 
 using namespace std;

diff --git a/modules/gpu/test/test_hough.cpp b/modules/gpu/test/test_hough.cpp
index 6441fc6..f876a7a 100644 (file)
--- a/modules/gpu/test/test_hough.cpp
+++ b/modules/gpu/test/test_hough.cpp
@@ -189,7 +189,7 @@ PARAM_TEST_CASE(GeneralizedHough, cv::gpu::DeviceInfo, UseRoi)
 {
 };
 
-GPU_TEST_P(GeneralizedHough, DISABLED_POSITION)
+GPU_TEST_P(GeneralizedHough, POSITION)
 {
     const cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
     cv::gpu::setDevice(devInfo.deviceID());