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:
af8ed9d
)
This statement was keeping HAAR cascades from leveraging opencl on nvidia devices...
author
Geoff McIver
<geoff@p0wdr.com>
Tue, 10 Oct 2017 20:32:38 +0000
(09:32 +1300)
committer
Geoff McIver
<geoff@p0wdr.com>
Tue, 10 Oct 2017 20:32:38 +0000
(09:32 +1300)
modules/objdetect/src/cascadedetect.cpp
patch
|
blob
|
history
diff --git
a/modules/objdetect/src/cascadedetect.cpp
b/modules/objdetect/src/cascadedetect.cpp
index
9b21f19
..
242fac3
100644
(file)
--- a/
modules/objdetect/src/cascadedetect.cpp
+++ b/
modules/objdetect/src/cascadedetect.cpp
@@
-609,7
+609,7
@@
bool HaarEvaluator::read(const FileNode& node, Size _origWinSize)
localSize = lbufSize = Size(0, 0);
if (ocl::haveOpenCL())
{
- if (ocl::Device::getDefault().isAMD() || ocl::Device::getDefault().isIntel())
+ if (ocl::Device::getDefault().isAMD() || ocl::Device::getDefault().isIntel()
|| ocl::Device::getDefault().isNVidia()
)
{
localSize = Size(8, 8);
lbufSize = Size(origWinSize.width + localSize.width,