Merge pull request #6105 from mshabunin:tutorial-folder-correction

doc/tutorials/highgui/table_of_content_highgui.markdown

@@ -1,8 +1,7 @@
 High Level GUI and Media (highgui module) {#tutorial_table_of_content_highgui}
 =========================================
 
-This section contains valuable tutorials about how to read/save your image/video files and how to
-use the built-in graphical user interface of the library.
+This section contains tutorials about how to use the built-in graphical user interface of the library.
 
 -   @subpage tutorial_trackbar
 
@@ -11,33 +10,3 @@ use the built-in graphical user interface of the library.
     *Author:* Ana Huamán
 
     We will learn how to add a Trackbar to our applications
-
--   @subpage tutorial_video_input_psnr_ssim
-
-    *Compatibility:* \> OpenCV 2.0
-
-    *Author:* Bernát Gábor
-
-    You will learn how to read video streams, and how to calculate similarity values such as PSNR
-    or SSIM.
-
--   @subpage tutorial_video_write
-
-    *Compatibility:* \> OpenCV 2.0
-
-    *Author:* Bernát Gábor
-
-    Whenever you work with video feeds you may eventually want to save your image processing
-    result in a form of a new video file. Here's how to do it.
-
--   @subpage tutorial_raster_io_gdal
-
-    *Compatibility:* \> OpenCV 2.0
-
-    *Author:* Marvin Smith
-
-    Read common GIS Raster and DEM files to display and manipulate geographic data.
-
--   @subpage tutorial_kinect_openni
-
--   @subpage tutorial_intelperc

doc/tutorials/imgcodecs/raster-gdal/raster_io_gdal.markdown

@@ -28,7 +28,7 @@ of the bay rise 10, 50, and 100 meters.
 Code
 ----
 
-@include cpp/tutorial_code/HighGUI/GDAL_IO/gdal-image.cpp
+@include cpp/tutorial_code/imgcodecs/GDAL_IO/gdal-image.cpp
 
 How to Read Raster Data using GDAL
 ----------------------------------

doc/tutorials/imgcodecs/table_of_content_highgui.markdown

@@ -0,0 +1,12 @@
+Image Input and Output (imgcodecs module) {#tutorial_table_of_content_imgcodecs}
+=========================================
+
+This section contains tutorials about how to read/save your image files.
+
+-   @subpage tutorial_raster_io_gdal
+
+    *Compatibility:* \> OpenCV 2.0
+
+    *Author:* Marvin Smith
+
+    Read common GIS Raster and DEM files to display and manipulate geographic data.

doc/tutorials/tutorials.markdown

@@ -25,10 +25,17 @@ As always, we would be happy to hear your comments and receive your contribution
 
 -   @subpage tutorial_table_of_content_highgui
 
-    This section
-    contains valuable tutorials about how to read/save your image/video files and how to use the
+    This section contains valuable tutorials about how to use the
     built-in graphical user interface of the library.
 
+-   @subpage tutorial_table_of_content_imgcodecs
+
+    These tutorials show how to read and write images using imgcodecs module.
+
+-   @subpage tutorial_table_of_content_videoio
+
+    These tutorials show how to read and write videos using videio module.
+
 -   @subpage tutorial_table_of_content_calib3d
 
     Although we got

doc/tutorials/videoio/table_of_content_videoio.markdown

@@ -0,0 +1,23 @@
+Video Input and Output (videoio module) {#tutorial_table_of_content_videoio}
+=========================================
+
+This section contains tutorials about how to read/save your video files.
+
+-   @subpage tutorial_video_input_psnr_ssim
+
+    *Compatibility:* \> OpenCV 2.0
+
+    *Author:* Bernát Gábor
+
+    You will learn how to read video streams, and how to calculate similarity values such as PSNR
+    or SSIM.
+
+-   @subpage tutorial_video_write
+
+    *Compatibility:* \> OpenCV 2.0
+
+    *Author:* Bernát Gábor
+
+-   @subpage tutorial_kinect_openni
+
+-   @subpage tutorial_intelperc

doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown

@@ -20,12 +20,12 @@ As a test case where to show off these using OpenCV I've created a small program
 video files and performs a similarity check between them. This is something you could use to check
 just how well a new video compressing algorithms works. Let there be a reference (original) video
 like [this small Megamind clip
-](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind.avi) and [a compressed
-version of it ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind_bugy.avi).
+](https://github.com/Itseez/opencv/tree/master/samples/data/Megamind.avi) and [a compressed
+version of it ](https://github.com/Itseez/opencv/tree/master/samples/data/Megamind_bugy.avi).
 You may also find the source code and these video file in the
-`samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/` folder of the OpenCV source library.
+`samples/data` folder of the OpenCV source library.
 
-@include cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp
+@include cpp/tutorial_code/videoio/video-input-psnr-ssim/video-input-psnr-ssim.cpp
 
 How to read a video stream (online-camera or offline-file)?
 -----------------------------------------------------------

doc/tutorials/videoio/video-write/video_write.markdown

@@ -30,10 +30,10 @@ The source code
 ---------------
 
 You may also find the source code and these video file in the
-`samples/cpp/tutorial_code/highgui/video-write/` folder of the OpenCV source library or [download it
-from here ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp).
+`samples/cpp/tutorial_code/videoio/video-write/` folder of the OpenCV source library or [download it
+from here ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/videoio/video-write/video-write.cpp).
 
-@include cpp/tutorial_code/HighGUI/video-write/video-write.cpp
+@include cpp/tutorial_code/videoio/video-write/video-write.cpp
 
 The structure of a video
 ------------------------