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

Fixed build with gcc compiler; couple minor improvements in perf testing framework

Browse Source
This commit is contained in:
Andrey Kamaev 2011-12-16 04:42:34 +00:00
parent 6ee1f6f66e
commit 0744092b21
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/convert.cpp
View File

@ -607,7 +607,7 @@ cvtScale_( const T* src, size_t sstep,
} }
//vz optimized template specialization //vz optimized template specialization
template<> static void template<> void
cvtScale_<short, short, float>( const short* src, size_t sstep, cvtScale_<short, short, float>( const short* src, size_t sstep,
short* dst, size_t dstep, Size size, short* dst, size_t dstep, Size size,
float scale, float shift ) float scale, float shift )

4
modules/stitching/perf/perf_stich.cpp
View File

@ -32,7 +32,7 @@ PERF_TEST_P( stitch, a123, testing::Values("surf", "orb"))
? new detail::BestOf2NearestMatcher(false, ORB_MATCH_CONFIDENCE) ? new detail::BestOf2NearestMatcher(false, ORB_MATCH_CONFIDENCE)
: new detail::BestOf2NearestMatcher(false, SURF_MATCH_CONFIDENCE); : new detail::BestOf2NearestMatcher(false, SURF_MATCH_CONFIDENCE);
declare.time(30 * 20).iterations(50); declare.time(30 * 20).iterations(20);
while(next()) while(next())
{ {
@ -65,7 +65,7 @@ PERF_TEST_P( stitch, b12, testing::Values("surf", "orb"))
? new detail::BestOf2NearestMatcher(false, ORB_MATCH_CONFIDENCE) ? new detail::BestOf2NearestMatcher(false, ORB_MATCH_CONFIDENCE)
: new detail::BestOf2NearestMatcher(false, SURF_MATCH_CONFIDENCE); : new detail::BestOf2NearestMatcher(false, SURF_MATCH_CONFIDENCE);
declare.time(30 * 20).iterations(50); declare.time(30 * 20).iterations(20);
while(next()) while(next())
{ {

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

@ -14,7 +14,7 @@ def getSetName(tset, idx, columns, short = True):
return prefix return prefix
name = tset[0].replace(".xml","").replace("_", "\n") name = tset[0].replace(".xml","").replace("_", "\n")
if prefix: if prefix:
return prefix + "\n" + ("-"*int(len(prefix)*1.7)) + "\n" + name return prefix + "\n" + ("-"*int(len(max(prefix.split("\n"), key=len))*1.5)) + "\n" + name
return name return name
if __name__ == "__main__": if __name__ == "__main__":
@ -43,7 +43,7 @@ if __name__ == "__main__":
options.calc_relatives = False options.calc_relatives = False
options.calc_cr = False options.calc_cr = False
if options.columns: if options.columns:
options.columns = [s.strip() for s in options.columns.split(",")] options.columns = [s.strip().replace("\\n", "\n") for s in options.columns.split(",")]
# expand wildcards and filter duplicates # expand wildcards and filter duplicates
files = [] files = []