fixed end-of-matrix case in MatIterator::operator += (tickets #72 and #87)

git-svn-id: https://code.ros.org/svn/opencv/trunk@2613 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cxmat.hpp b/opencv/include/opencv/cxmat.hpp
index 92f5c2502daa61443046b5a3f56174e1e4a293d3..a80197f211a5df91f472eb43662aa1edabef45ea 100644 (file)
--- a/opencv/include/opencv/cxmat.hpp
+++ b/opencv/include/opencv/cxmat.hpp
@@ -3377,7 +3377,10 @@ template<typename _Tp> inline MatConstIterator_<_Tp>& MatConstIterator_<_Tp>::op
         int cols = m->cols;
         ofs += pt.y*cols + pt.x;
         if( ofs > cols*m->rows )
-            ofs = cols*m->rows;
+        {
+            ptr = sliceEnd = (_Tp*)(m->data + m->step*(m->rows-1)) + cols; 
+            return *this; 
+        }
         else if( ofs < 0 )
             ofs = 0;
         pt.y = ofs/cols;