generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nonfree module fixes

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-18 10:10:55 +04:00
parent 5d7bbdc837
commit 12f16b7a26
11 changed files with 31 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/nonfree/perf/perf_gpu.cpp
View File

@@ -42,7 +42,7 @@
#include "perf_precomp.hpp"
#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
#ifdef HAVE_CUDA
#include "opencv2/ts/gpu_perf.hpp"
@@ -65,6 +65,8 @@ using namespace perf;
//////////////////////////////////////////////////////////////////////
// SURF
#ifdef HAVE_OPENCV_GPUARITHM
DEF_PARAM_TEST_1(Image, string);
PERF_TEST_P(Image, GPU_SURF,
@@ -108,6 +110,8 @@ PERF_TEST_P(Image, GPU_SURF,
}
}
#endif // HAVE_OPENCV_GPUARITHM
//////////////////////////////////////////////////////
// VIBE
@@ -177,6 +181,6 @@ PERF_TEST_P(Video_Cn, GPU_VIBE,
}
}
#endif
#endif // BUILD_WITH_VIDEO_INPUT_SUPPORT
#endif
#endif // HAVE_CUDA

5
modules/nonfree/perf/perf_precomp.hpp
View File

@@ -19,9 +19,8 @@
# include "opencv2/nonfree/ocl.hpp"
#endif
#ifdef HAVE_OPENCV_GPU
#include "opencv2/nonfree/gpu.hpp"
#include "opencv2/ts/gpu_perf.hpp"
#ifdef HAVE_CUDA
# include "opencv2/nonfree/gpu.hpp"
#endif
#ifdef GTEST_CREATE_SHARED_LIBRARY