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

Merge pull request #2287 from ilya-lavrenov:mat_step

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-02-06 21:38:22 +04:00
committed by OpenCV Buildbot
parent 9ff5a24f92 af0040eab0
commit 710d51bb41
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,7 +282,7 @@ static inline void setSize( Mat& m, int _dims, const int* _sz,
if( !_sz )
return;
size_t esz = CV_ELEM_SIZE(m.flags), total = esz;
size_t esz = CV_ELEM_SIZE(m.flags), esz1 = CV_ELEM_SIZE1(m.flags), total = esz;
int i;
for( i = _dims-1; i >= 0; i-- )
{
@@ -291,7 +291,14 @@ static inline void setSize( Mat& m, int _dims, const int* _sz,
m.size.p[i] = s;
if( _steps )
{
if (_steps[i] % esz1 != 0)
{
CV_Error(Error::BadStep, "Step must be a multiple of esz1");
}
m.step.p[i] = i < _dims-1 ? _steps[i] : esz;
}
else if( autoSteps )
{
m.step.p[i] = total;