ocl: stop using of OpenCL without explicit UMat arguments

2016-12-04 02:19:38 +03:00
parent 4a095e4d66
commit 44d9d59f08
4 changed files with 19 additions and 3 deletions
@@ -972,7 +972,7 @@ void ORB_Impl::detectAndCompute( InputArray _image, InputArray _mask,
    int halfPatchSize = patchSize / 2;
    int border = std::max(edgeThreshold, std::max(halfPatchSize, HARRIS_BLOCK_SIZE/2))+1;

-    bool useOCL = ocl::useOpenCL();
+    bool useOCL = ocl::useOpenCL() && OCL_FORCE_CHECK(_image.isUMat() || _descriptors.isUMat());

    Mat image = _image.getMat(), mask = _mask.getMat();
    if( image.type() != CV_8UC1 )