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

Merge branch 'master' into gpu-cuda-rename

Browse Source 
Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp
This commit is contained in:
Vladislav Vinogradov
2013-09-04 09:58:32 +04:00
parent 12f50d7f67 009919872f
commit 1ad4592bfc
156 changed files with 2057 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cudaoptflow/perf/perf_optflow.cpp
View File

@@ -368,8 +368,8 @@ PERF_TEST_P(ImagePair, OpticalFlowDual_TVL1,
TEST_CYCLE() d_alg(d_frame0, d_frame1, u, v);
CUDA_SANITY_CHECK(u, 1e-2);
CUDA_SANITY_CHECK(v, 1e-2);
CUDA_SANITY_CHECK(u, 1e-1);
CUDA_SANITY_CHECK(v, 1e-1);
}
else
{