Merge pull request #553 from bitwangyaoyao:2.4_perfTest

c54c7c8b · Andrey Kamaev · OpenCV Buildbot · 8304f17d · 6409a4b1 · c54c7c8b
Commit c54c7c8b authored Feb 27, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Feb 27, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

perf_arithm.cpp modules/ocl/perf/perf_arithm.cpp +2 -2

performance.cpp samples/ocl/performance.cpp +0 -0

No files found.
--- a/modules/ocl/perf/perf_arithm.cpp
+++ b/modules/ocl/perf/perf_arithm.cpp
@@ -4317,11 +4317,11 @@ INSTANTIATE_TEST_CASE_P(Arithm, Lut, Combine(
                            Values(false))); // Values(false) is the reserved parameter

 INSTANTIATE_TEST_CASE_P(Arithm, Exp, Combine(
-                            Values(CV_32FC1, CV_64FC1),
+                            Values(CV_32FC1, CV_32FC1),
                            Values(false))); // Values(false) is the reserved parameter

 INSTANTIATE_TEST_CASE_P(Arithm, Log, Combine(
-                            Values(CV_32FC1, CV_64FC1),
+                            Values(CV_32FC1, CV_32FC1),
                            Values(false))); // Values(false) is the reserved parameter

 INSTANTIATE_TEST_CASE_P(Arithm, Add, Combine(

--- a/samples/ocl/performance.cpp
+++ b/samples/ocl/performance.cpp