From 5d099df57864d083881f026ffe32637afac6ba2e Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Thu, 6 Feb 2014 16:58:40 +0400
Subject: [PATCH] Revert "disable CUDA generalized Hough Transform"

This reverts commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3.
---
 modules/gpu/src/cuda/generalized_hough.cu | 2 --
 modules/gpu/src/generalized_hough.cpp     | 2 --
 modules/gpu/test/test_hough.cpp           | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/gpu/src/cuda/generalized_hough.cu b/modules/gpu/src/cuda/generalized_hough.cu
index 35451e7e2..5e2041eae 100644
--- 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 867ba7ee7..a92c37d1a 100644
--- 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 6441fc69a..f876a7a2b 100644
--- 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());