fix for incorrect opencl device selection

2014-03-18 13:19:41 +04:00
parent dc28451b8a
commit eebf92ba58
2 changed files with 4 additions and 3 deletions
--- a/modules/core/src/umatrix.cpp
+++ b/modules/core/src/umatrix.cpp
@@ -88,7 +88,7 @@ void UMatData::unlock()

 MatAllocator* UMat::getStdAllocator()
 {
-    if( ocl::haveOpenCL() )
+    if( ocl::haveOpenCL() && ocl::useOpenCL() )
        return ocl::getOpenCLAllocator();
    return Mat::getStdAllocator();
 }