mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-13 00:01:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "disable CUDA generalized Hough Transform"

Browse Source 
This reverts commit 33d42b740c.
(cherry picked from commit 5d099df578)
This commit is contained in:
Vladislav Vinogradov 2014-02-06 16:58:40 +04:00 committed by Alexander Smorkalov
parent cc73c7000f
commit 79e4f7eb78
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/cuda/generalized_hough.cu
View File

@ -40,8 +40,6 @@
// //
//M*/ //M*/
#define CUDA_DISABLER
#if !defined CUDA_DISABLER #if !defined CUDA_DISABLER
#include <thrust/device_ptr.h> #include <thrust/device_ptr.h>

2
modules/gpu/src/generalized_hough.cpp
View File

@ -40,8 +40,6 @@
// //
//M*/ //M*/
#define CUDA_DISABLER
#include "precomp.hpp" #include "precomp.hpp"
using namespace std; using namespace std;

2
modules/gpu/test/test_hough.cpp
View File

@ -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); const cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());