Unverified Commit 5c6d319e authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by GitHub

Merge pull request #16493 from vpisarev:bordertype_sgbm_doc_fixes

* added note about BORDER_TYPE in separable filters; fixed SGBMStereo description

* added # to BORDER_ constants to generate hyperlinks
parent 4d291c06
...@@ -2216,7 +2216,7 @@ CV_EXPORTS_W void filterSpeckles( InputOutputArray img, double newVal, ...@@ -2216,7 +2216,7 @@ CV_EXPORTS_W void filterSpeckles( InputOutputArray img, double newVal,
//! computes valid disparity ROI from the valid ROIs of the rectified images (that are returned by cv::stereoRectify()) //! computes valid disparity ROI from the valid ROIs of the rectified images (that are returned by cv::stereoRectify())
CV_EXPORTS_W Rect getValidDisparityROI( Rect roi1, Rect roi2, CV_EXPORTS_W Rect getValidDisparityROI( Rect roi1, Rect roi2,
int minDisparity, int numberOfDisparities, int minDisparity, int numberOfDisparities,
int SADWindowSize ); int blockSize );
//! validates disparity using the left-right check. The matrix "cost" should be computed by the stereo correspondence algorithm //! validates disparity using the left-right check. The matrix "cost" should be computed by the stereo correspondence algorithm
CV_EXPORTS_W void validateDisparity( InputOutputArray disparity, InputArray cost, CV_EXPORTS_W void validateDisparity( InputOutputArray disparity, InputArray cost,
...@@ -2641,8 +2641,8 @@ public: ...@@ -2641,8 +2641,8 @@ public:
the smoother the disparity is. P1 is the penalty on the disparity change by plus or minus 1 the smoother the disparity is. P1 is the penalty on the disparity change by plus or minus 1
between neighbor pixels. P2 is the penalty on the disparity change by more than 1 between neighbor between neighbor pixels. P2 is the penalty on the disparity change by more than 1 between neighbor
pixels. The algorithm requires P2 \> P1 . See stereo_match.cpp sample where some reasonably good pixels. The algorithm requires P2 \> P1 . See stereo_match.cpp sample where some reasonably good
P1 and P2 values are shown (like 8\*number_of_image_channels\*SADWindowSize\*SADWindowSize and P1 and P2 values are shown (like 8\*number_of_image_channels\*blockSize\*blockSize and
32\*number_of_image_channels\*SADWindowSize\*SADWindowSize , respectively). 32\*number_of_image_channels\*blockSize\*blockSize , respectively).
@param disp12MaxDiff Maximum allowed difference (in integer pixel units) in the left-right @param disp12MaxDiff Maximum allowed difference (in integer pixel units) in the left-right
disparity check. Set it to a non-positive value to disable the check. disparity check. Set it to a non-positive value to disable the check.
@param preFilterCap Truncation value for the prefiltered image pixels. The algorithm first @param preFilterCap Truncation value for the prefiltered image pixels. The algorithm first
......
...@@ -1409,7 +1409,7 @@ equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width an ...@@ -1409,7 +1409,7 @@ equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width an
respectively (see #getGaussianKernel for details); to fully control the result regardless of respectively (see #getGaussianKernel for details); to fully control the result regardless of
possible future modifications of all this semantics, it is recommended to specify all of ksize, possible future modifications of all this semantics, it is recommended to specify all of ksize,
sigmaX, and sigmaY. sigmaX, and sigmaY.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@sa sepFilter2D, filter2D, blur, boxFilter, bilateralFilter, medianBlur @sa sepFilter2D, filter2D, blur, boxFilter, bilateralFilter, medianBlur
*/ */
...@@ -1470,7 +1470,7 @@ algorithms, and so on). If you need to compute pixel sums over variable-size win ...@@ -1470,7 +1470,7 @@ algorithms, and so on). If you need to compute pixel sums over variable-size win
@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel @param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
center. center.
@param normalize flag, specifying whether the kernel is normalized by its area or not. @param normalize flag, specifying whether the kernel is normalized by its area or not.
@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes @param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
@sa blur, bilateralFilter, GaussianBlur, medianBlur, integral @sa blur, bilateralFilter, GaussianBlur, medianBlur, integral
*/ */
CV_EXPORTS_W void boxFilter( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void boxFilter( InputArray src, OutputArray dst, int ddepth,
...@@ -1493,7 +1493,7 @@ variance and standard deviation around the neighborhood of a pixel. ...@@ -1493,7 +1493,7 @@ variance and standard deviation around the neighborhood of a pixel.
@param anchor kernel anchor point. The default value of Point(-1, -1) denotes that the anchor is at the kernel @param anchor kernel anchor point. The default value of Point(-1, -1) denotes that the anchor is at the kernel
center. center.
@param normalize flag, specifying whether the kernel is to be normalized by it's area or not. @param normalize flag, specifying whether the kernel is to be normalized by it's area or not.
@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes @param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
@sa boxFilter @sa boxFilter
*/ */
CV_EXPORTS_W void sqrBoxFilter( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void sqrBoxFilter( InputArray src, OutputArray dst, int ddepth,
...@@ -1516,7 +1516,7 @@ the depth should be CV_8U, CV_16U, CV_16S, CV_32F or CV_64F. ...@@ -1516,7 +1516,7 @@ the depth should be CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
@param ksize blurring kernel size. @param ksize blurring kernel size.
@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel @param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
center. center.
@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes @param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
@sa boxFilter, bilateralFilter, GaussianBlur, medianBlur @sa boxFilter, bilateralFilter, GaussianBlur, medianBlur
*/ */
CV_EXPORTS_W void blur( InputArray src, OutputArray dst, CV_EXPORTS_W void blur( InputArray src, OutputArray dst,
...@@ -1550,7 +1550,7 @@ separate color planes using split and process them individually. ...@@ -1550,7 +1550,7 @@ separate color planes using split and process them individually.
the kernel; the anchor should lie within the kernel; default value (-1,-1) means that the anchor the kernel; the anchor should lie within the kernel; default value (-1,-1) means that the anchor
is at the kernel center. is at the kernel center.
@param delta optional value added to the filtered pixels before storing them in dst. @param delta optional value added to the filtered pixels before storing them in dst.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@sa sepFilter2D, dft, matchTemplate @sa sepFilter2D, dft, matchTemplate
*/ */
CV_EXPORTS_W void filter2D( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void filter2D( InputArray src, OutputArray dst, int ddepth,
...@@ -1571,7 +1571,7 @@ kernel kernelY. The final result shifted by delta is stored in dst . ...@@ -1571,7 +1571,7 @@ kernel kernelY. The final result shifted by delta is stored in dst .
@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor @param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
is at the kernel center. is at the kernel center.
@param delta Value added to the filtered results before storing them. @param delta Value added to the filtered results before storing them.
@param borderType Pixel extrapolation method, see #BorderTypes @param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@sa filter2D, Sobel, GaussianBlur, boxFilter, blur @sa filter2D, Sobel, GaussianBlur, boxFilter, blur
*/ */
CV_EXPORTS_W void sepFilter2D( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void sepFilter2D( InputArray src, OutputArray dst, int ddepth,
...@@ -1624,7 +1624,7 @@ The second case corresponds to a kernel of: ...@@ -1624,7 +1624,7 @@ The second case corresponds to a kernel of:
@param scale optional scale factor for the computed derivative values; by default, no scaling is @param scale optional scale factor for the computed derivative values; by default, no scaling is
applied (see #getDerivKernels for details). applied (see #getDerivKernels for details).
@param delta optional delta value that is added to the results prior to storing them in dst. @param delta optional delta value that is added to the results prior to storing them in dst.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@sa Scharr, Laplacian, sepFilter2D, filter2D, GaussianBlur, cartToPolar @sa Scharr, Laplacian, sepFilter2D, filter2D, GaussianBlur, cartToPolar
*/ */
CV_EXPORTS_W void Sobel( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void Sobel( InputArray src, OutputArray dst, int ddepth,
...@@ -1645,7 +1645,8 @@ Sobel( src, dy, CV_16SC1, 0, 1, 3 ); ...@@ -1645,7 +1645,8 @@ Sobel( src, dy, CV_16SC1, 0, 1, 3 );
@param dx output image with first-order derivative in x. @param dx output image with first-order derivative in x.
@param dy output image with first-order derivative in y. @param dy output image with first-order derivative in y.
@param ksize size of Sobel kernel. It must be 3. @param ksize size of Sobel kernel. It must be 3.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes.
Only #BORDER_DEFAULT=#BORDER_REFLECT_101 and #BORDER_REPLICATE are supported.
@sa Sobel @sa Sobel
*/ */
...@@ -1673,7 +1674,7 @@ is equivalent to ...@@ -1673,7 +1674,7 @@ is equivalent to
@param scale optional scale factor for the computed derivative values; by default, no scaling is @param scale optional scale factor for the computed derivative values; by default, no scaling is
applied (see #getDerivKernels for details). applied (see #getDerivKernels for details).
@param delta optional delta value that is added to the results prior to storing them in dst. @param delta optional delta value that is added to the results prior to storing them in dst.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@sa cartToPolar @sa cartToPolar
*/ */
CV_EXPORTS_W void Scharr( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void Scharr( InputArray src, OutputArray dst, int ddepth,
...@@ -1704,7 +1705,7 @@ details. The size must be positive and odd. ...@@ -1704,7 +1705,7 @@ details. The size must be positive and odd.
@param scale Optional scale factor for the computed Laplacian values. By default, no scaling is @param scale Optional scale factor for the computed Laplacian values. By default, no scaling is
applied. See #getDerivKernels for details. applied. See #getDerivKernels for details.
@param delta Optional delta value that is added to the results prior to storing them in dst . @param delta Optional delta value that is added to the results prior to storing them in dst .
@param borderType Pixel extrapolation method, see #BorderTypes @param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@sa Sobel, Scharr @sa Sobel, Scharr
*/ */
CV_EXPORTS_W void Laplacian( InputArray src, OutputArray dst, int ddepth, CV_EXPORTS_W void Laplacian( InputArray src, OutputArray dst, int ddepth,
...@@ -1773,7 +1774,7 @@ of the formulae in the cornerEigenValsAndVecs description. ...@@ -1773,7 +1774,7 @@ of the formulae in the cornerEigenValsAndVecs description.
src . src .
@param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ). @param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ).
@param ksize Aperture parameter for the Sobel operator. @param ksize Aperture parameter for the Sobel operator.
@param borderType Pixel extrapolation method. See #BorderTypes. @param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
*/ */
CV_EXPORTS_W void cornerMinEigenVal( InputArray src, OutputArray dst, CV_EXPORTS_W void cornerMinEigenVal( InputArray src, OutputArray dst,
int blockSize, int ksize = 3, int blockSize, int ksize = 3,
...@@ -1796,7 +1797,7 @@ size as src . ...@@ -1796,7 +1797,7 @@ size as src .
@param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ). @param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ).
@param ksize Aperture parameter for the Sobel operator. @param ksize Aperture parameter for the Sobel operator.
@param k Harris detector free parameter. See the formula above. @param k Harris detector free parameter. See the formula above.
@param borderType Pixel extrapolation method. See #BorderTypes. @param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
*/ */
CV_EXPORTS_W void cornerHarris( InputArray src, OutputArray dst, int blockSize, CV_EXPORTS_W void cornerHarris( InputArray src, OutputArray dst, int blockSize,
int ksize, double k, int ksize, double k,
...@@ -1824,7 +1825,7 @@ The output of the function can be used for robust edge or corner detection. ...@@ -1824,7 +1825,7 @@ The output of the function can be used for robust edge or corner detection.
@param dst Image to store the results. It has the same size as src and the type CV_32FC(6) . @param dst Image to store the results. It has the same size as src and the type CV_32FC(6) .
@param blockSize Neighborhood size (see details below). @param blockSize Neighborhood size (see details below).
@param ksize Aperture parameter for the Sobel operator. @param ksize Aperture parameter for the Sobel operator.
@param borderType Pixel extrapolation method. See #BorderTypes. @param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
@sa cornerMinEigenVal, cornerHarris, preCornerDetect @sa cornerMinEigenVal, cornerHarris, preCornerDetect
*/ */
...@@ -1853,7 +1854,7 @@ The corners can be found as local maximums of the functions, as shown below: ...@@ -1853,7 +1854,7 @@ The corners can be found as local maximums of the functions, as shown below:
@param src Source single-channel 8-bit of floating-point image. @param src Source single-channel 8-bit of floating-point image.
@param dst Output image that has the type CV_32F and the same size as src . @param dst Output image that has the type CV_32F and the same size as src .
@param ksize %Aperture size of the Sobel . @param ksize %Aperture size of the Sobel .
@param borderType Pixel extrapolation method. See #BorderTypes. @param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
*/ */
CV_EXPORTS_W void preCornerDetect( InputArray src, OutputArray dst, int ksize, CV_EXPORTS_W void preCornerDetect( InputArray src, OutputArray dst, int ksize,
int borderType = BORDER_DEFAULT ); int borderType = BORDER_DEFAULT );
...@@ -2117,7 +2118,7 @@ structuring element is used. Kernel can be created using #getStructuringElement. ...@@ -2117,7 +2118,7 @@ structuring element is used. Kernel can be created using #getStructuringElement.
@param anchor position of the anchor within the element; default value (-1, -1) means that the @param anchor position of the anchor within the element; default value (-1, -1) means that the
anchor is at the element center. anchor is at the element center.
@param iterations number of times erosion is applied. @param iterations number of times erosion is applied.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@param borderValue border value in case of a constant border @param borderValue border value in case of a constant border
@sa dilate, morphologyEx, getStructuringElement @sa dilate, morphologyEx, getStructuringElement
*/ */
...@@ -2149,7 +2150,7 @@ structuring element is used. Kernel can be created using #getStructuringElement ...@@ -2149,7 +2150,7 @@ structuring element is used. Kernel can be created using #getStructuringElement
@param anchor position of the anchor within the element; default value (-1, -1) means that the @param anchor position of the anchor within the element; default value (-1, -1) means that the
anchor is at the element center. anchor is at the element center.
@param iterations number of times dilation is applied. @param iterations number of times dilation is applied.
@param borderType pixel extrapolation method, see #BorderTypes @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not suported.
@param borderValue border value in case of a constant border @param borderValue border value in case of a constant border
@sa erode, morphologyEx, getStructuringElement @sa erode, morphologyEx, getStructuringElement
*/ */
...@@ -2174,7 +2175,7 @@ CV_8U, CV_16U, CV_16S, CV_32F or CV_64F. ...@@ -2174,7 +2175,7 @@ CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
@param anchor Anchor position with the kernel. Negative values mean that the anchor is at the @param anchor Anchor position with the kernel. Negative values mean that the anchor is at the
kernel center. kernel center.
@param iterations Number of times erosion and dilation are applied. @param iterations Number of times erosion and dilation are applied.
@param borderType Pixel extrapolation method, see #BorderTypes @param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
@param borderValue Border value in case of a constant border. The default value has a special @param borderValue Border value in case of a constant border. The default value has a special
meaning. meaning.
@sa dilate, erode, getStructuringElement @sa dilate, erode, getStructuringElement
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment