Revert "disable CUDA generalized Hough Transform"

This reverts commit 33d42b74. (cherry picked from commit 5d099df5)

Revert "disable CUDA generalized Hough Transform"
This reverts commit 33d42b74. (cherry picked from commit 5d099df5)
79e4f7eb · Vladislav Vinogradov · Alexander Smorkalov · cc73c700 · 79e4f7eb · 79e4f7eb
Commit 79e4f7eb authored Feb 06, 2014 by Vladislav Vinogradov Committed by Alexander Smorkalov Feb 07, 2014
Showing with 1 addition and 5 deletions

generalized_hough.cu modules/gpu/src/cuda/generalized_hough.cu +0 -2

generalized_hough.cpp modules/gpu/src/generalized_hough.cpp +0 -2

test_hough.cpp modules/gpu/test/test_hough.cpp +1 -1

No files found.
--- 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());