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

fixed MatConstIterator<> (ticket #776)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-12-26 22:18:30 +00:00
parent 86802ec968
commit a379d011fd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/mat.hpp
View File

@ -1808,7 +1808,7 @@ template<typename _Tp> inline Point MatConstIterator_<_Tp>::pos() const
CV_DbgAssert( m->dims <= 2 );
if( m->isContinuous() )
{
ptrdiff_t ofs = ptr - (_Tp*)m->data;
ptrdiff_t ofs = (const _Tp*)ptr - (const _Tp*)m->data;
int y = (int)(ofs / m->cols), x = (int)(ofs - (ptrdiff_t)y*m->cols);
return Point(x, y);
}

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

@ -2203,7 +2203,7 @@ void MatConstIterator::seek(ptrdiff_t ofs, bool relative)
y = ofs/m->cols;
int y1 = std::min(std::max((int)y, 0), m->rows-1);
sliceStart = m->data + y1*m->step[0];
sliceEnd = sliceStart + (m->cols-1)*elemSize;
sliceEnd = sliceStart + m->cols*elemSize;
ptr = y < 0 ? sliceStart : y >= m->rows ? sliceEnd :
sliceStart + (ofs - y*m->cols)*elemSize;
return;