Merge pull request #5212 from thebucc:master

365603e1 · Alexander Alekhin · 5ee00ec5 · 421e1b23 · 365603e1 · 365603e1
Commit 365603e1 authored Aug 17, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

perf_channels.cpp modules/core/perf/opencl/perf_channels.cpp +3 -0

ts_perf.hpp modules/ts/include/opencv2/ts/ts_perf.hpp +0 -3

No files found.
--- a/modules/core/perf/opencl/perf_channels.cpp
+++ b/modules/core/perf/opencl/perf_channels.cpp
@@ -156,6 +156,9 @@ OCL_PERF_TEST_P(MixChannelsFixture, MixChannels,

 ///////////// InsertChannel ////////////////////////

+typedef std::tr1::tuple<cv::Size, MatDepth> Size_MatDepth_t;
+typedef TestBaseWithParam<Size_MatDepth_t> Size_MatDepth;
+
 typedef Size_MatDepth InsertChannelFixture;

 OCL_PERF_TEST_P(InsertChannelFixture, InsertChannel,

--- a/modules/ts/include/opencv2/ts/ts_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -477,9 +477,6 @@ template<typename T> class TestBaseWithParam: public TestBase, public ::testing:
 typedef std::tr1::tuple<cv::Size, MatType> Size_MatType_t;
 typedef TestBaseWithParam<Size_MatType_t> Size_MatType;

-typedef std::tr1::tuple<cv::Size, MatDepth> Size_MatDepth_t;
-typedef TestBaseWithParam<Size_MatDepth_t> Size_MatDepth;
-
 /*****************************************************************************************\
 *                              Print functions for googletest                             *
 \*****************************************************************************************/