projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9fabc34) | patch
Merge pull request #14393 from mehlukas:3.4-meanshift
authormehlukas <lukas.mehl@gmail.com>
Wed, 15 May 2019 10:34:20 +0000 (12:34 +0200)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 15 May 2019 10:34:20 +0000 (13:34 +0300)
commit47c45e5bd35fc58a879d6d961f0957b731fd151c
tree40dc577fe5bc244f35d586e99b41e8d3b3f5d1dctree | snapshot
parent9fabc3406fa6b177016c8a8e755a8e3bb305d10bcommit | diff
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
13 files changed:
doc/py_tutorials/py_video/py_meanshift/py_meanshift.markdown diff | blob | history
doc/py_tutorials/py_video/py_table_of_contents_video.markdown diff | blob | history
doc/tutorials/video/meanshift/images/camshift_face.gif [moved from doc/py_tutorials/py_video/py_meanshift/images/camshift_face.gif with 100% similarity] blob | history
doc/tutorials/video/meanshift/images/camshift_result.jpg [moved from doc/py_tutorials/py_video/py_meanshift/images/camshift_result.jpg with 100% similarity] blob | history
doc/tutorials/video/meanshift/images/meanshift_basics.jpg [moved from doc/py_tutorials/py_video/py_meanshift/images/meanshift_basics.jpg with 100% similarity] blob | history
doc/tutorials/video/meanshift/images/meanshift_face.gif [moved from doc/py_tutorials/py_video/py_meanshift/images/meanshift_face.gif with 100% similarity] blob | history
doc/tutorials/video/meanshift/images/meanshift_result.jpg [moved from doc/py_tutorials/py_video/py_meanshift/images/meanshift_result.jpg with 100% similarity] blob | history
doc/tutorials/video/meanshift/meanshift.markdown [new file with mode: 0644] blob
doc/tutorials/video/table_of_content_video.markdown diff | blob | history
samples/cpp/tutorial_code/video/meanshift/camshift.cpp [new file with mode: 0644] blob
samples/cpp/tutorial_code/video/meanshift/meanshift.cpp [new file with mode: 0644] blob
samples/python/tutorial_code/video/meanshift/camshift.py [new file with mode: 0644] blob
samples/python/tutorial_code/video/meanshift/meanshift.py [new file with mode: 0644] blob
Domain: Multimedia / Media Vision;