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

Merge pull request #5996 from ElenaGvozdeva:pyrUp_fix

Browse Source
This commit is contained in:
Alexander Alekhin 2016-01-20 15:50:59 +00:00
commit f2e4bec925
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ pyrUp_( const Mat& _src, Mat& _dst, int)
for( ; sy <= y + 1; sy++ )
{
WT* row = buf + ((sy - sy0) % PU_SZ)*bufstep;
int _sy = borderInterpolate(sy*2, dsize.height, BORDER_REFLECT_101)/2;
int _sy = borderInterpolate(sy*2, ssize.height*2, BORDER_REFLECT_101)/2;
const T* src = (const T*)(_src.data + _src.step*_sy);
if( ssize.width == cn )
@ -370,6 +370,11 @@ pyrUp_( const Mat& _src, Mat& _dst, int)
t0 = src[sx - cn] + src[sx]*7;
t1 = src[sx]*8;
row[dx] = t0; row[dx + cn] = t1;
if (dsize.width > ssize.width*2)
{
row[(_dst.cols-1) + x] = row[dx + cn];
}
}
for( x = cn; x < ssize.width - cn; x++ )
@ -395,6 +400,17 @@ pyrUp_( const Mat& _src, Mat& _dst, int)
dst1[x] = t1; dst0[x] = t0;
}
}
if (dsize.height > ssize.height*2)
{
T* dst0 = _dst.ptr<T>(ssize.height*2-2);
T* dst2 = _dst.ptr<T>(ssize.height*2);
for(x = 0; x < dsize.width ; x++ )
{
dst2[x] = dst0[x];
}
}
}
typedef void (*PyrFunc)(const Mat&, Mat&, int);