From: Andrey Kamaev Date: Fri, 13 Jan 2012 12:37:10 +0000 (+0000) Subject: Fixed small bug in summary.py X-Git-Tag: accepted/2.0/20130307.220821~1462 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61cb83b48106a608715fed87d78a64d2781b81aa;p=profile%2Fivi%2Fopencv.git Fixed small bug in summary.py --- diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp index 50ae65b..ef6b193 100644 --- a/modules/imgproc/perf/perf_warp.cpp +++ b/modules/imgproc/perf/perf_warp.cpp @@ -4,8 +4,8 @@ using namespace std; using namespace cv; using namespace perf; using namespace testing; -using std::tr1::make_tuple; -using std::tr1::get; +using std::tr1::make_tuple; +using std::tr1::get; CV_ENUM(BorderMode, BORDER_CONSTANT, BORDER_REPLICATE); @@ -25,7 +25,6 @@ PERF_TEST_P( TestWarpAffine, WarpAffine, { Size sz; int borderMode, interType; - //tr1::tie(sz, borderMode, interType) = GetParam(); sz = get<0>(GetParam()); borderMode = get<1>(GetParam()); interType = get<2>(GetParam()); @@ -35,7 +34,7 @@ PERF_TEST_P( TestWarpAffine, WarpAffine, 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); + declare.in(src).out(dst); TEST_CYCLE() warpAffine( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) ); @@ -53,7 +52,6 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective, { Size sz; int borderMode, interType; - //tr1::tie(sz, borderMode, interType) = GetParam(); sz = get<0>(GetParam()); borderMode = get<1>(GetParam()); interType = get<2>(GetParam()); @@ -71,7 +69,7 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective, warpMat.at(2, 2) = 1; Mat dst(sz, CV_8UC4); - //declare.in(src).out(dst); + declare.in(src).out(dst); TEST_CYCLE() warpPerspective( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) ); diff --git a/modules/ts/misc/summary.py b/modules/ts/misc/summary.py index dc207f7..661bf2e 100644 --- a/modules/ts/misc/summary.py +++ b/modules/ts/misc/summary.py @@ -6,7 +6,7 @@ convert = lambda text: int(text) if text.isdigit() else text alphanum_keyselector = lambda key: [ convert(c) for c in re.split('([0-9]+)', key) ] def getSetName(tset, idx, columns, short = True): - if columns and len(columns) >= idx: + if columns and len(columns) > idx: prefix = columns[idx] else: prefix = None