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

replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-06-06 14:51:27 +00:00
parent 6dc7ae0ff6
commit 0c877f62e9
68 changed files with 757 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/src1/cv.cpp
+1 -1
View File
@@ -3971,7 +3971,7 @@ static double cppKMeans(const CvArr* _samples, int cluster_count, CvArr* _labels
(labels.cols == 1 || labels.rows == 1) &&
labels.cols + labels.rows - 1 == data.rows );
return cv::kmeans(data, cluster_count, labels, termcrit, attempts,
flags, _centers ? cv::OutputArray(centers) : cv::OutputArray() );
flags, _centers ? cv::_OutputArray(centers) : cv::_OutputArray() );
}
#define cvKMeans2(samples, nclusters, labels, termcrit, attempts, flags, centers) \
modules/python/src2/hdr_parser.py
+2 -1
View File
@@ -432,7 +432,8 @@ class CppHeaderParser(object):
("OutputArrayOfArrays", "vector<Mat>"),
("InputArray", "Mat"),
("InputOutputArray", "Mat"),
("OutputArray", "Mat")]).strip()
("OutputArray", "Mat"),
("None", arg_type)]).strip()
args.append([arg_type, arg_name, defval, modlist])
npos = arg_start-1
modules/python/src2/opencv_extra_api.hpp
+1 -1
View File
@@ -407,7 +407,7 @@ CV_WRAP static inline void convertPointsHomogeneous( const Mat& src, CV_OUT Mat&
}
//! finds circles' grid pattern of the specified size in the image
CV_WRAP static inline void findCirclesGridDefault( const InputArray& image, Size patternSize,
CV_WRAP static inline void findCirclesGridDefault( InputArray image, Size patternSize,
OutputArray centers, int flags=CALIB_CB_SYMMETRIC_GRID )
{
findCirclesGrid(image, patternSize, centers, flags);