mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
ffad7b699c
opencv/modules/bioinspired
History
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
include/opencv2 Add OpenCL accelerated implementation for Retina. 2013-08-13 16:27:12 +08:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
test bioinspired: fix ocl test, skip them if OpenCL is not available 2013-12-11 15:56:54 +04:00
CMakeLists.txt Suppressed -Wundef in bioinspired, because of OpenCL headers. 2013-10-22 15:16:22 +04:00