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

Merge commit '43aec5ad' into merge-2.4

Browse Source 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
This commit is contained in:
Roman Donchenko
2013-08-27 13:26:44 +04:00
parent 4d06c4c7b6 43aec5ad4a
commit 2c4bbb313c
448 changed files with 984 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ocl/test/test_optflow.cpp
View File

@@ -85,7 +85,7 @@ TEST_P(GoodFeaturesToTrack, Accuracy)
ASSERT_FALSE(d_pts.empty());
std::vector<cv::Point2f> pts(d_pts.cols);
detector.downloadPoints(d_pts, pts);
std::vector<cv::Point2f> pts_gold;
@@ -125,7 +125,7 @@ TEST_P(GoodFeaturesToTrack, EmptyCorners)
ASSERT_TRUE(corners.empty());
}
INSTANTIATE_TEST_CASE_P(OCL_Video, GoodFeaturesToTrack,
INSTANTIATE_TEST_CASE_P(OCL_Video, GoodFeaturesToTrack,
testing::Values(MinDistance(0.0), MinDistance(3.0)));
//////////////////////////////////////////////////////////////////////////
@@ -342,4 +342,3 @@ INSTANTIATE_TEST_CASE_P(OCL_Video, Farneback, testing::Combine(
testing::Values(UseInitFlow(false), UseInitFlow(true))));
#endif // HAVE_OPENCL