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

merged all the latest changes from 2.4 to trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/perf/perf_convertTo.cpp
View File

@@ -32,5 +32,5 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo,
TEST_CYCLE() src.convertTo(dst, depthDst, alpha);
SANITY_CHECK(dst);
SANITY_CHECK(dst, 1e-12);
}

2
modules/core/perf/perf_merge.cpp
View File

@@ -32,5 +32,5 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge,
Mat dst;
TEST_CYCLE() merge( (vector<Mat> &)mv, dst );
SANITY_CHECK(dst);
SANITY_CHECK(dst, 1e-12);
}

2
modules/core/perf/perf_split.cpp
View File

@@ -29,5 +29,5 @@ PERF_TEST_P( Size_Depth_Channels, split,
TEST_CYCLE() split(m, (vector<Mat>&)mv);
SANITY_CHECK(mv);
SANITY_CHECK(mv, 1e-12);
}