Merge pull request #3234 from vpisarev:fixed_photo_test_failure

11 years ago · d1afa0e370
parent 1578dd1027 aa6ba149bc
commit d1afa0e370
1 changed files with 1 additions and 4 deletions
--- a/modules/imgproc/src/pyramids.cpp
+++ b/modules/imgproc/src/pyramids.cpp
@ -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++ )
        {