fixing compilation on Windows (std::tr1::tie() is undefined), removing warnings ...

diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp
index 688ddb1..1fc4db9 100644 (file)
--- a/modules/imgproc/perf/perf_warp.cpp
+++ b/modules/imgproc/perf/perf_warp.cpp
@@ -22,12 +22,14 @@ PERF_TEST_P( TestWarpAffine, WarpAffine,
 {\r
     Size sz;\r
     int borderMode, interType;\r
-    tr1::tie(sz, borderMode, interType) = GetParam();\r
-\r
+    //tr1::tie(sz, borderMode, interType) = GetParam();\r
+    sz         = get<0>(GetParam());\r
+    borderMode = get<1>(GetParam());\r
+    interType  = get<2>(GetParam());\r
 \r
     Mat src, img = imread(getDataPath("cv/shared/fruits.jpg"));\r
     cvtColor(img, src, COLOR_BGR2RGBA, 4);\r
-    Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2, src.rows/2), 30, 2.2);\r
+    Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2);\r
     Mat dst(sz, CV_8UC4);\r
 \r
     //declare.in(src).out(dst);\r
@@ -48,12 +50,15 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective,
 {\r
     Size sz;\r
     int borderMode, interType;\r
-    tr1::tie(sz, borderMode, interType) = GetParam();\r
+    //tr1::tie(sz, borderMode, interType) = GetParam();\r
+    sz         = get<0>(GetParam());\r
+    borderMode = get<1>(GetParam());\r
+    interType  = get<2>(GetParam());\r
 \r
 \r
     Mat src, img = imread(getDataPath("cv/shared/fruits.jpg"));\r
     cvtColor(img, src, COLOR_BGR2RGBA, 4);\r
-    Mat rotMat = getRotationMatrix2D(Point2f(src.cols/2, src.rows/2), 30, 2.2);\r
+    Mat rotMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2);\r
     Mat warpMat(3, 3, CV_64FC1);\r
     for(int r=0; r<2; r++)\r
         for(int c=0; c<3; c++)\r