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

fixed compilation issues with gpu modules:

Browse Source 
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
This commit is contained in:
Vladislav Vinogradov
2013-03-26 12:33:13 +04:00
parent 55c9a7c87d
commit 4dbd0f0e8f
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,16 +10,17 @@
#define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts/ts.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_OCL
# include "opencv2/nonfree/ocl.hpp"
#endif
#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
#include "opencv2/nonfree/gpu.hpp"
#ifdef HAVE_OPENCV_GPU
# include "opencv2/nonfree/gpu.hpp"
#endif
#ifdef GTEST_CREATE_SHARED_LIBRARY