Return reference on iterator indirection/subscript

pnordhus · pnordhus · commit 4a529cd64174 · 2016-06-11T15:17:52.000+02:00
diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp
@@ -2880,9 +2880,9 @@ class MatConstIterator_ : public MatConstIterator
     //! copy operator
     MatConstIterator_& operator = (const MatConstIterator_& it);
     //! returns the current matrix element
-    _Tp operator *() const;
+    const _Tp& operator *() const;
     //! 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
     MatConstIterator_& operator += (ptrdiff_t ofs);
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -2550,7 +2550,7 @@ MatConstIterator_<_Tp>& MatConstIterator_<_Tp>::operator = (const MatConstIterat
 }
 
 template<typename _Tp> inline
-_Tp MatConstIterator_<_Tp>::operator *() const
+const _Tp& MatConstIterator_<_Tp>::operator *() const
 {
     return *(_Tp*)(this->ptr);
 }
@@ -2656,7 +2656,7 @@ MatConstIterator_<_Tp> operator - (const MatConstIterator_<_Tp>& a, ptrdiff_t of
 }
 
 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -2550,7 +2550,7 @@ MatConstIterator_<_Tp>& MatConstIterator_<_Tp>::operator = (const MatConstIterat`
`2550`	`2550`	`}`
`2551`	`2551`
`2552`	`2552`	`template<typename _Tp> inline`
`2553`		`-_Tp MatConstIterator_<_Tp>::operator *() const`
	`2553`	`+const _Tp& MatConstIterator_<_Tp>::operator *() const`
`2554`	`2554`	`{`
`2555`	`2555`	`return (_Tp)(this->ptr);`
`2556`	`2556`	`}`
`@@ -2656,7 +2656,7 @@ MatConstIterator_<_Tp> operator - (const MatConstIterator_<_Tp>& a, ptrdiff_t of`
`2656`	`2656`	`}`
`2657`	`2657`
`2658`	`2658`	`template<typename _Tp> inline`
`2659`		`-_Tp MatConstIterator_<_Tp>::operator [](ptrdiff_t i) const`
	`2659`	`+const _Tp& MatConstIterator_<_Tp>::operator [](ptrdiff_t i) const`
`2660`	`2660`	`{`
`2661`	`2661`	`return (_Tp)MatConstIterator::operator [](i);`
`2662`	`2662`	`}`