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

fixing compilation on Windows (std::tr1::tie() is undefined), removing warnings (conversion int to float/double)

Browse Source
This commit is contained in:
Andrey Pavlenko 2012-01-12 11:50:59 +00:00
parent 07d157591a
commit 3d54ce55f2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/imgproc/perf/perf_warp.cpp
View File

@ -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++)