mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 02:53:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check for empty Mat in compare, operator= and RNG::fill, fixed related tests

Browse Source
This commit is contained in:
Maksim Shabunin 2018-07-17 17:50:50 +03:00
parent 1da46fe6fb
commit c473718bc2
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1233,7 +1233,7 @@ void cv::compare(InputArray _src1, InputArray _src2, OutputArray _dst, int op)
CV_Assert( op == CMP_LT || op == CMP_LE || op == CMP_EQ || CV_Assert( op == CMP_LT || op == CMP_LE || op == CMP_EQ ||
op == CMP_NE || op == CMP_GE || op == CMP_GT ); op == CMP_NE || op == CMP_GE || op == CMP_GT );
if(_src1.empty() && _src2.empty()) if(_src1.empty() || _src2.empty())
{ {
_dst.release(); _dst.release();
return; return;

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

@ -411,6 +411,8 @@ Mat& Mat::operator = (const Scalar& s)
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
if (empty()) return *this;
const Mat* arrays[] = { this }; const Mat* arrays[] = { this };
uchar* dptr; uchar* dptr;
NAryMatIterator it(arrays, &dptr, 1); NAryMatIterator it(arrays, &dptr, 1);

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

@ -511,6 +511,8 @@ static RandnScaleFunc randnScaleTab[] =
void RNG::fill( InputOutputArray _mat, int disttype, void RNG::fill( InputOutputArray _mat, int disttype,
InputArray _param1arg, InputArray _param2arg, bool saturateRange ) InputArray _param1arg, InputArray _param2arg, bool saturateRange )
{ {
if (_mat.empty())
return;
Mat mat = _mat.getMat(), _param1 = _param1arg.getMat(), _param2 = _param2arg.getMat(); Mat mat = _mat.getMat(), _param1 = _param1arg.getMat(), _param2 = _param2arg.getMat();
int depth = mat.depth(), cn = mat.channels(); int depth = mat.depth(), cn = mat.channels();
AutoBuffer<double> _parambuf; AutoBuffer<double> _parambuf;

5
modules/core/test/test_rand.cpp
View File

@ -168,11 +168,12 @@ void Core_RandTest::run( int )
{ {
tested_rng = saved_rng; tested_rng = saved_rng;
int sz = 0, dsz = 0, slice; int sz = 0, dsz = 0, slice;
for( slice = 0; slice < maxSlice; slice++, sz += dsz ) for( slice = 0; slice < maxSlice && sz < SZ; slice++, sz += dsz )
{ {
dsz = slice+1 < maxSlice ? (int)(cvtest::randInt(rng) % (SZ - sz + 1)) : SZ - sz; dsz = slice+1 < maxSlice ? (int)(cvtest::randInt(rng) % (SZ - sz) + 1) : SZ - sz;
Mat aslice = arr[k].colRange(sz, sz + dsz); Mat aslice = arr[k].colRange(sz, sz + dsz);
tested_rng.fill(aslice, dist_type, A, B); tested_rng.fill(aslice, dist_type, A, B);
printf("%d - %d\n", sz, sz + dsz);
} }
} }

1
modules/imgproc/test/test_grabcut.cpp
View File

@ -89,7 +89,6 @@ void CV_GrabcutTest::run( int /* start_from */)
Mat exp_bgdModel, exp_fgdModel; Mat exp_bgdModel, exp_fgdModel;
Mat mask; Mat mask;
mask = Scalar(0);
Mat bgdModel, fgdModel; Mat bgdModel, fgdModel;
grabCut( img, mask, rect, bgdModel, fgdModel, 0, GC_INIT_WITH_RECT ); grabCut( img, mask, rect, bgdModel, fgdModel, 0, GC_INIT_WITH_RECT );
bgdModel.copyTo(exp_bgdModel); bgdModel.copyTo(exp_bgdModel);