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

Merged the trunk r8324:8345

Browse Source
This commit is contained in:
Andrey Kamaev
2012-05-18 12:59:40 +00:00
parent aebed446b1
commit 70166820ea
9 changed files with 65 additions and 23 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, 1e-12);
SANITY_CHECK(dst, alpha == 1.0 ? 1e-12 : 1e-7);
}

5
modules/core/src/matmul.cpp
View File

@@ -2768,8 +2768,9 @@ typedef double (*DotProdFunc)(const uchar* src1, const uchar* src2, int len);
static DotProdFunc dotProdTab[] =
{
(DotProdFunc)GET_OPTIMIZED(dotProd_8u), (DotProdFunc)dotProd_8s, (DotProdFunc)dotProd_16u,
(DotProdFunc)dotProd_16s, (DotProdFunc)dotProd_32s, (DotProdFunc)GET_OPTIMIZED(dotProd_32f),
(DotProdFunc)GET_OPTIMIZED(dotProd_8u), (DotProdFunc)GET_OPTIMIZED(dotProd_8s),
(DotProdFunc)dotProd_16u, (DotProdFunc)dotProd_16s,
(DotProdFunc)dotProd_32s, (DotProdFunc)GET_OPTIMIZED(dotProd_32f),
(DotProdFunc)dotProd_64f, 0
};