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
9218f4976c
opencv/modules/bioinspired
History
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +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 2013-09-02 19:44:51 +04:00
test Let ocl::context only be initialized once in retina_ocl test. 2013-08-28 09:17:05 +08:00
CMakeLists.txt Add OpenCL accelerated implementation for Retina. 2013-08-13 16:27:12 +08:00