Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp		2014-03-03 13:45:22 +04:00
..
cuda	turn on CUDA part of nonfree module on Android for non-dynamic build	2014-02-03 11:52:43 +04:00
opencl	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
nonfree_init.cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-14 11:53:59 +04:00
precomp.hpp	fix nonfree module compilation without CUDA	2014-02-07 13:40:37 +04:00
sift.cpp	features2d	2014-02-04 16:55:07 +04:00
surf.cpp	Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray	2014-02-06 12:55:04 +04:00
surf.cuda.cpp	DescriptorExtractor: added defaultNorm() to return default norm type.	2013-12-09 09:54:42 -02:00
surf.hpp	fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (http://scan.coverity.com/projects/169?tab=Overview)	2014-02-06 21:33:44 +04:00
surf.ocl.cpp	fixed warnings/errors from GCC	2014-02-04 21:50:04 +04:00