Merge pull request #553 from bitwangyaoyao:2.4_perfTest

12 years ago · c54c7c8b2c
parent 8304f17d63 6409a4b112
commit c54c7c8b2c
2 changed files with 4398 additions and 2 deletions
--- 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