6 Commits

Author	SHA1	Message	Date
Alexander Alekhin	fb61f88b9c	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-01-12 09:35:39 +00:00
Gourav Roy	38e6d668b1	Merge pull request #16276 from themechanicalcoder:video-tutorial ... * Added java code for meanshift and optical_flow * added java code for module video * added appropriate spaces in codes * converted absolute path to command line arguments * added spaces at appropriate places	2020-01-12 11:34:59 +03:00
Alexander Alekhin	bea2c75452	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-09-05 14:29:22 +03:00
Maksim Shabunin	f3aab47f94	Assorted documentation fixes ... * removed private flann documentation * common tutorial images moved to doc/images * grouping issues	2019-08-31 01:50:11 +03:00
Alexander Alekhin	e21262deba	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-05-16 04:40:39 +00:00
mehlukas	47c45e5bd3	Merge pull request #14393 from mehlukas:3.4-meanshift ... Extend meanshift tutorial (#14393) * copy original tutorial and python code * add cpp code, fix python code * add camshift cpp code, fix bug in meanshift code * add description to ToC page * fix shadowing previous local declaration * fix grammar: with -> within * docs: remove content of old py_meanshift tutorial, add link * docs: replace meanshift tutorial subpage in Python tutorials * switch to ref to fix wrong breadcrumb navigation * switch to cmdline for path as in #14314 * Apply suggestions from code review * order programming languages alphabetically	2019-05-15 13:34:20 +03:00