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

Merge commit '43aec5ad^' into merge-2.4

Browse Source 
Conflicts:
	modules/contrib/src/inputoutput.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpuarithm/perf/perf_element_operations.cpp
	modules/gpuarithm/src/element_operations.cpp
	modules/ts/src/precomp.hpp
This commit is contained in:
Roman Donchenko
2013-08-27 13:23:26 +04:00
parent 0daac6fd9d 9c60a2c24c
commit 4d06c4c7b6
12 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpuarithm/perf/perf_arithm.cpp
View File

@@ -84,7 +84,7 @@ PERF_TEST_P(Sz_Type_Flags, GEMM,
TEST_CYCLE() cv::gpu::gemm(d_src1, d_src2, 1.0, d_src3, 1.0, dst, flags);
GPU_SANITY_CHECK(dst, 1e-6);
GPU_SANITY_CHECK(dst, 1e-6, ERROR_RELATIVE);
}
else
{
@@ -234,7 +234,7 @@ PERF_TEST_P(Sz_KernelSz_Ccorr, Convolve,
TEST_CYCLE() convolution->convolve(d_image, d_templ, dst, ccorr);
GPU_SANITY_CHECK(dst);
GPU_SANITY_CHECK(dst, 1e-6, ERROR_RELATIVE);
}
else
{