merged all the latest changes from 2.4 to trunk

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

View File

@@ -1,4 +1,5 @@
#include "perf_precomp.hpp"
#include "opencv2/core/internal.hpp"
using namespace std;
using namespace cv;
@@ -62,7 +63,11 @@ PERF_TEST_P(Size_MatType_BorderType3x3, gaussianBlur3x3,
TEST_CYCLE() GaussianBlur(src, dst, Size(3,3), 0, 0, btype);
#if CV_SSE2
SANITY_CHECK(dst, 1);
#else
SANITY_CHECK(dst);
#endif
}
PERF_TEST_P(Size_MatType_BorderType3x3, blur3x3,