From 3d54ce55f218a0051de556d07084d5ee57c9d5c5 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Thu, 12 Jan 2012 11:50:59 +0000 Subject: [PATCH] fixing compilation on Windows (std::tr1::tie() is undefined), removing warnings (conversion int to float/double) --- modules/imgproc/perf/perf_warp.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp index 688ddb1abb..1fc4db95dc 100644 --- a/modules/imgproc/perf/perf_warp.cpp +++ b/modules/imgproc/perf/perf_warp.cpp @@ -22,12 +22,14 @@ PERF_TEST_P( TestWarpAffine, WarpAffine, { Size sz; int borderMode, interType; - tr1::tie(sz, borderMode, interType) = GetParam(); - + //tr1::tie(sz, borderMode, interType) = GetParam(); + sz = get<0>(GetParam()); + borderMode = get<1>(GetParam()); + interType = get<2>(GetParam()); Mat src, img = imread(getDataPath("cv/shared/fruits.jpg")); cvtColor(img, src, COLOR_BGR2RGBA, 4); - Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2, src.rows/2), 30, 2.2); + Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2); Mat dst(sz, CV_8UC4); //declare.in(src).out(dst); @@ -48,12 +50,15 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective, { Size sz; int borderMode, interType; - tr1::tie(sz, borderMode, interType) = GetParam(); + //tr1::tie(sz, borderMode, interType) = GetParam(); + sz = get<0>(GetParam()); + borderMode = get<1>(GetParam()); + interType = get<2>(GetParam()); Mat src, img = imread(getDataPath("cv/shared/fruits.jpg")); cvtColor(img, src, COLOR_BGR2RGBA, 4); - Mat rotMat = getRotationMatrix2D(Point2f(src.cols/2, src.rows/2), 30, 2.2); + Mat rotMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2); Mat warpMat(3, 3, CV_64FC1); for(int r=0; r<2; r++) for(int c=0; c<3; c++)