fixed compilation issues with gpu modules:

* 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

View File

@@ -41,6 +41,9 @@
//M*/
#include "perf_precomp.hpp"
#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
#include "opencv2/ts/gpu_perf.hpp"
using namespace std;
@@ -59,8 +62,6 @@ using namespace perf;
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 0
#endif
#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
//////////////////////////////////////////////////////////////////////
// SURF