Merge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr

218f7574 · Alexander Alekhin · b0e9346e · d9f6a067 · 218f7574
Commit 218f7574 authored Oct 10, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

deriv.cpp modules/imgproc/src/deriv.cpp +2 -2

No files found.
--- a/modules/imgproc/src/deriv.cpp
+++ b/modules/imgproc/src/deriv.cpp
@@ -539,7 +539,7 @@ void cv::Sobel( InputArray _src, OutputArray _dst, int ddepth, int dx, int dy,
    }
 #endif
-    CV_IPP_RUN(true, ipp_sobel(_src, _dst, ddepth, dx, dy, ksize, scale, delta, borderType));
+    CV_IPP_RUN(!(ocl::useOpenCL() && _dst.isUMat()), ipp_sobel(_src, _dst, ddepth, dx, dy, ksize, scale, delta, borderType));
    int ktype = std::max(CV_32F, std::max(ddepth, sdepth));
@@ -578,7 +578,7 @@ void cv::Scharr( InputArray _src, OutputArray _dst, int ddepth, int dx, int dy,
    }
 #endif
-    CV_IPP_RUN(true, IPPDerivScharr(_src, _dst, ddepth, dx, dy, scale, delta, borderType));
+    CV_IPP_RUN(!(ocl::useOpenCL() && _dst.isUMat()), IPPDerivScharr(_src, _dst, ddepth, dx, dy, scale, delta, borderType));
    int ktype = std::max(CV_32F, std::max(ddepth, sdepth));