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

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).

Browse Source
This commit is contained in:
thebucc 2015-08-17 16:09:00 +01:00
parent 5ee00ec5c6
commit 421e1b237c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/perf/opencl/perf_channels.cpp
View File

@ -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,

3
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -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 *
\*****************************************************************************************/