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

excluded dangerously overriden Mat_::reshape() method (ticket #1510)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-04-10 20:35:57 +00:00
parent 07750a1c7e
commit 8b0d9f4f5c
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/core.hpp
View File

@ -2732,7 +2732,6 @@ public:
static MatExpr eye(Size size);
//! some more overriden methods
Mat_ reshape(int _rows) const;
Mat_& adjustROI( int dtop, int dbottom, int dleft, int dright );
Mat_ operator()( const Range& rowRange, const Range& colRange ) const;
Mat_ operator()( const Rect& roi ) const;

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

@ -950,9 +950,6 @@ template<typename _Tp> inline int Mat_<_Tp>::channels() const
template<typename _Tp> inline size_t Mat_<_Tp>::stepT(int i) const { return step.p[i]/elemSize(); }
template<typename _Tp> inline size_t Mat_<_Tp>::step1(int i) const { return step.p[i]/elemSize1(); }
template<typename _Tp> inline Mat_<_Tp> Mat_<_Tp>::reshape(int _rows) const
{ return Mat_<_Tp>(Mat::reshape(0,_rows)); }
template<typename _Tp> inline Mat_<_Tp>& Mat_<_Tp>::adjustROI( int dtop, int dbottom, int dleft, int dright )
{ return (Mat_<_Tp>&)(Mat::adjustROI(dtop, dbottom, dleft, dright)); }