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

Revert "Merge pull request #836 from jet47:gpu-modules"

Browse Source 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
This commit is contained in:
Andrey Kamaev
2013-04-18 15:03:50 +04:00
parent fba72cb60d
commit 416fb50594
472 changed files with 22945 additions and 29803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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