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

Fixed cmake and build issues when using Visual Studio 2015

Browse Source
This commit is contained in:
Maksim Shabunin
2015-10-26 16:55:42 +03:00
parent 4552ca98c4
commit f49936a849
59 changed files with 520 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ts/include/opencv2/ts/gpu_perf.hpp
View File

@@ -73,11 +73,6 @@ namespace perf
#define DEF_PARAM_TEST(name, ...) typedef ::perf::TestBaseWithParam< std::tr1::tuple< __VA_ARGS__ > > name
#define DEF_PARAM_TEST_1(name, param_type) typedef ::perf::TestBaseWithParam< param_type > name
DEF_PARAM_TEST_1(Sz, cv::Size);
typedef perf::Size_MatType Sz_Type;
DEF_PARAM_TEST(Sz_Depth, cv::Size, perf::MatDepth);
DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, perf::MatDepth, MatCn);
#define GPU_TYPICAL_MAT_SIZES testing::Values(perf::sz720p, perf::szSXGA, perf::sz1080p)
#define FAIL_NO_CPU() FAIL() << "No such CPU implementation analogy"