mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from Itseez/2.4

Browse Source 
2.4
This commit is contained in:
Maks Naumov 2014-04-09 22:48:19 +03:00
commit c098c18942
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/perf/perf_imgproc.cpp
View File

@ -1832,6 +1832,8 @@ PERF_TEST_P(Sz_Dp_MinDist, ImgProc_HoughCircles,
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// GeneralizedHough // GeneralizedHough
#if !defined(__GNUC__) || (__GNUC__ * 10 + __GNUC_MINOR__ != 47)
CV_FLAGS(GHMethod, GHT_POSITION, GHT_SCALE, GHT_ROTATION) CV_FLAGS(GHMethod, GHT_POSITION, GHT_SCALE, GHT_ROTATION)
DEF_PARAM_TEST(Method_Sz, GHMethod, cv::Size); DEF_PARAM_TEST(Method_Sz, GHMethod, cv::Size);
@ -1918,3 +1920,5 @@ PERF_TEST_P(Method_Sz, DISABLED_ImgProc_GeneralizedHough,
CPU_SANITY_CHECK(positions); CPU_SANITY_CHECK(positions);
} }
} }
#endif

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

@ -40,6 +40,10 @@
// //
//M*/ //M*/
#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47)
# define CUDA_DISABLER
#endif
#if !defined CUDA_DISABLER #if !defined CUDA_DISABLER
#include <thrust/device_ptr.h> #include <thrust/device_ptr.h>

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

@ -46,6 +46,10 @@ using namespace std;
using namespace cv; using namespace cv;
using namespace cv::gpu; using namespace cv::gpu;
#if defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ == 47)
# define CUDA_DISABLER
#endif
#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) #if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
Ptr<GeneralizedHough_GPU> cv::gpu::GeneralizedHough_GPU::create(int) { throw_nogpu(); return Ptr<GeneralizedHough_GPU>(); } Ptr<GeneralizedHough_GPU> cv::gpu::GeneralizedHough_GPU::create(int) { throw_nogpu(); return Ptr<GeneralizedHough_GPU>(); }

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

@ -185,6 +185,8 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, HoughCircles, testing::Combine(
/////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////
// GeneralizedHough // GeneralizedHough
#if !defined(__GNUC__) || (__GNUC__ * 10 + __GNUC_MINOR__ != 47)
PARAM_TEST_CASE(GeneralizedHough, cv::gpu::DeviceInfo, UseRoi) PARAM_TEST_CASE(GeneralizedHough, cv::gpu::DeviceInfo, UseRoi)
{ {
}; };
@ -252,4 +254,6 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, GeneralizedHough, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
WHOLE_SUBMAT)); WHOLE_SUBMAT));
#endif
#endif // HAVE_CUDA #endif // HAVE_CUDA