Fix the bug of Mat_<>::opeartor []

hailong-wang · web-flow · commit 207218e9208c · 2017-03-14T13:02:59.000+08:00
`template&lt;typename _Tp&gt; inline const _Tp* Mat_&lt;_Tp&gt;::operator [](int y) const` does not support 3d matrix since it checks rows.

This operator[] shall check size.p[0] instead.
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -1634,14 +1634,14 @@ Mat_<_Tp> Mat_<_Tp>::operator()(const std::vector<Range>& ranges) const
 template<typename _Tp> inline
 _Tp* Mat_<_Tp>::operator [](int y)
 {
-    CV_DbgAssert( 0 <= y && y < rows );
+    CV_DbgAssert( 0 <= y && y < size.p[0] );
     return (_Tp*)(data + y*step.p[0]);
 }
 
 template<typename _Tp> inline
 const _Tp* Mat_<_Tp>::operator [](int y) const
 {
-    CV_DbgAssert( 0 <= y && y < rows );
+    CV_DbgAssert( 0 <= y && y < size.p[0] );
     return (const _Tp*)(data + y*step.p[0]);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1634,14 +1634,14 @@ Mat_<_Tp> Mat_<_Tp>::operator()(const std::vector<Range>& ranges) const`
`1634`	`1634`	`template<typename _Tp> inline`
`1635`	`1635`	`_Tp* Mat_<_Tp>::operator [](int y)`
`1636`	`1636`	`{`
`1637`		`- CV_DbgAssert( 0 <= y && y < rows );`
	`1637`	`+ CV_DbgAssert( 0 <= y && y < size.p[0] );`
`1638`	`1638`	`return (_Tp)(data + ystep.p[0]);`
`1639`	`1639`	`}`
`1640`	`1640`
`1641`	`1641`	`template<typename _Tp> inline`
`1642`	`1642`	`const _Tp* Mat_<_Tp>::operator [](int y) const`
`1643`	`1643`	`{`
`1644`		`- CV_DbgAssert( 0 <= y && y < rows );`
	`1644`	`+ CV_DbgAssert( 0 <= y && y < size.p[0] );`
`1645`	`1645`	`return (const _Tp)(data + ystep.p[0]);`
`1646`	`1646`	`}`
`1647`	`1647`