OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26776 from vrabaud:ub_warp

Browse Source 
Don't overflow pointer addition
This commit is contained in:
Alexander Smorkalov 2025-01-15 15:19:19 +03:00 committed by GitHub
commit 1d701d1690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/imgwarp.cpp
View File

@ -955,7 +955,7 @@ static void remapBicubic( const Mat& _src, Mat& _dst, const Mat& _xy,
sum += S[0]*w[8] + S[cn]*w[9] + S[cn*2]*w[10] + S[cn*3]*w[11]; sum += S[0]*w[8] + S[cn]*w[9] + S[cn*2]*w[10] + S[cn*3]*w[11];
S += sstep; S += sstep;
sum += S[0]*w[12] + S[cn]*w[13] + S[cn*2]*w[14] + S[cn*3]*w[15]; sum += S[0]*w[12] + S[cn]*w[13] + S[cn*2]*w[14] + S[cn*3]*w[15];
S += 1 - sstep*3; S -= sstep * 3 - 1;
D[k] = castOp(sum); D[k] = castOp(sum);
} }
} }
@ -988,9 +988,9 @@ static void remapBicubic( const Mat& _src, Mat& _dst, const Mat& _xy,
for(int i = 0; i < 4; i++, w += 4 ) for(int i = 0; i < 4; i++, w += 4 )
{ {
int yi = y[i]; int yi = y[i];
const T* S = S0 + yi*sstep;
if( yi < 0 ) if( yi < 0 )
continue; continue;
const T* S = S0 + yi*sstep;
if( x[0] >= 0 ) if( x[0] >= 0 )
sum += (S[x[0]] - cv)*w[0]; sum += (S[x[0]] - cv)*w[0];
if( x[1] >= 0 ) if( x[1] >= 0 )