potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages 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
modules/cudaoptflow/perf/perf_optflow.cpp
+1 -1
View File
@@ -444,7 +444,7 @@ PERF_TEST_P(ImagePair, OpticalFlowBM,
}
}
PERF_TEST_P(ImagePair, FastOpticalFlowBM,
PERF_TEST_P(ImagePair, DISABLED_FastOpticalFlowBM,
Values<pair_string>(make_pair("gpu/opticalflow/frame0.png", "gpu/opticalflow/frame1.png")))
{
declare.time(400);