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

Merge commit '05b9c991dd' into merge-2.4

Browse Source 
Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp
This commit is contained in:
Roman Donchenko
2013-12-30 17:30:59 +04:00
parent e33759b358 05b9c991dd
commit cdc10defa3
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cudaarithm/test/test_element_operations.cpp
View File

@@ -2514,7 +2514,7 @@ CUDA_TEST_P(AddWeighted, Accuracy)
cv::Mat dst_gold;
cv::addWeighted(src1, alpha, src2, beta, gamma, dst_gold, dst_depth);
EXPECT_MAT_NEAR(dst_gold, dst, dst_depth < CV_32F ? 1.0 : 1e-3);
EXPECT_MAT_NEAR(dst_gold, dst, dst_depth < CV_32F ? 2.0 : 1e-3);
}
}