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

multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-08-16 00:29:10 +04:00
parent daaa5a1824
commit e9729a9601
13 changed files with 72 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/ocl.cpp
View File

@@ -1765,7 +1765,7 @@ struct Device::Impl
if (vendorName_ == "Advanced Micro Devices, Inc." ||
vendorName_ == "AMD")
vendorID_ = VENDOR_AMD;
else if (vendorName_ == "Intel(R) Corporation")
else if (vendorName_ == "Intel(R) Corporation" || vendorName_ == "Intel" || strstr(name_.c_str(), "Iris") != 0)
vendorID_ = VENDOR_INTEL;
else if (vendorName_ == "NVIDIA Corporation")
vendorID_ = VENDOR_NVIDIA;

5
modules/core/src/parallel.cpp
View File

@@ -240,6 +240,11 @@ void cv::parallel_for_(const cv::Range& range, const cv::ParallelLoopBody& body,
{
ProxyLoopBody pbody(body, range, nstripes);
cv::Range stripeRange = pbody.stripeRange();
if( stripeRange.end - stripeRange.start == 1 )
{
body(range);
return;
}
#if defined HAVE_TBB