projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f4586f
)
fixed C4505
author
Ilya Lavrenov
<ilya.lavrenov@itseez.com>
Mon, 31 Mar 2014 13:30:08 +0000
(17:30 +0400)
committer
Ilya Lavrenov
<ilya.lavrenov@itseez.com>
Mon, 31 Mar 2014 13:30:15 +0000
(17:30 +0400)
modules/nonfree/perf/perf_main.cpp
patch
|
blob
|
history
diff --git
a/modules/nonfree/perf/perf_main.cpp
b/modules/nonfree/perf/perf_main.cpp
index
c9872a4
..
d46a36a
100644
(file)
--- a/
modules/nonfree/perf/perf_main.cpp
+++ b/
modules/nonfree/perf/perf_main.cpp
@@
-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());