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

Merge pull request #6236 from alalek:backport_6232

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-03-12 16:38:56 +00:00
commit 93c4dfb16d
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/src/matrix.cpp
View File

@ -3439,7 +3439,7 @@ ptrdiff_t operator - (const MatConstIterator& b, const MatConstIterator& a)
if( a.m != b.m ) if( a.m != b.m )
return INT_MAX; return INT_MAX;
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();
} }