Skip to content

O
opencv
Commit 46dd502f authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #5602 from ChrisKitching:clearerMatErrors

parents 39346f32 0f8a2667
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 62 deletions
modules/core/include/opencv2/core/mat.inl.hpp
View file @ 46dd502f
...@@ -790,76 +790,84 @@ const _Tp* Mat::ptr(int y) const ...@@ -790,76 +790,84 @@ const _Tp* Mat::ptr(int y) const
inline inline
uchar* Mat::ptr(int i0, int i1) uchar* Mat::ptr(int i0, int i1)
{ {
CV_DbgAssert( dims >= 2 && data && CV_DbgAssert(dims >= 2);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] ); CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
return data + i0 * step.p[0] + i1 * step.p[1]; return data + i0 * step.p[0] + i1 * step.p[1];
} }
inline inline
const uchar* Mat::ptr(int i0, int i1) const const uchar* Mat::ptr(int i0, int i1) const
{ {
CV_DbgAssert( dims >= 2 && data && CV_DbgAssert(dims >= 2);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] ); CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
return data + i0 * step.p[0] + i1 * step.p[1]; return data + i0 * step.p[0] + i1 * step.p[1];
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp* Mat::ptr(int i0, int i1) _Tp* Mat::ptr(int i0, int i1)
{ {
CV_DbgAssert( dims >= 2 && data && CV_DbgAssert(dims >= 2);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] ); CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
return (_Tp*)(data + i0 * step.p[0] + i1 * step.p[1]); return (_Tp*)(data + i0 * step.p[0] + i1 * step.p[1]);
} }
template<typename _Tp> inline template<typename _Tp> inline
const _Tp* Mat::ptr(int i0, int i1) const const _Tp* Mat::ptr(int i0, int i1) const
{ {
CV_DbgAssert( dims >= 2 && data && CV_DbgAssert(dims >= 2);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] ); CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
return (const _Tp*)(data + i0 * step.p[0] + i1 * step.p[1]); return (const _Tp*)(data + i0 * step.p[0] + i1 * step.p[1]);
} }
inline inline
uchar* Mat::ptr(int i0, int i1, int i2) uchar* Mat::ptr(int i0, int i1, int i2)
{ {
CV_DbgAssert( dims >= 3 && data && CV_DbgAssert(dims >= 3);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] && CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
(unsigned)i2 < (unsigned)size.p[2] ); CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
CV_DbgAssert((unsigned)i2 < (unsigned)size.p[2]);
return data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2]; return data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2];
} }
inline inline
const uchar* Mat::ptr(int i0, int i1, int i2) const const uchar* Mat::ptr(int i0, int i1, int i2) const
{ {
CV_DbgAssert( dims >= 3 && data && CV_DbgAssert(dims >= 3);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] && CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
(unsigned)i2 < (unsigned)size.p[2] ); CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
CV_DbgAssert((unsigned)i2 < (unsigned)size.p[2]);
return data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2]; return data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2];
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp* Mat::ptr(int i0, int i1, int i2) _Tp* Mat::ptr(int i0, int i1, int i2)
{ {
CV_DbgAssert( dims >= 3 && data && CV_DbgAssert(dims >= 3);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] && CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
(unsigned)i2 < (unsigned)size.p[2] ); CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
CV_DbgAssert((unsigned)i2 < (unsigned)size.p[2]);
return (_Tp*)(data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2]); return (_Tp*)(data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2]);
} }
template<typename _Tp> inline template<typename _Tp> inline
const _Tp* Mat::ptr(int i0, int i1, int i2) const const _Tp* Mat::ptr(int i0, int i1, int i2) const
{ {
CV_DbgAssert( dims >= 3 && data && CV_DbgAssert(dims >= 3);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] && CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
(unsigned)i2 < (unsigned)size.p[2] ); CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
CV_DbgAssert((unsigned)i2 < (unsigned)size.p[2]);
return (const _Tp*)(data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2]); return (const _Tp*)(data + i0 * step.p[0] + i1 * step.p[1] + i2 * step.p[2]);
} }
...@@ -894,45 +902,54 @@ const uchar* Mat::ptr(const int* idx) const ...@@ -894,45 +902,54 @@ const uchar* Mat::ptr(const int* idx) const
template<typename _Tp> inline template<typename _Tp> inline
_Tp& Mat::at(int i0, int i1) _Tp& Mat::at(int i0, int i1)
{ {
CV_DbgAssert( dims <= 2 && data && (unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(dims <= 2);
(unsigned)(i1 * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()) && CV_DbgAssert(data);
CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1()); CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)(i1 * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()));
CV_DbgAssert(CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1());
return ((_Tp*)(data + step.p[0] * i0))[i1]; return ((_Tp*)(data + step.p[0] * i0))[i1];
} }
template<typename _Tp> inline template<typename _Tp> inline
const _Tp& Mat::at(int i0, int i1) const const _Tp& Mat::at(int i0, int i1) const
{ {
CV_DbgAssert( dims <= 2 && data && (unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(dims <= 2);
(unsigned)(i1 * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()) && CV_DbgAssert(data);
CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1()); CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)(i1 * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()));
CV_DbgAssert(CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1());
return ((const _Tp*)(data + step.p[0] * i0))[i1]; return ((const _Tp*)(data + step.p[0] * i0))[i1];
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp& Mat::at(Point pt) _Tp& Mat::at(Point pt)
{ {
CV_DbgAssert( dims <= 2 && data && (unsigned)pt.y < (unsigned)size.p[0] && CV_DbgAssert(dims <= 2);
(unsigned)(pt.x * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()) && CV_DbgAssert(data);
CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1()); CV_DbgAssert((unsigned)pt.y < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)(pt.x * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()));
CV_DbgAssert(CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1());
return ((_Tp*)(data + step.p[0] * pt.y))[pt.x]; return ((_Tp*)(data + step.p[0] * pt.y))[pt.x];
} }
template<typename _Tp> inline template<typename _Tp> inline
const _Tp& Mat::at(Point pt) const const _Tp& Mat::at(Point pt) const
{ {
CV_DbgAssert( dims <= 2 && data && (unsigned)pt.y < (unsigned)size.p[0] && CV_DbgAssert(dims <= 2);
(unsigned)(pt.x * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()) && CV_DbgAssert(data);
CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1()); CV_DbgAssert((unsigned)pt.y < (unsigned)size.p[0]);
CV_DbgAssert((unsigned)(pt.x * DataType<_Tp>::channels) < (unsigned)(size.p[1] * channels()));
CV_DbgAssert(CV_ELEM_SIZE1(DataType<_Tp>::depth) == elemSize1());
return ((const _Tp*)(data + step.p[0] * pt.y))[pt.x]; return ((const _Tp*)(data + step.p[0] * pt.y))[pt.x];
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp& Mat::at(int i0) _Tp& Mat::at(int i0)
{ {
CV_DbgAssert( dims <= 2 && data && CV_DbgAssert(dims <= 2);
(unsigned)i0 < (unsigned)(size.p[0] * size.p[1]) && CV_DbgAssert(data);
elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) ); CV_DbgAssert((unsigned)i0 < (unsigned)(size.p[0] * size.p[1]));
CV_DbgAssert(elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type));
if( isContinuous() || size.p[0] == 1 ) if( isContinuous() || size.p[0] == 1 )
return ((_Tp*)data)[i0]; return ((_Tp*)data)[i0];
if( size.p[1] == 1 ) if( size.p[1] == 1 )
...@@ -944,9 +961,10 @@ _Tp& Mat::at(int i0) ...@@ -944,9 +961,10 @@ _Tp& Mat::at(int i0)
template<typename _Tp> inline template<typename _Tp> inline
const _Tp& Mat::at(int i0) const const _Tp& Mat::at(int i0) const
{ {
CV_DbgAssert( dims <= 2 && data && CV_DbgAssert(dims <= 2);
(unsigned)i0 < (unsigned)(size.p[0] * size.p[1]) && CV_DbgAssert(data);
elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) ); CV_DbgAssert((unsigned)i0 < (unsigned)(size.p[0] * size.p[1]));
CV_DbgAssert(elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type));
if( isContinuous() || size.p[0] == 1 ) if( isContinuous() || size.p[0] == 1 )
return ((const _Tp*)data)[i0]; return ((const _Tp*)data)[i0];
if( size.p[1] == 1 ) if( size.p[1] == 1 )
...@@ -1563,40 +1581,44 @@ const _Tp* Mat_<_Tp>::operator [](int y) const ...@@ -1563,40 +1581,44 @@ const _Tp* Mat_<_Tp>::operator [](int y) const
template<typename _Tp> inline template<typename _Tp> inline
_Tp& Mat_<_Tp>::operator ()(int i0, int i1) _Tp& Mat_<_Tp>::operator ()(int i0, int i1)
{ {
CV_DbgAssert( dims <= 2 && data && CV_DbgAssert(dims <= 2);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] && CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
type() == DataType<_Tp>::type ); CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
CV_DbgAssert(type() == DataType<_Tp>::type);
return ((_Tp*)(data + step.p[0] * i0))[i1]; return ((_Tp*)(data + step.p[0] * i0))[i1];
} }
template<typename _Tp> inline template<typename _Tp> inline
const _Tp& Mat_<_Tp>::operator ()(int i0, int i1) const const _Tp& Mat_<_Tp>::operator ()(int i0, int i1) const
{ {
CV_DbgAssert( dims <= 2 && data && CV_DbgAssert(dims <= 2);
(unsigned)i0 < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)i1 < (unsigned)size.p[1] && CV_DbgAssert((unsigned)i0 < (unsigned)size.p[0]);
type() == DataType<_Tp>::type ); CV_DbgAssert((unsigned)i1 < (unsigned)size.p[1]);
CV_DbgAssert(type() == DataType<_Tp>::type);
return ((const _Tp*)(data + step.p[0] * i0))[i1]; return ((const _Tp*)(data + step.p[0] * i0))[i1];
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp& Mat_<_Tp>::operator ()(Point pt) _Tp& Mat_<_Tp>::operator ()(Point pt)
{ {
CV_DbgAssert( dims <= 2 && data && CV_DbgAssert(dims <= 2);
(unsigned)pt.y < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)pt.x < (unsigned)size.p[1] && CV_DbgAssert((unsigned)pt.y < (unsigned)size.p[0]);
type() == DataType<_Tp>::type ); CV_DbgAssert((unsigned)pt.x < (unsigned)size.p[1]);
CV_DbgAssert(type() == DataType<_Tp>::type);
return ((_Tp*)(data + step.p[0] * pt.y))[pt.x]; return ((_Tp*)(data + step.p[0] * pt.y))[pt.x];
} }
template<typename _Tp> inline template<typename _Tp> inline
const _Tp& Mat_<_Tp>::operator ()(Point pt) const const _Tp& Mat_<_Tp>::operator ()(Point pt) const
{ {
CV_DbgAssert( dims <= 2 && data && CV_DbgAssert(dims <= 2);
(unsigned)pt.y < (unsigned)size.p[0] && CV_DbgAssert(data);
(unsigned)pt.x < (unsigned)size.p[1] && CV_DbgAssert((unsigned)pt.y < (unsigned)size.p[0]);
type() == DataType<_Tp>::type ); CV_DbgAssert((unsigned)pt.x < (unsigned)size.p[1]);
CV_DbgAssert(type() == DataType<_Tp>::type);
return ((const _Tp*)(data + step.p[0] * pt.y))[pt.x]; return ((const _Tp*)(data + step.p[0] * pt.y))[pt.x];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment