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

Added Device:: isAMD,isIntel,isNvidia methods.

Browse Source
This commit is contained in:
Alexander Karsakov
2014-03-05 11:25:37 +04:00
parent 7ecbf45751
commit c1dad2178c
3 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/objdetect/src/cascadedetect.cpp
View File

@@ -583,9 +583,7 @@ bool HaarEvaluator::read(const FileNode& node, Size _origWinSize)
localSize = lbufSize = Size(0, 0);
if (ocl::haveOpenCL())
{
String vname = ocl::Device::getDefault().vendor();
if (vname == "Advanced Micro Devices, Inc." ||
vname == "AMD")
if (ocl::Device::getDefault().isAMD())
{
localSize = Size(8, 8);
lbufSize = Size(origWinSize.width + localSize.width,
@@ -769,9 +767,7 @@ bool LBPEvaluator::read( const FileNode& node, Size _origWinSize )
if (ocl::haveOpenCL())
{
const ocl::Device& device = ocl::Device::getDefault();
String vname = device.vendor();
if ((vname == "Advanced Micro Devices, Inc." ||
vname == "AMD") && !device.hostUnifiedMemory())
if (device.isAMD() && !device.hostUnifiedMemory())
localSize = Size(8, 8);
}
return true;