opencv/modules/bioinspired/src
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
..
opencl Fix whitespaces. 2013-09-10 15:13:53 +08:00
basicretinafilter.cpp
basicretinafilter.hpp
imagelogpolprojection.cpp
imagelogpolprojection.hpp
magnoretinafilter.cpp
magnoretinafilter.hpp
parvoretinafilter.cpp
parvoretinafilter.hpp
precomp.hpp updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
retina_ocl.cpp updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
retina_ocl.hpp retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning. 2013-09-06 12:33:54 +04:00
retina.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
retinacolor.cpp
retinacolor.hpp
retinafasttonemapping.cpp Boring changes - bioinspired. 2013-09-05 18:26:43 +04:00
retinafilter.cpp
retinafilter.hpp
templatebuffer.hpp