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

Merge pull request #6232 from piotr-semenov:semenovp_fixes

Browse Source
This commit is contained in:
Alexander Alekhin 2016-03-11 12:23:41 +00:00
commit c41dc915fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2474,7 +2474,7 @@ ptrdiff_t operator - (const MatConstIterator& b, const MatConstIterator& a)
if( a.m != b.m ) if( a.m != b.m )
return ((size_t)(-1) >> 1); return ((size_t)(-1) >> 1);
if( a.sliceEnd == b.sliceEnd ) if( a.sliceEnd == b.sliceEnd )
return (b.ptr - a.ptr)/b.elemSize; return (b.ptr - a.ptr)/static_cast<ptrdiff_t>(b.elemSize);
return b.lpos() - a.lpos(); return b.lpos() - a.lpos();
} }