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

Merge pull request #6675 from pnordhus:matconstiterator_reference

Browse Source
This commit is contained in:
Alexander Alekhin 2016-06-17 10:12:51 +00:00
commit 31952fbf1c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2880,9 +2880,9 @@ public:
//! copy operator //! copy operator
MatConstIterator_& operator = (const MatConstIterator_& it); MatConstIterator_& operator = (const MatConstIterator_& it);
//! returns the current matrix element //! returns the current matrix element
_Tp operator *() const; const _Tp& operator *() const;
//! returns the i-th matrix element, relative to the current //! returns the i-th matrix element, relative to the current
_Tp operator [](ptrdiff_t i) const; const _Tp& operator [](ptrdiff_t i) const;
//! shifts the iterator forward by the specified number of elements //! shifts the iterator forward by the specified number of elements
MatConstIterator_& operator += (ptrdiff_t ofs); MatConstIterator_& operator += (ptrdiff_t ofs);

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

@ -2550,7 +2550,7 @@ MatConstIterator_<_Tp>& MatConstIterator_<_Tp>::operator = (const MatConstIterat
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp MatConstIterator_<_Tp>::operator *() const const _Tp& MatConstIterator_<_Tp>::operator *() const
{ {
return *(_Tp*)(this->ptr); return *(_Tp*)(this->ptr);
} }
@ -2656,7 +2656,7 @@ MatConstIterator_<_Tp> operator - (const MatConstIterator_<_Tp>& a, ptrdiff_t of
} }
template<typename _Tp> inline template<typename _Tp> inline
_Tp MatConstIterator_<_Tp>::operator [](ptrdiff_t i) const const _Tp& MatConstIterator_<_Tp>::operator [](ptrdiff_t i) const
{ {
return *(_Tp*)MatConstIterator::operator [](i); return *(_Tp*)MatConstIterator::operator [](i);
} }