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

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-28 11:10:40 +04:00
parent c5e979ceb7 2be893a21e
commit 891d7da6ee
39 changed files with 6898 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/perf/perf_arithm.cpp
View File

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