diff --git a/modules/imgproc/src/hal_replacement.hpp b/modules/imgproc/src/hal_replacement.hpp index 261c646876..2531fc1ba0 100644 --- a/modules/imgproc/src/hal_replacement.hpp +++ b/modules/imgproc/src/hal_replacement.hpp @@ -671,13 +671,13 @@ inline int hal_ni_threshold(const uchar* src_data, size_t src_step, uchar* dst_d @param dst_data,dst_step Destination image @param width,height Source image dimensions @param cn Number of channels - @param margins Margins for source image - @param ksize Size of kernel - @param anchor Anchor point + @param margin_left,margin_top,margin_right,margin_bottom Margins for source image + @param ksize_width,ksize_height Size of kernel + @param anchor_x,anchor_y Anchor point @param normalize If true then result is normalized @param border_type Border type */ -inline int hal_ni_boxFilter(int src_depth, int dst_depth, const uchar* src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int cn, CvRect margins, CvSize ksize, CvPoint anchor, bool normalize, int border_type) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_boxFilter(int src_depth, int dst_depth, const uchar* src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int cn, int margin_left, int margin_top, int margin_right, int margin_bottom, size_t ksize_width, size_t ksize_height, int anchor_x, int anchor_y, bool normalize, int border_type) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } //! @cond IGNORED #define cv_hal_boxFilter hal_ni_boxFilter @@ -690,12 +690,12 @@ inline int hal_ni_boxFilter(int src_depth, int dst_depth, const uchar* src_data, @param dst_data,dst_step Destination image @param width,height Source image dimensions @param cn Number of channels - @param margins Margins for source image - @param ksize Size of kernel + @param margin_left,margin_top,margin_right,margin_bottom Margins for source image + @param ksize_width,ksize_height Size of kernel @param sigmaX,sigmaY Gaussian kernel standard deviation. @param border_type Border type */ -inline int hal_ni_gaussianBlur(int depth, const uchar* src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int cn, CvRect margins, CvSize ksize, double sigmaX, double sigmaY, int border_type) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_gaussianBlur(int depth, const uchar* src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int cn, size_t margin_left, size_t margin_top, size_t margin_right, size_t margin_bottom, size_t ksize_width, size_t ksize_height, double sigmaX, double sigmaY, int border_type) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } //! @cond IGNORED #define cv_hal_gaussianBlur hal_ni_gaussianBlur diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp index 07fa6040c5..2791051a99 100644 --- a/modules/imgproc/src/smooth.cpp +++ b/modules/imgproc/src/smooth.cpp @@ -1559,10 +1559,9 @@ void cv::boxFilter( InputArray _src, OutputArray _dst, int ddepth, src.locateROI( wsz, ofs ); borderType = (borderType&~BORDER_ISOLATED); - CvRect margin = cvRect(ofs.x, ofs.y, wsz.width - src.cols - ofs.x, wsz.height - src.rows - ofs.y); - CALL_HAL(boxFilter, cv_hal_boxFilter, sdepth, ddepth, src.ptr(), src.step, dst.ptr(), dst.step, src.cols, src.rows, cn, - margin, (CvSize)(ksize), (CvPoint)(anchor), normalize, borderType); + ofs.x, ofs.y, wsz.width - src.cols - ofs.x, wsz.height - src.rows - ofs.y, ksize.width, ksize.height, + anchor.x, anchor.y, normalize, borderType); #ifdef HAVE_TEGRA_OPTIMIZATION if ( tegra::useTegra() && tegra::box(src, dst, ksize, anchor, normalize, borderType) ) @@ -2123,10 +2122,9 @@ void cv::GaussianBlur( InputArray _src, OutputArray _dst, Size ksize, src.locateROI( wsz, ofs ); borderType = (borderType&~BORDER_ISOLATED); - CvRect margin = cvRect(ofs.x, ofs.y, wsz.width - src.cols - ofs.x, wsz.height - src.rows - ofs.y); - CALL_HAL(gaussianBlur, cv_hal_gaussianBlur, sdepth, src.ptr(), src.step, dst.ptr(), dst.step, src.cols, src.rows, cn, - margin, (CvSize)(ksize), sigma1, sigma2, borderType); + ofs.x, ofs.y, wsz.width - src.cols - ofs.x, wsz.height - src.rows - ofs.y, ksize.width, ksize.height, + sigma1, sigma2, borderType); src.release(); dst.release();