projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5022bc8
)
Fix the problem of device selection on hybrid video systems.
author
yao
<bitwangyaoyao@gmail.com>
Fri, 5 Apr 2013 01:19:59 +0000
(09:19 +0800)
committer
yao
<bitwangyaoyao@gmail.com>
Fri, 5 Apr 2013 01:19:59 +0000
(09:19 +0800)
modules/ocl/test/main.cpp
patch
|
blob
|
history
diff --git
a/modules/ocl/test/main.cpp
b/modules/ocl/test/main.cpp
index
856828d
..
dd46ff6
100644
(file)
--- a/
modules/ocl/test/main.cpp
+++ b/
modules/ocl/test/main.cpp
@@
-115,10
+115,9
@@
int main(int argc, char **argv)
std::cout << "platform invalid\n";
return -1;
}
- if(pid != 0 || device != 0)
- {
- setDevice(oclinfo[pid], device);
- }
+
+ setDevice(oclinfo[pid], device);
+
cout << "Device type:" << type << endl << "Device name:" << oclinfo[pid].DeviceName[device] << endl;
return RUN_ALL_TESTS();
}