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

Merge pull request #1733 from ilya-lavrenov:cv_remap

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-11-01 15:53:21 +04:00 committed by OpenCV Buildbot
commit 6c21b85fce
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2986,8 +2986,8 @@ public:
int sx = cvRound(sX[x1]*INTER_TAB_SIZE); int sx = cvRound(sX[x1]*INTER_TAB_SIZE);
int sy = cvRound(sY[x1]*INTER_TAB_SIZE); int sy = cvRound(sY[x1]*INTER_TAB_SIZE);
int v = (sy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (sx & (INTER_TAB_SIZE-1)); int v = (sy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (sx & (INTER_TAB_SIZE-1));
XY[x1*2] = (short)(sx >> INTER_BITS); XY[x1*2] = saturate_cast<short>(sx >> INTER_BITS);
XY[x1*2+1] = (short)(sy >> INTER_BITS); XY[x1*2+1] = saturate_cast<short>(sy >> INTER_BITS);
A[x1] = (ushort)v; A[x1] = (ushort)v;
} }
} }
@ -3000,8 +3000,8 @@ public:
int sx = cvRound(sXY[x1*2]*INTER_TAB_SIZE); int sx = cvRound(sXY[x1*2]*INTER_TAB_SIZE);
int sy = cvRound(sXY[x1*2+1]*INTER_TAB_SIZE); int sy = cvRound(sXY[x1*2+1]*INTER_TAB_SIZE);
int v = (sy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (sx & (INTER_TAB_SIZE-1)); int v = (sy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (sx & (INTER_TAB_SIZE-1));
XY[x1*2] = (short)(sx >> INTER_BITS); XY[x1*2] = saturate_cast<short>(sx >> INTER_BITS);
XY[x1*2+1] = (short)(sy >> INTER_BITS); XY[x1*2+1] = saturate_cast<short>(sy >> INTER_BITS);
A[x1] = (ushort)v; A[x1] = (ushort)v;
} }
} }
@ -3215,8 +3215,8 @@ void cv::convertMaps( InputArray _map1, InputArray _map2,
{ {
int ix = saturate_cast<int>(src1f[x]*INTER_TAB_SIZE); int ix = saturate_cast<int>(src1f[x]*INTER_TAB_SIZE);
int iy = saturate_cast<int>(src2f[x]*INTER_TAB_SIZE); int iy = saturate_cast<int>(src2f[x]*INTER_TAB_SIZE);
dst1[x*2] = (short)(ix >> INTER_BITS); dst1[x*2] = saturate_cast<short>(ix >> INTER_BITS);
dst1[x*2+1] = (short)(iy >> INTER_BITS); dst1[x*2+1] = saturate_cast<short>(iy >> INTER_BITS);
dst2[x] = (ushort)((iy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (ix & (INTER_TAB_SIZE-1))); dst2[x] = (ushort)((iy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (ix & (INTER_TAB_SIZE-1)));
} }
} }
@ -3233,8 +3233,8 @@ void cv::convertMaps( InputArray _map1, InputArray _map2,
{ {
int ix = saturate_cast<int>(src1f[x*2]*INTER_TAB_SIZE); int ix = saturate_cast<int>(src1f[x*2]*INTER_TAB_SIZE);
int iy = saturate_cast<int>(src1f[x*2+1]*INTER_TAB_SIZE); int iy = saturate_cast<int>(src1f[x*2+1]*INTER_TAB_SIZE);
dst1[x*2] = (short)(ix >> INTER_BITS); dst1[x*2] = saturate_cast<short>(ix >> INTER_BITS);
dst1[x*2+1] = (short)(iy >> INTER_BITS); dst1[x*2+1] = saturate_cast<short>(iy >> INTER_BITS);
dst2[x] = (ushort)((iy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (ix & (INTER_TAB_SIZE-1))); dst2[x] = (ushort)((iy & (INTER_TAB_SIZE-1))*INTER_TAB_SIZE + (ix & (INTER_TAB_SIZE-1)));
} }
} }