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
commit 710d51bb41
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/core/include/opencv2/core/mat.inl.hpp
View File

@ -372,7 +372,7 @@ Mat::Mat(int _rows, int _cols, int _type, void* _data, size_t _step)
data((uchar*)_data), datastart((uchar*)_data), dataend(0), datalimit(0),
allocator(0), u(0), size(&rows)
{
size_t esz = CV_ELEM_SIZE(_type);
size_t esz = CV_ELEM_SIZE(_type), esz1 = CV_ELEM_SIZE1(_type);
size_t minstep = cols * esz;
if( _step == AUTO_STEP )
{
@ -383,6 +383,12 @@ Mat::Mat(int _rows, int _cols, int _type, void* _data, size_t _step)
{
if( rows == 1 ) _step = minstep;
CV_DbgAssert( _step >= minstep );
if (_step % esz1 != 0)
{
CV_Error(Error::BadStep, "Step must be a multiple of esz1");
}
flags |= _step == minstep ? CONTINUOUS_FLAG : 0;
}
step[0] = _step;
@ -397,7 +403,7 @@ Mat::Mat(Size _sz, int _type, void* _data, size_t _step)
data((uchar*)_data), datastart((uchar*)_data), dataend(0), datalimit(0),
allocator(0), u(0), size(&rows)
{
size_t esz = CV_ELEM_SIZE(_type);
size_t esz = CV_ELEM_SIZE(_type), esz1 = CV_ELEM_SIZE1(_type);
size_t minstep = cols*esz;
if( _step == AUTO_STEP )
{
@ -408,6 +414,12 @@ Mat::Mat(Size _sz, int _type, void* _data, size_t _step)
{
if( rows == 1 ) _step = minstep;
CV_DbgAssert( _step >= minstep );
if (_step % esz1 != 0)
{
CV_Error(Error::BadStep, "Step must be a multiple of esz1");
}
flags |= _step == minstep ? CONTINUOUS_FLAG : 0;
}
step[0] = _step;

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;