Merge pull request #1663 from vpisarev:ocl_experiments3

This commit is contained in:
Andrey Pavlenko
2013-10-29 11:14:15 +04:00
committed by OpenCV Buildbot
25 changed files with 5654 additions and 443 deletions

View File

@@ -9,7 +9,7 @@ using std::tr1::get;
typedef tr1::tuple<Size, MatType> Size_Source_t;
typedef TestBaseWithParam<Size_Source_t> Size_Source;
typedef TestBaseWithParam<Size> MatSize;
typedef TestBaseWithParam<Size> TestMatSize;
static const float rangeHight = 256.0f;
static const float rangeLow = 0.0f;
@@ -99,6 +99,7 @@ PERF_TEST_P(Size_Source, calcHist3d,
SANITY_CHECK(hist);
}
#define MatSize TestMatSize
PERF_TEST_P(MatSize, equalizeHist,
testing::Values(TYPICAL_MAT_SIZES)
)
@@ -115,6 +116,7 @@ PERF_TEST_P(MatSize, equalizeHist,
SANITY_CHECK(destination);
}
#undef MatSize
typedef tr1::tuple<Size, double> Sz_ClipLimit_t;
typedef TestBaseWithParam<Sz_ClipLimit_t> Sz_ClipLimit;