Merge pull request #1610 from alalek:ocl_fix_perf_kalman

c5afaa4e · Andrey Pavlenko · OpenCV Buildbot · 19dca324 · 4413bee6 · c5afaa4e
Commit c5afaa4e authored Oct 12, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Oct 12, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

perf_kalman.cpp modules/ocl/perf/perf_kalman.cpp +5 -3

No files found.
--- a/modules/ocl/perf/perf_kalman.cpp
+++ b/modules/ocl/perf/perf_kalman.cpp
@@ -57,12 +57,14 @@ using std::tr1::get;

 ///////////// Kalman Filter ////////////////////////

-typedef TestBaseWithParam<int> KalmanFilterFixture;
+typedef tuple<int> KalmanFilterType;
+typedef TestBaseWithParam<KalmanFilterType> KalmanFilterFixture;

 PERF_TEST_P(KalmanFilterFixture, KalmanFilter,
-            ::testing::Values(1000, 1500))
+    ::testing::Values(1000, 1500))
 {
-    const int dim = GetParam();
+    KalmanFilterType params = GetParam();
+    const int dim = get<0>(params);

    cv::Mat sample(dim, 1, CV_32FC1), dresult;
    randu(sample, -1, 1);