fixed outliers check in remap with bilinear interpolation and transparent border...

git-svn-id: https://code.ros.org/svn/opencv/trunk@2975 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/src/cv/cvimgwarp.cpp b/opencv/src/cv/cvimgwarp.cpp
index fafc11b54a790af7c31b4883834440325a011c20..c9be56858ba09ec120ccca22c952eb761ab77dd6 100644 (file)
--- a/opencv/src/cv/cvimgwarp.cpp
+++ b/opencv/src/cv/cvimgwarp.cpp
@@ -2092,8 +2092,8 @@ static void remapBilinear( const Mat& _src, Mat& _dst, const Mat& _xy,
                                 v3 = S0 + sy1*sstep + sx1*cn;
                             }
                             else if( borderType == BORDER_TRANSPARENT &&
-                                (unsigned)sx >= (unsigned)(ssize.width-1) &&
-                                (unsigned)sy >= (unsigned)(ssize.height-1))
+                                ((unsigned)sx >= (unsigned)(ssize.width-1) ||
+                                (unsigned)sy >= (unsigned)(ssize.height-1)))
                                 continue;
                             else
                             {