generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed memory corruption when normal dist. params have less channels than target matrix; test added

Browse Source
This commit is contained in:
Rostislav Vasilikhin
2016-07-16 17:55:54 +03:00
parent a2921fdede
commit 96edb270a6
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -624,7 +624,7 @@ void RNG::fill( InputOutputArray _mat, int disttype,
int ptype = depth == CV_64F ? CV_64F : CV_32F;
int esz = (int)CV_ELEM_SIZE(ptype);
if( _param1.isContinuous() && _param1.type() == ptype )
if( _param1.isContinuous() && _param1.type() == ptype && n1 >= cn)
mean = _param1.ptr();
else
{
@@ -637,18 +637,18 @@ void RNG::fill( InputOutputArray _mat, int disttype,
for( j = n1*esz; j < cn*esz; j++ )
mean[j] = mean[j - n1*esz];
if( _param2.isContinuous() && _param2.type() == ptype )
if( _param2.isContinuous() && _param2.type() == ptype && n2 >= cn)
stddev = _param2.ptr();
else
{
Mat tmp(_param2.size(), ptype, parambuf + cn);
Mat tmp(_param2.size(), ptype, parambuf + MAX(n1, cn));
_param2.convertTo(tmp, ptype);
stddev = (uchar*)(parambuf + cn);
stddev = (uchar*)(parambuf + MAX(n1, cn));
}
if( n1 < cn )
for( j = n1*esz; j < cn*esz; j++ )
stddev[j] = stddev[j - n1*esz];
if( n2 < cn )
for( j = n2*esz; j < cn*esz; j++ )
stddev[j] = stddev[j - n2*esz];
stdmtx = _param2.rows == cn && _param2.cols == cn;
scaleFunc = randnScaleTab[depth];