generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests 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

2
modules/imgproc/src/contours.cpp
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

4
modules/imgproc/src/sumpixels.cpp
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 );
}