From: Alexander Alekhin Date: Mon, 2 Jul 2018 11:58:01 +0000 (+0300) Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4 X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~608 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3165baa1f152878b49c984384aa61c430a686768;p=platform%2Fupstream%2Fopencv.git Merge remote-tracking branch 'upstream/3.4' into merge-3.4 --- 3165baa1f152878b49c984384aa61c430a686768 diff --cc doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown index a46f578,ca1ec47..e04ed4e --- a/doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown +++ b/doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown @@@ -16,9 -16,23 +16,23 @@@ Theor Code ---- + @add_toggle_cpp This tutorial code's is shown lines below. You can also download it from - [here](https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp). -[here](https://github.com/opencv/opencv/tree/3.4/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp). ++[here](https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp). @include samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp + @end_toggle + + @add_toggle_java + This tutorial code's is shown lines below. You can also download it from -[here](https://github.com/opencv/opencv/tree/3.4/samples/java/tutorial_code/ImgTrans/distance_transformation/ImageSegmentationDemo.java) ++[here](https://github.com/opencv/opencv/tree/master/samples/java/tutorial_code/ImgTrans/distance_transformation/ImageSegmentationDemo.java) + @include samples/java/tutorial_code/ImgTrans/distance_transformation/ImageSegmentationDemo.java + @end_toggle + + @add_toggle_python + This tutorial code's is shown lines below. You can also download it from -[here](https://github.com/opencv/opencv/tree/3.4/samples/python/tutorial_code/ImgTrans/distance_transformation/imageSegmentation.py) ++[here](https://github.com/opencv/opencv/tree/master/samples/python/tutorial_code/ImgTrans/distance_transformation/imageSegmentation.py) + @include samples/python/tutorial_code/ImgTrans/distance_transformation/imageSegmentation.py + @end_toggle Explanation / Result --------------------