Disabled vxuConvolution call for sepFilter evaluation

terfendail · terfendail · commit 4c0d833dec63 · 2017-04-11T15:57:20.000+03:00
diff --git a/3rdparty/openvx/hal/openvx_hal.hpp b/3rdparty/openvx/hal/openvx_hal.hpp
@@ -106,12 +106,12 @@ int ovx_hal_integral(int depth, int sdepth, int, const uchar * a, size_t astep,
 #undef cv_hal_filterFree
 #define cv_hal_filterFree ovx_hal_filterFree
 
-#undef cv_hal_sepFilterInit
-#define cv_hal_sepFilterInit ovx_hal_sepFilterInit
-#undef cv_hal_sepFilter
-#define cv_hal_sepFilter ovx_hal_filter
-#undef cv_hal_sepFilterFree
-#define cv_hal_sepFilterFree ovx_hal_filterFree
+//#undef cv_hal_sepFilterInit
+//#define cv_hal_sepFilterInit ovx_hal_sepFilterInit
+//#undef cv_hal_sepFilter
+//#define cv_hal_sepFilter ovx_hal_filter
+//#undef cv_hal_sepFilterFree
+//#define cv_hal_sepFilterFree ovx_hal_filterFree
 
 #if VX_VERSION > VX_VERSION_1_0
 
diff --git a/modules/imgproc/src/deriv.cpp b/modules/imgproc/src/deriv.cpp
@@ -191,8 +191,8 @@ namespace cv
         if (_src.type() != CV_8UC1 || _dst.type() != CV_16SC1 ||
             ksize != 3 || scale != 1.0 || delta != 0.0 ||
             (dx | dy) != 1 || (dx + dy) != 1 ||
-            _src.cols < ksize || _src.rows < ksize ||
-            ovx::skipSmallImages<VX_KERNEL_SOBEL_3x3>(_src.cols, _src.rows)
+            _src.cols() < ksize || _src.rows() < ksize ||
+            ovx::skipSmallImages<VX_KERNEL_SOBEL_3x3>(_src.cols(), _src.rows())
             )
             return false;
 
diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp
@@ -1646,11 +1646,11 @@ namespace cv
         if (ddepth < 0)
             ddepth = CV_8UC1;
         if (_src.type() != CV_8UC1 || ddepth != CV_8U || !normalize ||
-            _src.cols < 3 || _src.rows < 3 ||
+            _src.cols() < 3 || _src.rows() < 3 ||
             ksize.width != 3 || ksize.height != 3 ||
             (anchor.x >= 0 && anchor.x != 1) ||
             (anchor.y >= 0 && anchor.y != 1) ||
-            ovx::skipSmallImages<VX_KERNEL_BOX_3x3>(_src.cols, _src.rows))
+            ovx::skipSmallImages<VX_KERNEL_BOX_3x3>(_src.cols(), _src.rows()))
             return false;
 
         Mat src = _src.getMat();
@@ -2184,15 +2184,15 @@ static bool openvx_gaussianBlur(InputArray _src, OutputArray _dst, Size ksize,
         ksize.height = cvRound(sigma2*6 + 1) | 1;
 
     if (_src.type() != CV_8UC1 ||
-        _src.cols < 3 || _src.rows < 3 ||
+        _src.cols() < 3 || _src.rows() < 3 ||
         ksize.width != 3 || ksize.height != 3)
         return false;
 
     sigma1 = std::max(sigma1, 0.);
     sigma2 = std::max(sigma2, 0.);
 
     if (!(sigma1 == 0.0 || (sigma1 - 0.8) < DBL_EPSILON) || !(sigma2 == 0.0 || (sigma2 - 0.8) < DBL_EPSILON) ||
-        ovx::skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(_src.cols, _src.rows))
+        ovx::skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(_src.cols(), _src.rows()))
         return false;
 
     Mat src = _src.getMat();
