potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #2551 from ilya-lavrenov:ocl_nonfree

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-03-31 21:21:27 +04:00
committed by OpenCV Buildbot
parent bb3c0c066c 7df92bbb77
commit 97eac3f394
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/nonfree/perf/perf_main.cpp
+3 -1
View File
@@ -31,7 +31,9 @@ static const char * impls[] = {
int main(int argc, char **argv)
{
::perf::TestBase::setPerformanceStrategy(::perf::PERF_STRATEGY_SIMPLE);
#if defined(HAVE_CUDA)
#if defined(HAVE_CUDA) && defined(HAVE_OPENCL)
CV_PERF_TEST_MAIN_INTERNALS(nonfree, impls, perf::printCudaInfo(), dumpOpenCLDevice());
#elif defined(HAVE_CUDA)
CV_PERF_TEST_MAIN_INTERNALS(nonfree, impls, perf::printCudaInfo());
#elif defined(HAVE_OPENCL)
CV_PERF_TEST_MAIN_INTERNALS(nonfree, impls, dumpOpenCLDevice());