fixed compile warnings on Linux and Windows

diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp
index 792ba1d..760f3fb 100644 (file)
--- a/modules/imgproc/src/imgwarp.cpp
+++ b/modules/imgproc/src/imgwarp.cpp
@@ -3960,7 +3960,7 @@ static void remapBilinear( const Mat& _src, Mat& _dst, const Mat& _xy,
                 else
                     for( ; dx < X1; dx++, D += cn )
                     {
-                        int sx = XY[dx*2], sy = XY[dx*2+1], k;
+                        int sx = XY[dx*2], sy = XY[dx*2+1];
                         if( borderType == BORDER_CONSTANT &&
                             (sx >= ssize.width || sx+1 < 0 ||
                              sy >= ssize.height || sy+1 < 0) )

diff --git a/modules/imgproc/test/test_imgwarp.cpp b/modules/imgproc/test/test_imgwarp.cpp
index d15f72e..bf3f6b3 100644 (file)
--- a/modules/imgproc/test/test_imgwarp.cpp
+++ b/modules/imgproc/test/test_imgwarp.cpp
@@ -1657,14 +1657,14 @@ TEST(Imgproc_Warp, multichannel)
 TEST(Imgproc_GetAffineTransform, singularity)
 {
     Point2f A_sample[3];
-    A_sample[0] = cv::Point2f(8, 9);
-    A_sample[1] = cv::Point2f(40, 41);
-    A_sample[2] = cv::Point2f(47, 48);
+    A_sample[0] = Point2f(8.f, 9.f);
+    A_sample[1] = Point2f(40.f, 41.f);
+    A_sample[2] = Point2f(47.f, 48.f);
     Point2f B_sample[3];
-    B_sample[0] = cv::Point2f(7.37465, 11.8295);
-    B_sample[1] = cv::Point2f(15.0113, 12.8994);
-    B_sample[2] = cv::Point2f(38.9943, 9.56297);
-    Mat trans = cv::getAffineTransform(A_sample, B_sample);
+    B_sample[0] = Point2f(7.37465f, 11.8295f);
+    B_sample[1] = Point2f(15.0113f, 12.8994f);
+    B_sample[2] = Point2f(38.9943f, 9.56297f);
+    Mat trans = getAffineTransform(A_sample, B_sample);
     ASSERT_EQ(0.0, norm(trans, NORM_INF));
 }