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

disabled utility code in gpu tests when WITH_CUDA=false

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-09-13 12:17:35 +04:00
parent fd77ef7ece
commit 35b671efb5
5 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/test/main_test_nvidia.h
View File

@ -1,8 +1,6 @@
#ifndef __main_test_nvidia_h__ #ifndef __main_test_nvidia_h__
#define __main_test_nvidia_h__ #define __main_test_nvidia_h__
#include <string>
enum OutputLevel enum OutputLevel
{ {
OutputLevelNone, OutputLevelNone,

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

@ -41,13 +41,13 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
using namespace cvtest; using namespace cvtest;
using namespace testing; using namespace testing;
OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo> struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo>
{ {
cv::gpu::DeviceInfo devInfo; cv::gpu::DeviceInfo devInfo;

30
modules/gpu/test/test_precomp.hpp
View File

@ -61,24 +61,24 @@
#include "cvconfig.h" #include "cvconfig.h"
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/video.hpp"
#include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/legacy/legacy.hpp"
#include "utility.hpp"
#include "interpolation.hpp"
#include "main_test_nvidia.h"
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#include <cuda.h> #include <cuda.h>
#include <cuda_runtime.h> #include <cuda_runtime.h>
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/video.hpp"
#include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/legacy/legacy.hpp"
#include "utility.hpp"
#include "interpolation.hpp"
#include "main_test_nvidia.h"
#endif #endif
#endif #endif

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

@ -41,6 +41,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_CUDA
using namespace std; using namespace std;
using namespace cv; using namespace cv;
using namespace cv::gpu; using namespace cv::gpu;
@ -418,3 +420,5 @@ void showDiff(InputArray gold_, InputArray actual_, double eps)
waitKey(); waitKey();
} }
#endif // HAVE_CUDA

8
modules/gpu/test/utility.hpp
View File

@ -42,14 +42,6 @@
#ifndef __OPENCV_TEST_UTILITY_HPP__ #ifndef __OPENCV_TEST_UTILITY_HPP__
#define __OPENCV_TEST_UTILITY_HPP__ #define __OPENCV_TEST_UTILITY_HPP__
#include <vector>
#include <string>
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// random generators // random generators