diff --git a/modules/gpu/perf/perf_calib3d.cpp b/modules/gpu/perf/perf_calib3d.cpp index e56bbd6834..5199e86ba8 100644 --- a/modules/gpu/perf/perf_calib3d.cpp +++ b/modules/gpu/perf/perf_calib3d.cpp @@ -41,7 +41,7 @@ //M*/ #include "perf_precomp.hpp" -#include "perf_util.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_core.cpp b/modules/gpu/perf/perf_core.cpp index 806773b1a2..1e5933f234 100644 --- a/modules/gpu/perf/perf_core.cpp +++ b/modules/gpu/perf/perf_core.cpp @@ -41,7 +41,7 @@ //M*/ #include "perf_precomp.hpp" -#include "perf_util.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_denoising.cpp b/modules/gpu/perf/perf_denoising.cpp index e3a9c5a3fd..79ad8e11fd 100644 --- a/modules/gpu/perf/perf_denoising.cpp +++ b/modules/gpu/perf/perf_denoising.cpp @@ -41,6 +41,7 @@ //M*/ #include "perf_precomp.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_features2d.cpp b/modules/gpu/perf/perf_features2d.cpp index 5a21acdff6..d1d0ab5f1e 100644 --- a/modules/gpu/perf/perf_features2d.cpp +++ b/modules/gpu/perf/perf_features2d.cpp @@ -41,6 +41,7 @@ //M*/ #include "perf_precomp.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_filters.cpp b/modules/gpu/perf/perf_filters.cpp index 81984f2a31..f8889db855 100644 --- a/modules/gpu/perf/perf_filters.cpp +++ b/modules/gpu/perf/perf_filters.cpp @@ -41,7 +41,7 @@ //M*/ #include "perf_precomp.hpp" -#include "perf_util.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_imgproc.cpp b/modules/gpu/perf/perf_imgproc.cpp index 8ff0a5eadb..4117cc6367 100644 --- a/modules/gpu/perf/perf_imgproc.cpp +++ b/modules/gpu/perf/perf_imgproc.cpp @@ -41,7 +41,7 @@ //M*/ #include "perf_precomp.hpp" -#include "perf_util.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_labeling.cpp b/modules/gpu/perf/perf_labeling.cpp index 0484da9d59..e62faaafc3 100644 --- a/modules/gpu/perf/perf_labeling.cpp +++ b/modules/gpu/perf/perf_labeling.cpp @@ -41,6 +41,7 @@ //M*/ #include "perf_precomp.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_main.cpp b/modules/gpu/perf/perf_main.cpp index 53a19ca412..3897717b5e 100644 --- a/modules/gpu/perf/perf_main.cpp +++ b/modules/gpu/perf/perf_main.cpp @@ -41,6 +41,7 @@ //M*/ #include "perf_precomp.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace perf; diff --git a/modules/gpu/perf/perf_matop.cpp b/modules/gpu/perf/perf_matop.cpp index 352a620704..7a9b9b93cb 100644 --- a/modules/gpu/perf/perf_matop.cpp +++ b/modules/gpu/perf/perf_matop.cpp @@ -41,7 +41,7 @@ //M*/ #include "perf_precomp.hpp" -#include "perf_util.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_objdetect.cpp b/modules/gpu/perf/perf_objdetect.cpp index 1516d6b99b..5f6b67795c 100644 --- a/modules/gpu/perf/perf_objdetect.cpp +++ b/modules/gpu/perf/perf_objdetect.cpp @@ -41,6 +41,7 @@ //M*/ #include "perf_precomp.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/gpu/perf/perf_precomp.hpp b/modules/gpu/perf/perf_precomp.hpp index c9cf886bc4..64ddb8bfae 100644 --- a/modules/gpu/perf/perf_precomp.hpp +++ b/modules/gpu/perf/perf_precomp.hpp @@ -61,7 +61,6 @@ #endif #include "opencv2/ts/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/core/core.hpp" #include "opencv2/highgui/highgui.hpp" diff --git a/modules/gpu/perf/perf_util.hpp b/modules/gpu/perf/perf_util.hpp deleted file mode 100644 index 855da4d265..0000000000 --- a/modules/gpu/perf/perf_util.hpp +++ /dev/null @@ -1,53 +0,0 @@ -/*M/////////////////////////////////////////////////////////////////////////////////////// -// -// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. -// -// By downloading, copying, installing or using the software you agree to this license. -// If you do not agree to this license, do not download, install, -// copy or use the software. -// -// -// License Agreement -// For Open Source Computer Vision Library -// -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. -// Third party copyrights are property of their respective owners. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// * Redistribution's of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Redistribution's in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// * The name of the copyright holders may not be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// This software is provided by the copyright holders and contributors "as is" and -// any express or implied warranties, including, but not limited to, the implied -// warranties of merchantability and fitness for a particular purpose are disclaimed. -// In no event shall the Intel Corporation or contributors be liable for any direct, -// indirect, incidental, special, exemplary, or consequential damages -// (including, but not limited to, procurement of substitute goods or services; -// loss of use, data, or profits; or business interruption) however caused -// and on any theory of liability, whether in contract, strict liability, -// or tort (including negligence or otherwise) arising in any way out of -// the use of this software, even if advised of the possibility of such damage. -// -//M*/ - -#ifndef __OPENCV_PERF_UTIL_HPP__ -#define __OPENCV_PERF_UTIL_HPP__ - -namespace perf { -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); -} - -#endif // __OPENCV_PERF_UTIL_HPP__ diff --git a/modules/gpu/perf/perf_video.cpp b/modules/gpu/perf/perf_video.cpp index cb0311e580..663b825dcc 100644 --- a/modules/gpu/perf/perf_video.cpp +++ b/modules/gpu/perf/perf_video.cpp @@ -41,6 +41,7 @@ //M*/ #include "perf_precomp.hpp" +#include "opencv2/ts/gpu_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/ts/include/opencv2/ts/gpu_perf.hpp b/modules/ts/include/opencv2/ts/gpu_perf.hpp index 0054963edb..87f1737c2f 100644 --- a/modules/ts/include/opencv2/ts/gpu_perf.hpp +++ b/modules/ts/include/opencv2/ts/gpu_perf.hpp @@ -73,6 +73,11 @@ 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"