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

Merge pull request #3234 from vpisarev:fixed_photo_test_failure

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-09-18 13:06:54 +00:00
commit d1afa0e370
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/imgproc/src/pyramids.cpp
View File

@ -341,12 +341,9 @@ pyrUp_( const Mat& _src, Mat& _dst, int)
for( int y = 0; y < ssize.height; y++ )
{
T* dst0 = _dst.ptr<T>(y*2);
T* dst1 = _dst.ptr<T>(y*2+1);
T* dst1 = _dst.ptr<T>(std::min(y*2+1, dsize.height-1));
WT *row0, *row1, *row2;
if( y*2+1 >= dsize.height )
dst1 = dst0;
// fill the ring buffer (horizontal convolution and decimation)
for( ; sy <= y + 1; sy++ )
{