mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix the parameters order

Browse Source
This commit is contained in:
elenagvo 2017-11-23 13:46:32 +03:00
parent 0f12351a41
commit 81519537ae
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/src/hal_replacement.hpp
View File

@ -666,10 +666,10 @@ inline int hal_ni_threshold(const uchar* src_data, size_t src_step, uchar* dst_d
/**
@brief Calculate box filter
@param src_depth,dst_depth Depths of source and destination image
@param src_data,src_step Source image
@param dst_data,dst_step Destination image
@param width,height Source image dimensions
@param src_depth,dst_depth Depths of source and destination image
@param cn Number of channels
@param margin_left,margin_top,margin_right,margin_bottom Margins for source image
@param ksize_width,ksize_height Size of kernel
@ -677,7 +677,7 @@ inline int hal_ni_threshold(const uchar* src_data, size_t src_step, uchar* dst_d
@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, 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; }
inline int hal_ni_boxFilter(const uchar* src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int src_depth, int dst_depth, 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
@ -685,17 +685,17 @@ inline int hal_ni_boxFilter(int src_depth, int dst_depth, const uchar* src_data,
/**
@brief Blurs an image using a Gaussian filter.
@param depth Depth of source and destination image
@param src_data,src_step Source image
@param dst_data,dst_step Destination image
@param width,height Source image dimensions
@param depth Depth of source and destination image
@param cn Number of channels
@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, 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; }
inline int hal_ni_gaussianBlur(const uchar* src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int depth, 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

4
modules/imgproc/src/smooth.cpp
View File

@ -1557,7 +1557,7 @@ void cv::boxFilter( InputArray _src, OutputArray _dst, int ddepth,
if(!(borderType&BORDER_ISOLATED))
src.locateROI( wsz, ofs );
CALL_HAL(boxFilter, cv_hal_boxFilter, sdepth, ddepth, src.ptr(), src.step, dst.ptr(), dst.step, src.cols, src.rows, cn,
CALL_HAL(boxFilter, cv_hal_boxFilter, src.ptr(), src.step, dst.ptr(), dst.step, src.cols, src.rows, sdepth, ddepth, cn,
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&~BORDER_ISOLATED);
@ -2120,7 +2120,7 @@ void cv::GaussianBlur( InputArray _src, OutputArray _dst, Size ksize,
if(!(borderType & BORDER_ISOLATED))
src.locateROI( wsz, ofs );
CALL_HAL(gaussianBlur, cv_hal_gaussianBlur, sdepth, src.ptr(), src.step, dst.ptr(), dst.step, src.cols, src.rows, cn,
CALL_HAL(gaussianBlur, cv_hal_gaussianBlur, src.ptr(), src.step, dst.ptr(), dst.step, src.cols, src.rows, sdepth, cn,
ofs.x, ofs.y, wsz.width - src.cols - ofs.x, wsz.height - src.rows - ofs.y, ksize.width, ksize.height,
sigma1, sigma2, borderType&~BORDER_ISOLATED);