From 421e1b237c4c0024f46a9ab06ca23497d8cb2204 Mon Sep 17 00:00:00 2001
From: thebucc <thebucc@users.noreply.github.com>
Date: Mon, 17 Aug 2015 16:09:00 +0100
Subject: [PATCH] Fix for bug #5007: moved definition of Size_MatDepth_t and
 Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer
 to where they are needed and live in a different namespace (possibly the
 reason why the fix works).

---
 modules/core/perf/opencl/perf_channels.cpp | 3 +++
 modules/ts/include/opencv2/ts/ts_perf.hpp  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/perf/opencl/perf_channels.cpp b/modules/core/perf/opencl/perf_channels.cpp
index 62d6b822b..881e79afc 100644
--- 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,
diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp
index aac8ae502..703aed013 100644
--- 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                             *
 \*****************************************************************************************/