Tutorials: moved imgcodecs and videoio tutorials to separate pages

diff --git a/doc/tutorials/highgui/table_of_content_highgui.markdown b/doc/tutorials/highgui/table_of_content_highgui.markdown
index 8f8b28f..a8f1d4e 100644 (file)
--- a/doc/tutorials/highgui/table_of_content_highgui.markdown
+++ b/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,15 +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_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

diff --git a/doc/tutorials/highgui/images/gdal-io.jpg b/doc/tutorials/imgcodecs/images/gdal-io.jpg
similarity index 100%
rename from doc/tutorials/highgui/images/gdal-io.jpg
rename to doc/tutorials/imgcodecs/images/gdal-io.jpg

diff --git a/doc/tutorials/highgui/raster-gdal/images/gdal_flood-zone.jpg b/doc/tutorials/imgcodecs/raster-gdal/images/gdal_flood-zone.jpg
similarity index 100%
rename from doc/tutorials/highgui/raster-gdal/images/gdal_flood-zone.jpg
rename to doc/tutorials/imgcodecs/raster-gdal/images/gdal_flood-zone.jpg

diff --git a/doc/tutorials/highgui/raster-gdal/images/gdal_heat-map.jpg b/doc/tutorials/imgcodecs/raster-gdal/images/gdal_heat-map.jpg
similarity index 100%
rename from doc/tutorials/highgui/raster-gdal/images/gdal_heat-map.jpg
rename to doc/tutorials/imgcodecs/raster-gdal/images/gdal_heat-map.jpg

diff --git a/doc/tutorials/highgui/raster-gdal/images/gdal_output.jpg b/doc/tutorials/imgcodecs/raster-gdal/images/gdal_output.jpg
similarity index 100%
rename from doc/tutorials/highgui/raster-gdal/images/gdal_output.jpg
rename to doc/tutorials/imgcodecs/raster-gdal/images/gdal_output.jpg

diff --git a/doc/tutorials/highgui/raster-gdal/raster_io_gdal.markdown b/doc/tutorials/imgcodecs/raster-gdal/raster_io_gdal.markdown
similarity index 98%
rename from doc/tutorials/highgui/raster-gdal/raster_io_gdal.markdown
rename to doc/tutorials/imgcodecs/raster-gdal/raster_io_gdal.markdown
index 95137be..a511d80 100644 (file)
--- a/doc/tutorials/highgui/raster-gdal/raster_io_gdal.markdown
+++ b/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
 ----------------------------------

diff --git a/doc/tutorials/imgcodecs/table_of_content_highgui.markdown b/doc/tutorials/imgcodecs/table_of_content_highgui.markdown
new file mode 100644 (file)
index 0000000..e78e827
--- /dev/null
+++ b/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.

diff --git a/doc/tutorials/tutorials.markdown b/doc/tutorials/tutorials.markdown
index 035c69a..9319217 100644 (file)
--- a/doc/tutorials/tutorials.markdown
+++ b/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
@@ -71,10 +78,6 @@ As always, we would be happy to hear your comments and receive your contribution
 
     Run OpenCV and your vision apps on an iDevice
 
--   @subpage tutorial_table_of_content_videoio
-
-    These tutorials show how to read and write videos using videio module.
-
 -   @subpage tutorial_table_of_content_viz
 
     These tutorials show how to use Viz module effectively.

diff --git a/doc/tutorials/highgui/intelperc.markdown b/doc/tutorials/videoio/intelperc.markdown
similarity index 100%
rename from doc/tutorials/highgui/intelperc.markdown
rename to doc/tutorials/videoio/intelperc.markdown

diff --git a/doc/tutorials/highgui/kinect_openni.markdown b/doc/tutorials/videoio/kinect_openni.markdown
similarity index 100%
rename from doc/tutorials/highgui/kinect_openni.markdown
rename to doc/tutorials/videoio/kinect_openni.markdown

diff --git a/doc/tutorials/videoio/table_of_content_videoio.markdown b/doc/tutorials/videoio/table_of_content_videoio.markdown
index b1b669d..4f62765 100644 (file)
--- a/doc/tutorials/videoio/table_of_content_videoio.markdown
+++ b/doc/tutorials/videoio/table_of_content_videoio.markdown
@@ -16,4 +16,8 @@ This section contains tutorials about how to read/save your video files.
 
     *Compatibility:* \> OpenCV 2.0
 
-    *Author:* Bernát Gábor
\ No newline at end of file
+    *Author:* Bernát Gábor
+
+-   @subpage tutorial_kinect_openni
+
+-   @subpage tutorial_intelperc

diff --git a/samples/cpp/tutorial_code/HighGUI/GDAL_IO/gdal-image.cpp b/samples/cpp/tutorial_code/imgcodecs/GDAL_IO/gdal-image.cpp
similarity index 100%
rename from samples/cpp/tutorial_code/HighGUI/GDAL_IO/gdal-image.cpp
rename to samples/cpp/tutorial_code/imgcodecs/GDAL_IO/gdal-image.cpp