potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-06-08 06:55:04 +00:00
parent aad9b3219c
commit 2d2b8a496e
21 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/doc/feature_detection.rst
+1 -1
View File
@@ -193,7 +193,7 @@ The algorithm sets the center of the neighborhood window at this new center
goodFeaturesToTrack
-------------------
.. cpp:function:: void goodFeaturesToTrack( InputArray image, OutputArray corners, int maxCorners, double qualityLevel, double minDistance, InputArray mask=None(), int blockSize=3, bool useHarrisDetector=false, double k=0.04 )
.. cpp:function:: void goodFeaturesToTrack( InputArray image, OutputArray corners, int maxCorners, double qualityLevel, double minDistance, InputArray mask=noArray(), int blockSize=3, bool useHarrisDetector=false, double k=0.04 )
Determines strong corners on an image.
modules/imgproc/doc/geometric_transformations.rst
+2 -2
View File
@@ -519,7 +519,7 @@ By default, the undistortion functions in OpenCV (see
undistort
-------------
.. cpp:function:: void undistort( InputArray src, OutputArray dst, InputArray cameraMatrix, InputArray distCoeffs, InputArray newCameraMatrix=None() )
.. cpp:function:: void undistort( InputArray src, OutputArray dst, InputArray cameraMatrix, InputArray distCoeffs, InputArray newCameraMatrix=noArray() )
Transforms an image to compensate for lens distortion.
@@ -554,7 +554,7 @@ The camera matrix and the distortion parameters can be determined using
undistortPoints
-------------------
.. cpp:function:: void undistortPoints( InputArray src, OutputArray dst, InputArray cameraMatrix, InputArray distCoeffs, InputArray R=None(), InputArray P=None())
.. cpp:function:: void undistortPoints( InputArray src, OutputArray dst, InputArray cameraMatrix, InputArray distCoeffs, InputArray R=noArray(), InputArray P=noArray())
Computes the ideal point coordinates from the observed point coordinates.
modules/imgproc/doc/motion_analysis_and_object_tracking.rst
+4 -4
View File
@@ -7,7 +7,7 @@ Motion Analysis and Object Tracking
accumulate
--------------
.. cpp:function:: void accumulate( InputArray src, InputOutputArray dst, InputArray mask=None() )
.. cpp:function:: void accumulate( InputArray src, InputOutputArray dst, InputArray mask=noArray() )
Adds an image to the accumulator.
@@ -36,7 +36,7 @@ See Also:
accumulateSquare
--------------------
.. cpp:function:: void accumulateSquare( InputArray src, InputOutputArray dst, InputArray mask=None() )
.. cpp:function:: void accumulateSquare( InputArray src, InputOutputArray dst, InputArray mask=noArray() )
Adds the square of a source image to the accumulator.
@@ -63,7 +63,7 @@ See Also:
accumulateProduct
---------------------
.. cpp:function:: void accumulateProduct( InputArray src1, InputArray src2, InputOutputArray dst, InputArray mask=None() )
.. cpp:function:: void accumulateProduct( InputArray src1, InputArray src2, InputOutputArray dst, InputArray mask=noArray() )
Adds the per-element product of two input images to the accumulator.
@@ -92,7 +92,7 @@ See Also:
accumulateWeighted
----------------------
.. cpp:function:: void accumulateWeighted( InputArray src, InputOutputArray dst, double alpha, InputArray mask=None() )
.. cpp:function:: void accumulateWeighted( InputArray src, InputOutputArray dst, double alpha, InputArray mask=noArray() )
Updates a running average.
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
+1 -1
View File
@@ -150,7 +150,7 @@ Source ``image`` is modified by this function.
drawContours
----------------
.. cpp:function:: void drawContours( InputOutputArray image, InputArrayOfArrays contours, int contourIdx, const Scalar& color, int thickness=1, int lineType=8, InputArray hierarchy=None(), int maxLevel=INT_MAX, Point offset=Point() )
.. cpp:function:: void drawContours( InputOutputArray image, InputArrayOfArrays contours, int contourIdx, const Scalar& color, int thickness=1, int lineType=8, InputArray hierarchy=noArray(), int maxLevel=INT_MAX, Point offset=Point() )
Draws contours outlines or filled contours.
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
+10 -10
View File
@@ -462,7 +462,7 @@ CV_EXPORTS void cornerSubPix( InputArray image, InputOutputArray corners,
//! finds the strong enough corners where the cornerMinEigenVal() or cornerHarris() report the local maxima
CV_EXPORTS_W void goodFeaturesToTrack( InputArray image, OutputArray corners,
int maxCorners, double qualityLevel, double minDistance,
InputArray mask=None(), int blockSize=3,
InputArray mask=noArray(), int blockSize=3,
bool useHarrisDetector=false, double k=0.04 );
//! finds lines in the black-n-white image using the standard or pyramid Hough transform
@@ -574,16 +574,16 @@ CV_EXPORTS_AS(integral3) void integral( InputArray src, OutputArray sum,
//! adds image to the accumulator (dst += src). Unlike cv::add, dst and src can have different types.
CV_EXPORTS_W void accumulate( InputArray src, CV_IN_OUT InputOutputArray dst,
InputArray mask=None() );
InputArray mask=noArray() );
//! adds squared src image to the accumulator (dst += src*src).
CV_EXPORTS_W void accumulateSquare( InputArray src, CV_IN_OUT InputOutputArray dst,
InputArray mask=None() );
InputArray mask=noArray() );
//! adds product of the 2 images to the accumulator (dst += src1*src2).
CV_EXPORTS_W void accumulateProduct( InputArray src1, InputArray src2,
CV_IN_OUT InputOutputArray dst, InputArray mask=None() );
CV_IN_OUT InputOutputArray dst, InputArray mask=noArray() );
//! updates the running average (dst = dst*(1-alpha) + src*alpha)
CV_EXPORTS_W void accumulateWeighted( InputArray src, CV_IN_OUT InputOutputArray dst,
double alpha, InputArray mask=None() );
double alpha, InputArray mask=noArray() );
//! type of the threshold operation
enum { THRESH_BINARY=CV_THRESH_BINARY, THRESH_BINARY_INV=CV_THRESH_BINARY_INV,
@@ -617,7 +617,7 @@ CV_EXPORTS void buildPyramid( InputArray src, OutputArrayOfArrays dst, int maxle
CV_EXPORTS_W void undistort( InputArray src, OutputArray dst,
InputArray cameraMatrix,
InputArray distCoeffs,
InputArray newCameraMatrix=None() );
InputArray newCameraMatrix=noArray() );
//! initializes maps for cv::remap() to correct lens distortion and optionally rectify the image
CV_EXPORTS_W void initUndistortRectifyMap( InputArray cameraMatrix, InputArray distCoeffs,
@@ -643,7 +643,7 @@ CV_EXPORTS_W Mat getDefaultNewCameraMatrix( InputArray cameraMatrix, Size imgsiz
//! returns points' coordinates after lens distortion correction
CV_EXPORTS void undistortPoints( InputArray src, OutputArray dst,
InputArray cameraMatrix, InputArray distCoeffs,
InputArray R=None(), InputArray P=None());
InputArray R=noArray(), InputArray P=noArray());
template<> CV_EXPORTS void Ptr<CvHistogram>::delete_obj();
@@ -682,8 +682,8 @@ CV_EXPORTS double compareHist( const SparseMat& H1, const SparseMat& H2, int met
CV_EXPORTS_W void equalizeHist( InputArray src, OutputArray dst );
CV_EXPORTS float EMD( InputArray signature1, InputArray signature2,
int distType, InputArray cost=None(),
float* lowerBound=0, OutputArray flow=None() );
int distType, InputArray cost=noArray(),
float* lowerBound=0, OutputArray flow=noArray() );
//! segments the image using watershed algorithm
CV_EXPORTS_W void watershed( InputArray image, InputOutputArray markers );
@@ -818,7 +818,7 @@ CV_EXPORTS void findContours( InputOutputArray image, OutputArrayOfArrays contou
CV_EXPORTS void drawContours( InputOutputArray image, InputArrayOfArrays contours,
int contourIdx, const Scalar& color,
int thickness=1, int lineType=8,
InputArray hierarchy=None(),
InputArray hierarchy=noArray(),
int maxLevel=INT_MAX, Point offset=Point() );
//! approximates contour or a curve using Douglas-Peucker algorithm
modules/imgproc/src/contours.cpp
+1 -1
View File
@@ -1519,7 +1519,7 @@ void cv::findContours( const InputOutputArray _image, OutputArrayOfArrays _conto
void cv::findContours( InputOutputArray _image, OutputArrayOfArrays _contours,
int mode, int method, Point offset)
{
findContours(_image, _contours, None(), mode, method, offset);
findContours(_image, _contours, noArray(), mode, method, offset);
}
namespace cv
modules/imgproc/src/sumpixels.cpp
+2 -2
View File
@@ -272,12 +272,12 @@ void cv::integral( InputArray _src, OutputArray _sum, OutputArray _sqsum, Output
void cv::integral( InputArray src, OutputArray sum, int sdepth )
{
integral( src, sum, None(), None(), sdepth );
integral( src, sum, noArray(), noArray(), sdepth );
}
void cv::integral( InputArray src, OutputArray sum, OutputArray sqsum, int sdepth )
{
integral( src, sum, sqsum, None(), sdepth );
integral( src, sum, sqsum, noArray(), sdepth );
}