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

22
modules/core/src/arithm.cpp
View File

@@ -1156,36 +1156,36 @@ void cv::bitwise_not(InputArray a, OutputArray c, InputArray mask)
void cv::max( InputArray src1, InputArray src2, OutputArray dst )
{
binary_op(src1, src2, dst, None(), maxTab, false );
binary_op(src1, src2, dst, noArray(), maxTab, false );
}
void cv::min( InputArray src1, InputArray src2, OutputArray dst )
{
binary_op(src1, src2, dst, None(), minTab, false );
binary_op(src1, src2, dst, noArray(), minTab, false );
}
void cv::max(const Mat& src1, const Mat& src2, Mat& dst)
{
OutputArray _dst(dst);
binary_op(src1, src2, _dst, None(), maxTab, false );
binary_op(src1, src2, _dst, noArray(), maxTab, false );
}
void cv::min(const Mat& src1, const Mat& src2, Mat& dst)
{
OutputArray _dst(dst);
binary_op(src1, src2, _dst, None(), minTab, false );
binary_op(src1, src2, _dst, noArray(), minTab, false );
}
void cv::max(const Mat& src1, double src2, Mat& dst)
{
OutputArray _dst(dst);
binary_op(src1, src2, _dst, None(), maxTab, false );
binary_op(src1, src2, _dst, noArray(), maxTab, false );
}
void cv::min(const Mat& src1, double src2, Mat& dst)
{
OutputArray _dst(dst);
binary_op(src1, src2, _dst, None(), minTab, false );
binary_op(src1, src2, _dst, noArray(), minTab, false );
}
/****************************************************************************************\
@@ -1466,7 +1466,7 @@ void cv::subtract( InputArray src1, InputArray src2, OutputArray dst,
void cv::absdiff( InputArray src1, InputArray src2, OutputArray dst )
{
arithm_op(src1, src2, dst, None(), -1, absdiffTab);
arithm_op(src1, src2, dst, noArray(), -1, absdiffTab);
}
/****************************************************************************************\
@@ -1779,19 +1779,19 @@ static BinaryFunc recipTab[] =
void cv::multiply(InputArray src1, InputArray src2,
OutputArray dst, double scale, int dtype)
{
arithm_op(src1, src2, dst, None(), dtype, mulTab, true, &scale);
arithm_op(src1, src2, dst, noArray(), dtype, mulTab, true, &scale);
}
void cv::divide(InputArray src1, InputArray src2,
OutputArray dst, double scale, int dtype)
{
arithm_op(src1, src2, dst, None(), dtype, divTab, true, &scale);
arithm_op(src1, src2, dst, noArray(), dtype, divTab, true, &scale);
}
void cv::divide(double scale, InputArray src2,
OutputArray dst, int dtype)
{
arithm_op(src2, src2, dst, None(), dtype, recipTab, true, &scale);
arithm_op(src2, src2, dst, noArray(), dtype, recipTab, true, &scale);
}
/****************************************************************************************\
@@ -1944,7 +1944,7 @@ void cv::addWeighted( InputArray src1, double alpha, InputArray src2,
double beta, double gamma, OutputArray dst, int dtype )
{
double scalars[] = {alpha, beta, gamma};
arithm_op(src1, src2, dst, None(), dtype, addWeightedTab, true, scalars);
arithm_op(src1, src2, dst, noArray(), dtype, addWeightedTab, true, scalars);
}

2
modules/core/src/datastructs.cpp
View File

@@ -3639,7 +3639,7 @@ computeSums( const Mat& points, const size_t* ofs, int a, int b, double* sums )
void KDTree::build(InputArray _points, bool _copyData)
{
build(_points, None(), _copyData);
build(_points, noArray(), _copyData);
}

4
modules/core/src/lapack.cpp
View File

@@ -1435,7 +1435,7 @@ static bool eigen( InputArray _src, OutputArray _evals, OutputArray _evects, boo
bool cv::eigen( InputArray src, OutputArray evals, int lowindex, int highindex )
{
return eigen(src, evals, None(), false, lowindex, highindex);
return eigen(src, evals, noArray(), false, lowindex, highindex);
}
bool cv::eigen( InputArray src, OutputArray evals, OutputArray evects,
@@ -1522,7 +1522,7 @@ void SVD::compute( InputArray a, OutputArray w, OutputArray u, OutputArray vt, i
void SVD::compute( InputArray a, OutputArray w, int flags )
{
_SVDcompute(a, w, None(), None(), flags);
_SVDcompute(a, w, noArray(), noArray(), flags);
}
void SVD::backSubst( InputArray _w, InputArray _u, InputArray _vt,

2
modules/core/src/matrix.cpp
View File

@@ -1399,7 +1399,7 @@ Mat& _OutputArray::getMatRef(int i) const
}
static _OutputArray _none;
OutputArray None() { return _none; }
OutputArray noArray() { return _none; }
}