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

Fixed small bug in summary.py

Browse Source
This commit is contained in:
Andrey Kamaev 2012-01-13 12:37:10 +00:00
parent 555ed03613
commit 61cb83b481
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@ using namespace std;
using namespace cv; using namespace cv;
using namespace perf; using namespace perf;
using namespace testing; using namespace testing;
using std::tr1::make_tuple; using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
CV_ENUM(BorderMode, BORDER_CONSTANT, BORDER_REPLICATE); CV_ENUM(BorderMode, BORDER_CONSTANT, BORDER_REPLICATE);
@ -25,7 +25,6 @@ PERF_TEST_P( TestWarpAffine, WarpAffine,
{ {
Size sz; Size sz;
int borderMode, interType; int borderMode, interType;
//tr1::tie(sz, borderMode, interType) = GetParam();
sz = get<0>(GetParam()); sz = get<0>(GetParam());
borderMode = get<1>(GetParam()); borderMode = get<1>(GetParam());
interType = get<2>(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 warpMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2);
Mat dst(sz, CV_8UC4); 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) ); TEST_CYCLE() warpAffine( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) );
@ -53,7 +52,6 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective,
{ {
Size sz; Size sz;
int borderMode, interType; int borderMode, interType;
//tr1::tie(sz, borderMode, interType) = GetParam();
sz = get<0>(GetParam()); sz = get<0>(GetParam());
borderMode = get<1>(GetParam()); borderMode = get<1>(GetParam());
interType = get<2>(GetParam()); interType = get<2>(GetParam());
@ -71,7 +69,7 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective,
warpMat.at<double>(2, 2) = 1; warpMat.at<double>(2, 2) = 1;
Mat dst(sz, CV_8UC4); 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) ); TEST_CYCLE() warpPerspective( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) );

2
modules/ts/misc/summary.py
View File

@ -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) ] alphanum_keyselector = lambda key: [ convert(c) for c in re.split('([0-9]+)', key) ]
def getSetName(tset, idx, columns, short = True): def getSetName(tset, idx, columns, short = True):
if columns and len(columns) >= idx: if columns and len(columns) > idx:
prefix = columns[idx] prefix = columns[idx]
else: else:
prefix = None prefix = None