Revert "disable CUDA generalized Hough Transform"

This reverts commit 33d42b740c.
2014-02-06 16:58:40 +04:00 · 2014-02-06 16:58:40 +04:00 · 5d099df578
commit 5d099df578
parent 3e4bb371c8
3 changed files with 1 additions and 5 deletions
--- 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>
--- 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;
--- 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());