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

core: fix .begin()/.end() of empty Mat

Browse Source
This commit is contained in:
Alexander Alekhin 2020-03-20 13:04:04 +00:00
parent 8ac333697d
commit 377dd04224
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1304,6 +1304,8 @@ const _Tp& Mat::at(const Vec<int, n>& idx) const
template<typename _Tp> inline template<typename _Tp> inline
MatConstIterator_<_Tp> Mat::begin() const MatConstIterator_<_Tp> Mat::begin() const
{ {
if (empty())
return MatConstIterator_<_Tp>();
CV_DbgAssert( elemSize() == sizeof(_Tp) ); CV_DbgAssert( elemSize() == sizeof(_Tp) );
return MatConstIterator_<_Tp>((const Mat_<_Tp>*)this); return MatConstIterator_<_Tp>((const Mat_<_Tp>*)this);
} }
@ -1311,6 +1313,8 @@ MatConstIterator_<_Tp> Mat::begin() const
template<typename _Tp> inline template<typename _Tp> inline
MatConstIterator_<_Tp> Mat::end() const MatConstIterator_<_Tp> Mat::end() const
{ {
if (empty())
return MatConstIterator_<_Tp>();
CV_DbgAssert( elemSize() == sizeof(_Tp) ); CV_DbgAssert( elemSize() == sizeof(_Tp) );
MatConstIterator_<_Tp> it((const Mat_<_Tp>*)this); MatConstIterator_<_Tp> it((const Mat_<_Tp>*)this);
it += total(); it += total();
@ -1320,6 +1324,8 @@ MatConstIterator_<_Tp> Mat::end() const
template<typename _Tp> inline template<typename _Tp> inline
MatIterator_<_Tp> Mat::begin() MatIterator_<_Tp> Mat::begin()
{ {
if (empty())
return MatIterator_<_Tp>();
CV_DbgAssert( elemSize() == sizeof(_Tp) ); CV_DbgAssert( elemSize() == sizeof(_Tp) );
return MatIterator_<_Tp>((Mat_<_Tp>*)this); return MatIterator_<_Tp>((Mat_<_Tp>*)this);
} }
@ -1327,6 +1333,8 @@ MatIterator_<_Tp> Mat::begin()
template<typename _Tp> inline template<typename _Tp> inline
MatIterator_<_Tp> Mat::end() MatIterator_<_Tp> Mat::end()
{ {
if (empty())
return MatIterator_<_Tp>();
CV_DbgAssert( elemSize() == sizeof(_Tp) ); CV_DbgAssert( elemSize() == sizeof(_Tp) );
MatIterator_<_Tp> it((Mat_<_Tp>*)this); MatIterator_<_Tp> it((Mat_<_Tp>*)this);
it += total(); it += total();
@ -2690,6 +2698,7 @@ MatConstIterator::MatConstIterator(const Mat* _m)
{ {
if( m && m->isContinuous() ) if( m && m->isContinuous() )
{ {
CV_Assert(!m->empty());
sliceStart = m->ptr(); sliceStart = m->ptr();
sliceEnd = sliceStart + m->total()*elemSize; sliceEnd = sliceStart + m->total()*elemSize;
} }
@ -2703,6 +2712,7 @@ MatConstIterator::MatConstIterator(const Mat* _m, int _row, int _col)
CV_Assert(m && m->dims <= 2); CV_Assert(m && m->dims <= 2);
if( m->isContinuous() ) if( m->isContinuous() )
{ {
CV_Assert(!m->empty());
sliceStart = m->ptr(); sliceStart = m->ptr();
sliceEnd = sliceStart + m->total()*elemSize; sliceEnd = sliceStart + m->total()*elemSize;
} }
@ -2717,6 +2727,7 @@ MatConstIterator::MatConstIterator(const Mat* _m, Point _pt)
CV_Assert(m && m->dims <= 2); CV_Assert(m && m->dims <= 2);
if( m->isContinuous() ) if( m->isContinuous() )
{ {
CV_Assert(!m->empty());
sliceStart = m->ptr(); sliceStart = m->ptr();
sliceEnd = sliceStart + m->total()*elemSize; sliceEnd = sliceStart + m->total()*elemSize;
} }

8
modules/core/test/test_mat.cpp
View File

@ -2082,4 +2082,12 @@ TEST(Mat, regression_12943) // memory usage: ~4.5 Gb
cv::flip(src, dst, 0); cv::flip(src, dst, 0);
} }
TEST(Mat, empty_iterator_16855)
{
cv::Mat m;
EXPECT_NO_THROW(m.begin<uchar>());
EXPECT_NO_THROW(m.end<uchar>());
EXPECT_TRUE(m.begin<uchar>() == m.end<uchar>());
}
}} // namespace }} // namespace