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

2
modules/nonfree/perf/perf_surf.ocl.cpp
View File

@@ -108,4 +108,4 @@ PERF_TEST_P(OCL_SURF, DISABLED_without_data_transfer, testing::Values(SURF_IMAGE
SANITY_CHECK(cpu_dp, 1);
}
#endif // HAVE_OPENCV_OCL
#endif // HAVE_OPENCV_OCL