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

fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1

Browse Source
This commit is contained in:
Ilya Lavrenov 2013-11-08 01:08:36 +04:00
parent 098d4e6174
commit eb7ff99f80
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2935,7 +2935,10 @@ public:
if( m1->type() == CV_16SC2 && (m2->type() == CV_16UC1 || m2->type() == CV_16SC1) ) if( m1->type() == CV_16SC2 && (m2->type() == CV_16UC1 || m2->type() == CV_16SC1) )
{ {
bufxy = (*m1)(Rect(x, y, bcols, brows)); bufxy = (*m1)(Rect(x, y, bcols, brows));
bufa = (*m2)(Rect(x, y, bcols, brows));
const ushort* sA = (const ushort*)(m2->data + m2->step*(y+y1)) + x;
for( x1 = 0; x1 < bcols; x1++ )
A[x1] = (ushort)(sA[x1] & (INTER_TAB_SIZE2-1));
} }
else if( planar_input ) else if( planar_input )
{ {
@ -3242,7 +3245,7 @@ void cv::convertMaps( InputArray _map1, InputArray _map2,
{ {
for( x = 0; x < size.width; x++ ) for( x = 0; x < size.width; x++ )
{ {
int fxy = src2 ? src2[x] : 0; int fxy = src2 ? src2[x] & (INTER_TAB_SIZE2-1) : 0;
dst1f[x] = src1[x*2] + (fxy & (INTER_TAB_SIZE-1))*scale; dst1f[x] = src1[x*2] + (fxy & (INTER_TAB_SIZE-1))*scale;
dst2f[x] = src1[x*2+1] + (fxy >> INTER_BITS)*scale; dst2f[x] = src1[x*2+1] + (fxy >> INTER_BITS)*scale;
} }
@ -3251,7 +3254,7 @@ void cv::convertMaps( InputArray _map1, InputArray _map2,
{ {
for( x = 0; x < size.width; x++ ) for( x = 0; x < size.width; x++ )
{ {
int fxy = src2 ? src2[x] : 0; int fxy = src2 ? src2[x] & (INTER_TAB_SIZE2-1): 0;
dst1f[x*2] = src1[x*2] + (fxy & (INTER_TAB_SIZE-1))*scale; dst1f[x*2] = src1[x*2] + (fxy & (INTER_TAB_SIZE-1))*scale;
dst1f[x*2+1] = src1[x*2+1] + (fxy >> INTER_BITS)*scale; dst1f[x*2+1] = src1[x*2+1] + (fxy >> INTER_BITS)*scale;
} }