diff --git a/doc/tools/scan_tutorials.py b/doc/tools/scan_tutorials.py new file mode 100644 index 0000000000000000000000000000000000000000..0b924a462610ddff08c5e280129294d7aec0eb7b --- /dev/null +++ b/doc/tools/scan_tutorials.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python + +from pathlib import Path +import re + +# Tasks +# 1. Find all tutorials +# 2. Generate tree (@subpage) +# 3. Check prev/next nodes + +class Tutorial(object): + def __init__(self, path): + self.path = path + self.title = None # doxygen title + self.children = [] # ordered titles + self.prev = None + self.next = None + with open(path, "rt") as f: + self.parse(f) + + def parse(self, f): + rx_title = re.compile(r"\{#(\w+)\}") + rx_subpage = re.compile(r"@subpage\s+(\w+)") + rx_prev = re.compile(r"@prev_tutorial\{(\w+)\}") + rx_next = re.compile(r"@next_tutorial\{(\w+)\}") + for line in f: + if self.title is None: + m = rx_title.search(line) + if m: + self.title = m.group(1) + continue + if self.prev is None: + m = rx_prev.search(line) + if m: + self.prev = m.group(1) + continue + if self.next is None: + m = rx_next.search(line) + if m: + self.next = m.group(1) + continue + m = rx_subpage.search(line) + if m: + self.children.append(m.group(1)) + continue + + def verify_prev_next(self, storage): + res = True + + if self.title is None: + print("[W] No title") + res = False + + prev = None + for one in self.children: + c = storage[one] + if c.prev is not None and c.prev != prev: + print("[W] Wrong prev_tutorial: expected {} / actual {}".format(c.prev, prev)) + res = False + prev = c.title + + next = None + for one in reversed(self.children): + c = storage[one] + if c.next is not None and c.next != next: + print("[W] Wrong next_tutorial: expected {} / actual {}".format(c.next, next)) + res = False + next = c.title + + if len(self.children) == 0 and self.prev is None and self.next is None: + print("[W] No prev and next tutorials") + res = False + + return res + +if __name__ == "__main__": + + p = Path('tutorials') + print("Looking for tutorials in: '{}'".format(p)) + + all_tutorials = dict() + for f in p.glob('**/*'): + if f.suffix.lower() in ('.markdown', '.md'): + t = Tutorial(f) + all_tutorials[t.title] = t + + res = 0 + print("Found: {}".format(len(all_tutorials))) + print("------") + for title, t in all_tutorials.items(): + if not t.verify_prev_next(all_tutorials): + print("[E] Verification failed: {}".format(t.path)) + print("------") + res = 1 + + exit(res) diff --git a/doc/tutorials/app/_old/table_of_content_highgui.markdown b/doc/tutorials/app/_old/table_of_content_highgui.markdown new file mode 100644 index 0000000000000000000000000000000000000000..3a1705ecd50481720de3fc3086a1701cd0fefbb6 --- /dev/null +++ b/doc/tutorials/app/_old/table_of_content_highgui.markdown @@ -0,0 +1,4 @@ +High Level GUI and Media (highgui module) {#tutorial_table_of_content_highgui} +========================================= + +Content has been moved to this page: @ref tutorial_table_of_content_app diff --git a/doc/tutorials/app/_old/table_of_content_imgcodecs.markdown b/doc/tutorials/app/_old/table_of_content_imgcodecs.markdown new file mode 100644 index 0000000000000000000000000000000000000000..a49bbe5cce7d91dc9883043249448dafe1f842b7 --- /dev/null +++ b/doc/tutorials/app/_old/table_of_content_imgcodecs.markdown @@ -0,0 +1,4 @@ +Image Input and Output (imgcodecs module) {#tutorial_table_of_content_imgcodecs} +========================================= + +Content has been moved to this page: @ref tutorial_table_of_content_app diff --git a/doc/tutorials/app/_old/table_of_content_videoio.markdown b/doc/tutorials/app/_old/table_of_content_videoio.markdown new file mode 100644 index 0000000000000000000000000000000000000000..f2b3ccf81c0e83a047fdc7bca22891fe424b9fa0 --- /dev/null +++ b/doc/tutorials/app/_old/table_of_content_videoio.markdown @@ -0,0 +1,4 @@ +Video Input and Output (videoio module) {#tutorial_table_of_content_videoio} +========================================= + +Content has been moved to this page: @ref tutorial_table_of_content_app diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_0.jpg b/doc/tutorials/app/images/Adding_Trackbars_Tutorial_Result_0.jpg similarity index 100% rename from doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_0.jpg rename to doc/tutorials/app/images/Adding_Trackbars_Tutorial_Result_0.jpg diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1.jpg b/doc/tutorials/app/images/Adding_Trackbars_Tutorial_Result_1.jpg similarity index 100% rename from doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1.jpg rename to doc/tutorials/app/images/Adding_Trackbars_Tutorial_Result_1.jpg diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.png b/doc/tutorials/app/images/Adding_Trackbars_Tutorial_Trackbar.png similarity index 100% rename from doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.png rename to doc/tutorials/app/images/Adding_Trackbars_Tutorial_Trackbar.png diff --git a/doc/tutorials/videoio/orbbec-astra/images/astra_color.jpg b/doc/tutorials/app/images/astra_color.jpg similarity index 100% rename from doc/tutorials/videoio/orbbec-astra/images/astra_color.jpg rename to doc/tutorials/app/images/astra_color.jpg diff --git a/doc/tutorials/videoio/orbbec-astra/images/astra_depth.png b/doc/tutorials/app/images/astra_depth.png similarity index 100% rename from doc/tutorials/videoio/orbbec-astra/images/astra_depth.png rename to doc/tutorials/app/images/astra_depth.png diff --git a/doc/tutorials/imgcodecs/raster-gdal/images/gdal_flood-zone.jpg b/doc/tutorials/app/images/gdal_flood-zone.jpg similarity index 100% rename from doc/tutorials/imgcodecs/raster-gdal/images/gdal_flood-zone.jpg rename to doc/tutorials/app/images/gdal_flood-zone.jpg diff --git a/doc/tutorials/imgcodecs/raster-gdal/images/gdal_heat-map.jpg b/doc/tutorials/app/images/gdal_heat-map.jpg similarity index 100% rename from doc/tutorials/imgcodecs/raster-gdal/images/gdal_heat-map.jpg rename to doc/tutorials/app/images/gdal_heat-map.jpg diff --git a/doc/tutorials/imgcodecs/raster-gdal/images/gdal_output.jpg b/doc/tutorials/app/images/gdal_output.jpg similarity index 100% rename from doc/tutorials/imgcodecs/raster-gdal/images/gdal_output.jpg rename to doc/tutorials/app/images/gdal_output.jpg diff --git a/doc/tutorials/videoio/video-input-psnr-ssim/images/outputVideoInput.png b/doc/tutorials/app/images/outputVideoInput.png similarity index 100% rename from doc/tutorials/videoio/video-input-psnr-ssim/images/outputVideoInput.png rename to doc/tutorials/app/images/outputVideoInput.png diff --git a/doc/tutorials/videoio/video-write/images/resultOutputWideoWrite.png b/doc/tutorials/app/images/resultOutputWideoWrite.png similarity index 100% rename from doc/tutorials/videoio/video-write/images/resultOutputWideoWrite.png rename to doc/tutorials/app/images/resultOutputWideoWrite.png diff --git a/doc/tutorials/videoio/video-write/images/videoCompressSelect.png b/doc/tutorials/app/images/videoCompressSelect.png similarity index 100% rename from doc/tutorials/videoio/video-write/images/videoCompressSelect.png rename to doc/tutorials/app/images/videoCompressSelect.png diff --git a/doc/tutorials/videoio/video-write/images/videoFileStructure.png b/doc/tutorials/app/images/videoFileStructure.png similarity index 100% rename from doc/tutorials/videoio/video-write/images/videoFileStructure.png rename to doc/tutorials/app/images/videoFileStructure.png diff --git a/doc/tutorials/videoio/intelperc.markdown b/doc/tutorials/app/intelperc.markdown similarity index 100% rename from doc/tutorials/videoio/intelperc.markdown rename to doc/tutorials/app/intelperc.markdown diff --git a/doc/tutorials/videoio/kinect_openni.markdown b/doc/tutorials/app/kinect_openni.markdown similarity index 100% rename from doc/tutorials/videoio/kinect_openni.markdown rename to doc/tutorials/app/kinect_openni.markdown diff --git a/doc/tutorials/videoio/orbbec-astra/orbbec_astra.markdown b/doc/tutorials/app/orbbec_astra.markdown similarity index 100% rename from doc/tutorials/videoio/orbbec-astra/orbbec_astra.markdown rename to doc/tutorials/app/orbbec_astra.markdown diff --git a/doc/tutorials/imgcodecs/raster-gdal/raster_io_gdal.markdown b/doc/tutorials/app/raster_io_gdal.markdown similarity index 96% rename from doc/tutorials/imgcodecs/raster-gdal/raster_io_gdal.markdown rename to doc/tutorials/app/raster_io_gdal.markdown index 432caa69e083f0f9d34daad934b095d347488607..7cdc2a2bbd52e683c4aa7618ce1a197ce862b63e 100644 --- a/doc/tutorials/imgcodecs/raster-gdal/raster_io_gdal.markdown +++ b/doc/tutorials/app/raster_io_gdal.markdown @@ -1,6 +1,14 @@ Reading Geospatial Raster files with GDAL {#tutorial_raster_io_gdal} ========================================= +@prev_tutorial{tutorial_trackbar} +@next_tutorial{tutorial_video_input_psnr_ssim} + +| | | +| -: | :- | +| Original author | Marvin Smith | +| Compatibility | OpenCV >= 3.0 | + Geospatial raster data is a heavily used product in Geographic Information Systems and Photogrammetry. Raster data typically can represent imagery and Digital Elevation Models (DEM). The standard library for loading GIS imagery is the Geographic Data Abstraction Library [(GDAL)](http://www.gdal.org). In this diff --git a/doc/tutorials/app/table_of_content_app.markdown b/doc/tutorials/app/table_of_content_app.markdown new file mode 100644 index 0000000000000000000000000000000000000000..8e05dfaf0774af884dea88e5672d9de69bca5869 --- /dev/null +++ b/doc/tutorials/app/table_of_content_app.markdown @@ -0,0 +1,10 @@ +Application utils (highgui, imgcodecs, videoio modules) {#tutorial_table_of_content_app} +======================================================= + +- @subpage tutorial_trackbar +- @subpage tutorial_raster_io_gdal +- @subpage tutorial_video_input_psnr_ssim +- @subpage tutorial_video_write +- @subpage tutorial_kinect_openni +- @subpage tutorial_orbbec_astra +- @subpage tutorial_intelperc diff --git a/doc/tutorials/highgui/trackbar/trackbar.markdown b/doc/tutorials/app/trackbar.markdown similarity index 97% rename from doc/tutorials/highgui/trackbar/trackbar.markdown rename to doc/tutorials/app/trackbar.markdown index d6700d63871d6312e2b3982935b4ddccbb86a8d8..9f2741e85b271be605ae9bd12286f8cea2435c6a 100644 --- a/doc/tutorials/highgui/trackbar/trackbar.markdown +++ b/doc/tutorials/app/trackbar.markdown @@ -1,6 +1,14 @@ Adding a Trackbar to our applications! {#tutorial_trackbar} ====================================== +@next_tutorial{tutorial_raster_io_gdal} + +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + + - In the previous tutorials (about @ref tutorial_adding_images and the @ref tutorial_basic_linear_transform) you might have noted that we needed to give some **input** to our programs, such as \f$\alpha\f$ and \f$beta\f$. We accomplished that by entering this data using the Terminal. diff --git a/doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown b/doc/tutorials/app/video_input_psnr_ssim.markdown similarity index 98% rename from doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown rename to doc/tutorials/app/video_input_psnr_ssim.markdown index 76cfa3751d6513504fe904a94d2b98f27da80ac9..b1c1344836072844beef87e60d207ae3ddf1980d 100644 --- a/doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown +++ b/doc/tutorials/app/video_input_psnr_ssim.markdown @@ -1,8 +1,14 @@ Video Input with OpenCV and similarity measurement {#tutorial_video_input_psnr_ssim} ================================================== +@prev_tutorial{tutorial_raster_io_gdal} @next_tutorial{tutorial_video_write} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/videoio/video-write/video_write.markdown b/doc/tutorials/app/video_write.markdown similarity index 98% rename from doc/tutorials/videoio/video-write/video_write.markdown rename to doc/tutorials/app/video_write.markdown index ec071d094209fa0175177511f0011553597c1747..e52bc85050886c2d59eda8d601de8707bd6b8da2 100644 --- a/doc/tutorials/videoio/video-write/video_write.markdown +++ b/doc/tutorials/app/video_write.markdown @@ -4,6 +4,11 @@ Creating a video with OpenCV {#tutorial_video_write} @prev_tutorial{tutorial_video_input_psnr_ssim} @next_tutorial{tutorial_kinect_openni} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/calib3d/camera_calibration/camera_calibration.markdown b/doc/tutorials/calib3d/camera_calibration/camera_calibration.markdown index 90298124c76000e65534d629bd740803309c44e3..fd71bfc0e58a7691d29cb7c7089730ac2bf87c6b 100644 --- a/doc/tutorials/calib3d/camera_calibration/camera_calibration.markdown +++ b/doc/tutorials/calib3d/camera_calibration/camera_calibration.markdown @@ -4,6 +4,11 @@ Camera calibration With OpenCV {#tutorial_camera_calibration} @prev_tutorial{tutorial_camera_calibration_square_chess} @next_tutorial{tutorial_real_time_pose} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 4.0 | + Cameras have been around for a long-long time. However, with the introduction of the cheap *pinhole* cameras in the late 20th century, they became a common occurrence in our everyday life. diff --git a/doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown b/doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown index d6df8a8b5ec31cd0b78fd3920ef0426421e82d38..0ddd8579ea9a86a947c84271c33c98fa005a4554 100644 --- a/doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown +++ b/doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown @@ -3,6 +3,11 @@ Create calibration pattern {#tutorial_camera_calibration_pattern} @next_tutorial{tutorial_camera_calibration_square_chess} +| | | +| -: | :- | +| Original author | Laurent Berger | +| Compatibility | OpenCV >= 3.0 | + The goal of this tutorial is to learn how to create calibration pattern. diff --git a/doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.markdown b/doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.markdown index 51b0a5eac79e761438f5e0637ade87eb61746bd0..98d732d2c5d3af3c8bff5ab9ee9eeb2190d5763e 100644 --- a/doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.markdown +++ b/doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.markdown @@ -4,6 +4,11 @@ Camera calibration with square chessboard {#tutorial_camera_calibration_square_c @prev_tutorial{tutorial_camera_calibration_pattern} @next_tutorial{tutorial_camera_calibration} +| | | +| -: | :- | +| Original author | Victor Eruhimov | +| Compatibility | OpenCV >= 4.0 | + The goal of this tutorial is to learn how to calibrate a camera given a set of chessboard images. diff --git a/doc/tutorials/calib3d/images/camera_calibration.png b/doc/tutorials/calib3d/images/camera_calibration.png deleted file mode 100644 index b010459c9d6b6f4b89fab5d44a27bb398a3fac41..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/calib3d/images/camera_calibration.png and /dev/null differ diff --git a/doc/tutorials/calib3d/images/camera_calibration_square_chess.jpg b/doc/tutorials/calib3d/images/camera_calibration_square_chess.jpg deleted file mode 100644 index 1fcab0f83c266783b6eb4b13b47ba144ca3c4eb8..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/calib3d/images/camera_calibration_square_chess.jpg and /dev/null differ diff --git a/doc/tutorials/calib3d/images/real_time_pose_estimation.jpg b/doc/tutorials/calib3d/images/real_time_pose_estimation.jpg deleted file mode 100644 index dcd24cc7915846952e1fcc7d7fceaee1cbc490a1..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/calib3d/images/real_time_pose_estimation.jpg and /dev/null differ diff --git a/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown b/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown index 36e19e0754b4cf33f5b7b2041fb251ae059ff735..5f2ee510c17e963dfb65baa9e87658dfb8d477ed 100644 --- a/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown +++ b/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown @@ -3,6 +3,11 @@ Interactive camera calibration application {#tutorial_interactive_calibration} @prev_tutorial{tutorial_real_time_pose} +| | | +| -: | :- | +| Original author | Vladislav Sovrasov | +| Compatibility | OpenCV >= 3.1 | + According to classical calibration technique user must collect all data first and when run @ref cv::calibrateCamera function to obtain camera parameters. If average re-projection error is huge or if estimated parameters seems to be wrong, process of diff --git a/doc/tutorials/calib3d/real_time_pose/real_time_pose.markdown b/doc/tutorials/calib3d/real_time_pose/real_time_pose.markdown index 98a44b232b9e3aeead9b551590500987d1888083..4a9cf553b334a93fe31bc4b86af05781fa776324 100644 --- a/doc/tutorials/calib3d/real_time_pose/real_time_pose.markdown +++ b/doc/tutorials/calib3d/real_time_pose/real_time_pose.markdown @@ -4,6 +4,11 @@ Real Time pose estimation of a textured object {#tutorial_real_time_pose} @prev_tutorial{tutorial_camera_calibration} @next_tutorial{tutorial_interactive_calibration} +| | | +| -: | :- | +| Original author | Edgar Riba | +| Compatibility | OpenCV >= 3.0 | + Nowadays, augmented reality is one of the top research topic in computer vision and robotics fields. The most elemental problem in augmented reality is the estimation of the camera pose respect of an diff --git a/doc/tutorials/calib3d/table_of_content_calib3d.markdown b/doc/tutorials/calib3d/table_of_content_calib3d.markdown index 3861d448b74c0a32da593b2c058671d25145cb2e..5fc6e591e926e6297c5a86b82b295dd6f1da810e 100644 --- a/doc/tutorials/calib3d/table_of_content_calib3d.markdown +++ b/doc/tutorials/calib3d/table_of_content_calib3d.markdown @@ -1,58 +1,8 @@ Camera calibration and 3D reconstruction (calib3d module) {#tutorial_table_of_content_calib3d} ========================================================== -Although we get most of our images in a 2D format they do come from a 3D world. Here you will learn how to find out 3D world information from 2D images. - - @subpage tutorial_camera_calibration_pattern - - *Languages:* Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Laurent Berger - - You will learn how to create some calibration pattern. - - @subpage tutorial_camera_calibration_square_chess - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Victor Eruhimov - - You will use some chessboard images to calibrate your camera. - - @subpage tutorial_camera_calibration - - *Languages:* C++ - - *Compatibility:* \> OpenCV 4.0 - - *Author:* Bernát Gábor - - Camera calibration by using either the chessboard, circle or the asymmetrical circle - pattern. Get the images either from a camera attached, a video file or from an image - collection. - - @subpage tutorial_real_time_pose - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Edgar Riba - - Real time pose estimation of a textured object using ORB features, FlannBased matcher, PnP - approach plus Ransac and Linear Kalman Filter to reject possible bad poses. - - @subpage tutorial_interactive_calibration - - *Compatibility:* \> OpenCV 3.1 - - *Author:* Vladislav Sovrasov - - Camera calibration by using either the chessboard, chAruco, asymmetrical circle or dual asymmetrical circle - pattern. Calibration process is continuous, so you can see results after each new pattern shot. - As an output you get average reprojection error, intrinsic camera parameters, distortion coefficients and - confidence intervals for all of evaluated variables. diff --git a/doc/tutorials/core/adding_images/adding_images.markdown b/doc/tutorials/core/adding_images/adding_images.markdown index c8776325a37db59be21b77a27f531d150dfbadbd..4ccad0ca050ec42caa5ebc784871de1d2d55e5bb 100644 --- a/doc/tutorials/core/adding_images/adding_images.markdown +++ b/doc/tutorials/core/adding_images/adding_images.markdown @@ -4,6 +4,12 @@ Adding (blending) two images using OpenCV {#tutorial_adding_images} @prev_tutorial{tutorial_mat_operations} @next_tutorial{tutorial_basic_linear_transform} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + +We will learn how to blend two images! Goal ---- diff --git a/doc/tutorials/core/basic_linear_transform/basic_linear_transform.markdown b/doc/tutorials/core/basic_linear_transform/basic_linear_transform.markdown index 1eac760a4cc06ea6ed3661787eaf1f65bc3b20a2..d9c23bfe65ebcbe93bed761d7148eb35fdc1dc90 100644 --- a/doc/tutorials/core/basic_linear_transform/basic_linear_transform.markdown +++ b/doc/tutorials/core/basic_linear_transform/basic_linear_transform.markdown @@ -4,6 +4,11 @@ Changing the contrast and brightness of an image! {#tutorial_basic_linear_transf @prev_tutorial{tutorial_adding_images} @next_tutorial{tutorial_discrete_fourier_transform} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.markdown b/doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.markdown index 53ef27258d13a4e411638bbf5cce5409bb920bd6..277a3a2dbcf135f90eba7b7b96d68e029968778f 100644 --- a/doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.markdown +++ b/doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.markdown @@ -4,6 +4,11 @@ Discrete Fourier Transform {#tutorial_discrete_fourier_transform} @prev_tutorial{tutorial_basic_linear_transform} @next_tutorial{tutorial_file_input_output_with_xml_yml} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.markdown b/doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.markdown index b87ec79ff7902c007a8fe0951ba9e7e710d23832..0abaa4b70fdf841451a0f973ffe03d94a1ca7c2c 100644 --- a/doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.markdown +++ b/doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.markdown @@ -4,6 +4,11 @@ File Input and Output using XML and YAML files {#tutorial_file_input_output_with @prev_tutorial{tutorial_discrete_fourier_transform} @next_tutorial{tutorial_how_to_use_OpenCV_parallel_for_} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/core/how_to_scan_images/how_to_scan_images.markdown b/doc/tutorials/core/how_to_scan_images/how_to_scan_images.markdown index c5028d6a3a3115e78db82a3db882dab77dbe6184..c80282dad1a59afcf54df5d9826714069cc72361 100644 --- a/doc/tutorials/core/how_to_scan_images/how_to_scan_images.markdown +++ b/doc/tutorials/core/how_to_scan_images/how_to_scan_images.markdown @@ -4,6 +4,11 @@ How to scan images, lookup tables and time measurement with OpenCV {#tutorial_ho @prev_tutorial{tutorial_mat_the_basic_image_container} @next_tutorial{tutorial_mat_mask_operations} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown b/doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown index 80cc6c68fe3cd01adaec8d44b8d25058b0f2e663..0ad345a1c17c46bfcc76d8be7caa3bb8a0501b04 100644 --- a/doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown +++ b/doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown @@ -3,6 +3,10 @@ How to use the OpenCV parallel_for_ to parallelize your code {#tutorial_how_to_u @prev_tutorial{tutorial_file_input_output_with_xml_yml} +| | | +| -: | :- | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/core/images/Adding_Images_Tutorial_Result_0.jpg b/doc/tutorials/core/images/Adding_Images_Tutorial_Result_0.jpg deleted file mode 100644 index 940b54c82f615ddd496b6923e600b757ce4a42b4..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/Adding_Images_Tutorial_Result_0.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg b/doc/tutorials/core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg deleted file mode 100644 index eccf37aa2077b3a7d644878e0a58d178b82a1550..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/Drawing_1_Tutorial_Result_0.jpg b/doc/tutorials/core/images/Drawing_1_Tutorial_Result_0.jpg deleted file mode 100644 index 05e8f012327efaccd96b6e9ff39820094a6b0059..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/Drawing_1_Tutorial_Result_0.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/Drawing_2_Tutorial_Result_7.jpg b/doc/tutorials/core/images/Drawing_2_Tutorial_Result_7.jpg deleted file mode 100644 index d650c184278c00d253cb52072a8572fd001e5ad0..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/Drawing_2_Tutorial_Result_7.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/Morphology_1_Tutorial_Cover.jpg b/doc/tutorials/core/images/Morphology_1_Tutorial_Cover.jpg deleted file mode 100644 index 71509ba5b8d37d73401ff48dac0adeac32bd8f62..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/Morphology_1_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/Smoothing_Tutorial_Cover.jpg b/doc/tutorials/core/images/Smoothing_Tutorial_Cover.jpg deleted file mode 100644 index c11f2ed024f923b88c7e537154777d63be8578c0..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/Smoothing_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/discrete_fourier_transform.png b/doc/tutorials/core/images/discrete_fourier_transform.png deleted file mode 100644 index 07bd1119f4fe5b135d00243c8db80b7c717a8dec..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/discrete_fourier_transform.png and /dev/null differ diff --git a/doc/tutorials/core/images/file_input_output_with_xml_yml.png b/doc/tutorials/core/images/file_input_output_with_xml_yml.png deleted file mode 100644 index 24ae4fdd2364e10245b4eba145770ba5bf1e6637..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/file_input_output_with_xml_yml.png and /dev/null differ diff --git a/doc/tutorials/core/images/howToScanImages.jpg b/doc/tutorials/core/images/howToScanImages.jpg deleted file mode 100644 index 4e0fa26d0db0e0a8e1f3e18cb6bdeab1ffdabd89..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/howToScanImages.jpg and /dev/null differ diff --git a/doc/tutorials/core/images/interopOpenCV1.png b/doc/tutorials/core/images/interopOpenCV1.png deleted file mode 100644 index 040f50a0032f1172b51d5295ff4c55bae4741bc2..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/interopOpenCV1.png and /dev/null differ diff --git a/doc/tutorials/core/images/matMaskFilter2DOp.png b/doc/tutorials/core/images/matMaskFilter2DOp.png deleted file mode 100644 index 679592160849fd1a3cacdb3a101d28f223cbd6ac..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/matMaskFilter2DOp.png and /dev/null differ diff --git a/doc/tutorials/core/images/matTheBasicImageStructure.jpg b/doc/tutorials/core/images/matTheBasicImageStructure.jpg deleted file mode 100644 index ab6704a3c9d692ff61542e0b453dca04861eb917..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/core/images/matTheBasicImageStructure.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat-mask-operations/mat_mask_operations.markdown b/doc/tutorials/core/mat-mask-operations/mat_mask_operations.markdown index fedb123ae6dde0ad39be1a6acde9198b6e05ed3f..52ba2ec95db78cd24eb494e8e33d728c4c18b214 100644 --- a/doc/tutorials/core/mat-mask-operations/mat_mask_operations.markdown +++ b/doc/tutorials/core/mat-mask-operations/mat_mask_operations.markdown @@ -4,6 +4,11 @@ Mask operations on matrices {#tutorial_mat_mask_operations} @prev_tutorial{tutorial_how_to_scan_images} @next_tutorial{tutorial_mat_operations} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Mask operations on matrices are quite simple. The idea is that we recalculate each pixel's value in an image according to a mask matrix (also known as kernel). This mask holds values that will adjust how much influence neighboring pixels (and the current pixel) have on the new pixel value. From a diff --git a/doc/tutorials/core/mat_operations.markdown b/doc/tutorials/core/mat_operations.markdown index 991d01367ba295fc22752640666991c5d0a6ba35..2577751777cce4459cc0637a56fce7c0bc624684 100644 --- a/doc/tutorials/core/mat_operations.markdown +++ b/doc/tutorials/core/mat_operations.markdown @@ -4,6 +4,10 @@ Operations with images {#tutorial_mat_operations} @prev_tutorial{tutorial_mat_mask_operations} @next_tutorial{tutorial_adding_images} +| | | +| -: | :- | +| Compatibility | OpenCV >= 3.0 | + Input/Output ------------ diff --git a/doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.markdown b/doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.markdown index 573e112d611f238da0e796c627e5c61bef14ef5e..ed7cce9e5a911ab0e02f4a671049b7157db6baf1 100644 --- a/doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.markdown +++ b/doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.markdown @@ -3,6 +3,11 @@ Mat - The Basic Image Container {#tutorial_mat_the_basic_image_container} @next_tutorial{tutorial_how_to_scan_images} +| | | +| -: | :- | +| Original author | Bernát Gábor | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/core/table_of_content_core.markdown b/doc/tutorials/core/table_of_content_core.markdown index c607d4c02c4f920b84879afd65f95f4b85e6ba80..4cd77fcdfc0f359b7c1c6d6c6a08ac27bca26dee 100644 --- a/doc/tutorials/core/table_of_content_core.markdown +++ b/doc/tutorials/core/table_of_content_core.markdown @@ -1,97 +1,12 @@ The Core Functionality (core module) {#tutorial_table_of_content_core} ===================================== -Here you will learn the about the basic building blocks of the library. A must read and know for -understanding how to manipulate the images on a pixel level. - - @subpage tutorial_mat_the_basic_image_container - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Bernát Gábor - - You will learn how to store images in the memory and how to print out their content to the - console. - - @subpage tutorial_how_to_scan_images - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Bernát Gábor - - You'll find out how to scan images (go through each of the image pixels) with OpenCV. - Bonus: time measurement with OpenCV. - - - @subpage tutorial_mat_mask_operations - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Bernát Gábor - - You'll find out how to scan images with neighbor access and use the @ref cv::filter2D - function to apply kernel filters on images. - - @subpage tutorial_mat_operations - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - Reading/writing images from file, accessing pixels, primitive operations, visualizing images. - - @subpage tutorial_adding_images - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - We will learn how to blend two images! - - @subpage tutorial_basic_linear_transform - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - We will learn how to change our image appearance! - - @subpage tutorial_discrete_fourier_transform - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Bernát Gábor - - You will see how and why use the Discrete Fourier transformation with OpenCV. - - - @subpage tutorial_file_input_output_with_xml_yml - - *Languages:* C++, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Bernát Gábor - - You will see how to use the @ref cv::FileStorage data structure of OpenCV to write and read - data to XML or YAML file format. - - @subpage tutorial_how_to_use_OpenCV_parallel_for_ - - *Languages:* C++ - - *Compatibility:* \>= OpenCV 2.4.3 - - You will see how to use the OpenCV parallel_for_ to easily parallelize your code. diff --git a/doc/tutorials/dnn/dnn_OCR/dnn_OCR.markdown b/doc/tutorials/dnn/dnn_OCR/dnn_OCR.markdown index ddf40c96a01c1cd54efbfc78564395f571dccb10..70930413e3e46e58da0d1f2ef5d9ed93f6266d57 100644 --- a/doc/tutorials/dnn/dnn_OCR/dnn_OCR.markdown +++ b/doc/tutorials/dnn/dnn_OCR/dnn_OCR.markdown @@ -3,6 +3,11 @@ @prev_tutorial{tutorial_dnn_custom_layers} @next_tutorial{tutorial_dnn_text_spotting} +| | | +| -: | :- | +| Original author | Zihao Mu | +| Compatibility | OpenCV >= 4.3 | + ## Introduction In this tutorial, we first introduce how to obtain the custom OCR model, then how to transform your own OCR models so that they can be run correctly by the opencv_dnn module. and finally we will provide some pre-trained models. diff --git a/doc/tutorials/dnn/dnn_android/dnn_android.markdown b/doc/tutorials/dnn/dnn_android/dnn_android.markdown index 7000a493a9adf0fc4917a8a73021ae03e87f113d..8d6687e423adfc0f607f92efc9c499c48334ac1a 100644 --- a/doc/tutorials/dnn/dnn_android/dnn_android.markdown +++ b/doc/tutorials/dnn/dnn_android/dnn_android.markdown @@ -3,6 +3,11 @@ @prev_tutorial{tutorial_dnn_halide_scheduling} @next_tutorial{tutorial_dnn_yolo} +| | | +| -: | :- | +| Original author | Dmitry Kurtaev | +| Compatibility | OpenCV >= 3.3 | + ## Introduction In this tutorial you'll know how to run deep learning networks on Android device using OpenCV deep learning module. diff --git a/doc/tutorials/dnn/dnn_custom_layers/dnn_custom_layers.md b/doc/tutorials/dnn/dnn_custom_layers/dnn_custom_layers.md index feed5aaf76986cf00436e51bbdc836297cf492e1..915ff4f58e47c0e2ec1a207dc42c2a33f3ef40b3 100644 --- a/doc/tutorials/dnn/dnn_custom_layers/dnn_custom_layers.md +++ b/doc/tutorials/dnn/dnn_custom_layers/dnn_custom_layers.md @@ -3,6 +3,11 @@ @prev_tutorial{tutorial_dnn_javascript} @next_tutorial{tutorial_dnn_OCR} +| | | +| -: | :- | +| Original author | Dmitry Kurtaev | +| Compatibility | OpenCV >= 3.4.1 | + ## Introduction Deep learning is a fast growing area. The new approaches to build neural networks usually introduce new types of layers. They could be modifications of existing diff --git a/doc/tutorials/dnn/dnn_googlenet/dnn_googlenet.markdown b/doc/tutorials/dnn/dnn_googlenet/dnn_googlenet.markdown index f6040dce1cd49dbc75fffc00221e8add08316496..0096a31a8715eb206eaaa03afe5ce8a89113b474 100644 --- a/doc/tutorials/dnn/dnn_googlenet/dnn_googlenet.markdown +++ b/doc/tutorials/dnn/dnn_googlenet/dnn_googlenet.markdown @@ -3,6 +3,11 @@ Load Caffe framework models {#tutorial_dnn_googlenet} @next_tutorial{tutorial_dnn_halide} +| | | +| -: | :- | +| Original author | Vitaliy Lyudvichenko | +| Compatibility | OpenCV >= 3.3 | + Introduction ------------ diff --git a/doc/tutorials/dnn/dnn_halide/dnn_halide.markdown b/doc/tutorials/dnn/dnn_halide/dnn_halide.markdown index 0500d2515087282497389f0263f6a1a1f5c96e9d..9737007bd074d029e72db3924996c7cc5084acbb 100644 --- a/doc/tutorials/dnn/dnn_halide/dnn_halide.markdown +++ b/doc/tutorials/dnn/dnn_halide/dnn_halide.markdown @@ -3,6 +3,11 @@ @prev_tutorial{tutorial_dnn_googlenet} @next_tutorial{tutorial_dnn_halide_scheduling} +| | | +| -: | :- | +| Original author | Dmitry Kurtaev | +| Compatibility | OpenCV >= 3.3 | + ## Introduction This tutorial guidelines how to run your models in OpenCV deep learning module using Halide language backend. Halide is an open-source project that let us diff --git a/doc/tutorials/dnn/dnn_halide_scheduling/dnn_halide_scheduling.markdown b/doc/tutorials/dnn/dnn_halide_scheduling/dnn_halide_scheduling.markdown index b825da792240d64986662860fd558f85fb395b49..107cedbc133733645d6f7dadcf294fe23902eac4 100644 --- a/doc/tutorials/dnn/dnn_halide_scheduling/dnn_halide_scheduling.markdown +++ b/doc/tutorials/dnn/dnn_halide_scheduling/dnn_halide_scheduling.markdown @@ -3,6 +3,11 @@ @prev_tutorial{tutorial_dnn_halide} @next_tutorial{tutorial_dnn_android} +| | | +| -: | :- | +| Original author | Dmitry Kurtaev | +| Compatibility | OpenCV >= 3.3 | + ## Introduction Halide code is the same for every device we use. But for achieving the satisfied efficiency we should schedule computations properly. In this tutorial we describe diff --git a/doc/tutorials/dnn/dnn_javascript/dnn_javascript.markdown b/doc/tutorials/dnn/dnn_javascript/dnn_javascript.markdown index 9ad632fbc81032747d40285d15f9cd6a90174024..5bcd74643d293ceaa8de70c568e4b25d4353b078 100644 --- a/doc/tutorials/dnn/dnn_javascript/dnn_javascript.markdown +++ b/doc/tutorials/dnn/dnn_javascript/dnn_javascript.markdown @@ -3,6 +3,11 @@ @prev_tutorial{tutorial_dnn_yolo} @next_tutorial{tutorial_dnn_custom_layers} +| | | +| -: | :- | +| Original author | Dmitry Kurtaev | +| Compatibility | OpenCV >= 3.3.1 | + ## Introduction This tutorial will show us how to run deep learning models using OpenCV.js right in a browser. Tutorial refers a sample of face detection and face recognition diff --git a/doc/tutorials/dnn/dnn_text_spotting/dnn_text_spotting.markdown b/doc/tutorials/dnn/dnn_text_spotting/dnn_text_spotting.markdown index 0aa66f9e61cbef3c2f604c13ec1fbb58f108835a..3cedbb913c09d62b4f088d03916b3193a7416249 100644 --- a/doc/tutorials/dnn/dnn_text_spotting/dnn_text_spotting.markdown +++ b/doc/tutorials/dnn/dnn_text_spotting/dnn_text_spotting.markdown @@ -2,6 +2,11 @@ @prev_tutorial{tutorial_dnn_OCR} +| | | +| -: | :- | +| Original author | Wenqing Zhang | +| Compatibility | OpenCV >= 4.5 | + ## Introduction In this tutorial, we will introduce the APIs for TextRecognitionModel and TextDetectionModel in detail. diff --git a/doc/tutorials/dnn/dnn_yolo/dnn_yolo.markdown b/doc/tutorials/dnn/dnn_yolo/dnn_yolo.markdown index 1552d4e654d7f6afb40429fee506f4349600b62f..0330ed82ef2609cd335f0fc4f7643b372ef5fb6d 100644 --- a/doc/tutorials/dnn/dnn_yolo/dnn_yolo.markdown +++ b/doc/tutorials/dnn/dnn_yolo/dnn_yolo.markdown @@ -4,6 +4,11 @@ YOLO DNNs {#tutorial_dnn_yolo} @prev_tutorial{tutorial_dnn_android} @next_tutorial{tutorial_dnn_javascript} +| | | +| -: | :- | +| Original author | Alessandro de Oliveira Faria | +| Compatibility | OpenCV >= 3.3.1 | + Introduction ------------ diff --git a/doc/tutorials/dnn/table_of_content_dnn.markdown b/doc/tutorials/dnn/table_of_content_dnn.markdown index 0ed97749fbb70a58f878fc6ff94f219e15144586..dd3e596827b3c810e6ffcbeaa61f5f238af1c160 100644 --- a/doc/tutorials/dnn/table_of_content_dnn.markdown +++ b/doc/tutorials/dnn/table_of_content_dnn.markdown @@ -2,91 +2,11 @@ Deep Neural Networks (dnn module) {#tutorial_table_of_content_dnn} ===================================== - @subpage tutorial_dnn_googlenet - - *Languages:* C++ - - *Compatibility:* \> OpenCV 3.3 - - *Author:* Vitaliy Lyudvichenko - - In this tutorial you will learn how to use opencv_dnn module for image classification by using GoogLeNet trained network from Caffe model zoo. - - @subpage tutorial_dnn_halide - - *Languages:* Halide - - *Compatibility:* \> OpenCV 3.3 - - *Author:* Dmitry Kurtaev - - This tutorial guidelines how to run your models in OpenCV deep learning module using Halide language backend. - - @subpage tutorial_dnn_halide_scheduling - - *Languages:* Halide - - *Compatibility:* \> OpenCV 3.3 - - *Author:* Dmitry Kurtaev - - In this tutorial we describe the ways to schedule your networks using Halide backend in OpenCV deep learning module. - - @subpage tutorial_dnn_android - - *Languages:* Java - - *Compatibility:* \> OpenCV 3.3 - - *Author:* Dmitry Kurtaev - - This tutorial will show you how to run deep learning model using OpenCV on Android device. - - @subpage tutorial_dnn_yolo - - *Languages:* C++, Python - - *Compatibility:* \> OpenCV 3.3.1 - - *Author:* Alessandro de Oliveira Faria - - In this tutorial you will learn how to use opencv_dnn module using yolo_object_detection with device capture, video file or image. - - @subpage tutorial_dnn_javascript - - *Languages:* JavaScript - - *Compatibility:* \> OpenCV 3.3.1 - - *Author:* Dmitry Kurtaev - - In this tutorial we'll run deep learning models in browser using OpenCV.js. - - @subpage tutorial_dnn_custom_layers - - *Languages:* C++, Python - - *Compatibility:* \> OpenCV 3.4.1 - - *Author:* Dmitry Kurtaev - - How to define custom layers to import networks. - - @subpage tutorial_dnn_OCR - - *Languages:* C++ - - *Compatibility:* \> OpenCV 4.3 - - *Author:* Zihao Mu - - In this tutorial you will learn how to use opencv_dnn module using custom OCR models. - - @subpage tutorial_dnn_text_spotting - - *Languages:* C++ - - *Compatibility:* \> OpenCV 4.5 - - *Author:* Wenqing Zhang - - In these tutorial, we'll introduce how to use the high-level APIs for text recognition and text detection diff --git a/doc/tutorials/features2d/akaze_matching/akaze_matching.markdown b/doc/tutorials/features2d/akaze_matching/akaze_matching.markdown index 0635dfc4f662b171be88fa61dc188942991553c1..3a7a48ffec333274c2df8533b92edd2519620fa8 100644 --- a/doc/tutorials/features2d/akaze_matching/akaze_matching.markdown +++ b/doc/tutorials/features2d/akaze_matching/akaze_matching.markdown @@ -4,6 +4,11 @@ AKAZE local features matching {#tutorial_akaze_matching} @prev_tutorial{tutorial_detection_of_planar_objects} @next_tutorial{tutorial_akaze_tracking} +| | | +| -: | :- | +| Original author | Fedor Morozov | +| Compatibility | OpenCV >= 3.0 | + Introduction ------------ diff --git a/doc/tutorials/features2d/akaze_tracking/akaze_tracking.markdown b/doc/tutorials/features2d/akaze_tracking/akaze_tracking.markdown index 58071ffd428650d76f12f5d8b8b51ad0629d70be..66d0200c88b7d7990d82ac92c7e46bda77ff1ba2 100644 --- a/doc/tutorials/features2d/akaze_tracking/akaze_tracking.markdown +++ b/doc/tutorials/features2d/akaze_tracking/akaze_tracking.markdown @@ -4,6 +4,11 @@ AKAZE and ORB planar tracking {#tutorial_akaze_tracking} @prev_tutorial{tutorial_akaze_matching} @next_tutorial{tutorial_homography} +| | | +| -: | :- | +| Original author | Fedor Morozov | +| Compatibility | OpenCV >= 3.0 | + Introduction ------------ diff --git a/doc/tutorials/features2d/detection_of_planar_objects/detection_of_planar_objects.markdown b/doc/tutorials/features2d/detection_of_planar_objects/detection_of_planar_objects.markdown index 9febdb7acde86b066f03b42f2a29db25adeca617..155c30ab55c20e535d7474232fe71aad5663b6e8 100644 --- a/doc/tutorials/features2d/detection_of_planar_objects/detection_of_planar_objects.markdown +++ b/doc/tutorials/features2d/detection_of_planar_objects/detection_of_planar_objects.markdown @@ -4,6 +4,10 @@ Detection of planar objects {#tutorial_detection_of_planar_objects} @prev_tutorial{tutorial_feature_homography} @next_tutorial{tutorial_akaze_matching} +| | | +| -: | :- | +| Original author | Victor Eruhimov | +| Compatibility | OpenCV >= 3.0 | The goal of this tutorial is to learn how to use *features2d* and *calib3d* modules for detecting known planar objects in scenes. diff --git a/doc/tutorials/features2d/feature_description/feature_description.markdown b/doc/tutorials/features2d/feature_description/feature_description.markdown index 70a30096f5cbccf57a922e625638cc88578e1364..b24d3b4afe35830b450921b6777d5cb4ad40bc0b 100644 --- a/doc/tutorials/features2d/feature_description/feature_description.markdown +++ b/doc/tutorials/features2d/feature_description/feature_description.markdown @@ -4,6 +4,11 @@ Feature Description {#tutorial_feature_description} @prev_tutorial{tutorial_feature_detection} @next_tutorial{tutorial_feature_flann_matcher} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/features2d/feature_detection/feature_detection.markdown b/doc/tutorials/features2d/feature_detection/feature_detection.markdown index a22ef9052043a40157a422c980dc5cb67844f8d1..bf61943f3e17723e2a52ab9db2a514f27aaa6c2c 100644 --- a/doc/tutorials/features2d/feature_detection/feature_detection.markdown +++ b/doc/tutorials/features2d/feature_detection/feature_detection.markdown @@ -4,6 +4,11 @@ Feature Detection {#tutorial_feature_detection} @prev_tutorial{tutorial_corner_subpixels} @next_tutorial{tutorial_feature_description} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown b/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown index 2e5f12c922e38a4b767c399d36ad214ae0fa32ed..79f14244487e1d4b1856153239b3c8c9b81e7f56 100644 --- a/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown +++ b/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown @@ -4,6 +4,11 @@ Feature Matching with FLANN {#tutorial_feature_flann_matcher} @prev_tutorial{tutorial_feature_description} @next_tutorial{tutorial_feature_homography} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/features2d/feature_homography/feature_homography.markdown b/doc/tutorials/features2d/feature_homography/feature_homography.markdown index b2d23435ebe5701dc8f5e0b16471f79d60a698ad..f6c383802b33dff453927de32079a654a698232c 100644 --- a/doc/tutorials/features2d/feature_homography/feature_homography.markdown +++ b/doc/tutorials/features2d/feature_homography/feature_homography.markdown @@ -4,6 +4,11 @@ Features2D + Homography to find a known object {#tutorial_feature_homography} @prev_tutorial{tutorial_feature_flann_matcher} @next_tutorial{tutorial_detection_of_planar_objects} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/features2d/homography/homography.markdown b/doc/tutorials/features2d/homography/homography.markdown index 960511dd3d45223e48bb10addd3651b4c390acbf..fdcfa3b0143a5ef5b3453c0e632ce5793ae72987 100644 --- a/doc/tutorials/features2d/homography/homography.markdown +++ b/doc/tutorials/features2d/homography/homography.markdown @@ -3,6 +3,10 @@ Basic concepts of the homography explained with code {#tutorial_homography} @prev_tutorial{tutorial_akaze_tracking} +| | | +| -: | :- | +| Compatibility | OpenCV >= 3.0 | + @tableofcontents Introduction {#tutorial_homography_Introduction} diff --git a/doc/tutorials/features2d/images/AKAZE_Match_Tutorial_Cover.png b/doc/tutorials/features2d/images/AKAZE_Match_Tutorial_Cover.png deleted file mode 100644 index fdf2007ba2346d2d8b19c0ed99b7bfe46427daf5..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/AKAZE_Match_Tutorial_Cover.png and /dev/null differ diff --git a/doc/tutorials/features2d/images/AKAZE_Tracking_Tutorial_Cover.png b/doc/tutorials/features2d/images/AKAZE_Tracking_Tutorial_Cover.png deleted file mode 100644 index bb3272c96bb7dc4e6e4e7290127274a410df49c8..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/AKAZE_Tracking_Tutorial_Cover.png and /dev/null differ diff --git a/doc/tutorials/features2d/images/Feature_Description_Tutorial_Cover.jpg b/doc/tutorials/features2d/images/Feature_Description_Tutorial_Cover.jpg deleted file mode 100644 index 975caa62ef86c9ffbf6ab57713bf67fd54dd36c9..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/Feature_Description_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/Feature_Detection_Tutorial_Cover.jpg b/doc/tutorials/features2d/images/Feature_Detection_Tutorial_Cover.jpg deleted file mode 100644 index cca9a2b438298d1998e5d7abf944745edce5c4c3..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/Feature_Detection_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/Feature_Flann_Matcher_Tutorial_Cover.jpg b/doc/tutorials/features2d/images/Feature_Flann_Matcher_Tutorial_Cover.jpg deleted file mode 100644 index e3f66fa0d164b4c489765c67a058eecd51f6847b..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/Feature_Flann_Matcher_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/Feature_Homography_Tutorial_Cover.jpg b/doc/tutorials/features2d/images/Feature_Homography_Tutorial_Cover.jpg deleted file mode 100644 index d509cd9eb72fd306f223f2bc18b989b32bce6776..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/Feature_Homography_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/detection_of_planar_objects.png b/doc/tutorials/features2d/images/detection_of_planar_objects.png deleted file mode 100644 index 92de70cfdc11b0ac921bce536d2e987c8d45e592..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/detection_of_planar_objects.png and /dev/null differ diff --git a/doc/tutorials/features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg b/doc/tutorials/features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg deleted file mode 100644 index 61ec8d1d89cead1812d5a206f5707ecbf53c73d8..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg b/doc/tutorials/features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg deleted file mode 100644 index 89fc7bef7cf960ce5e85225e39af98cb7bd24869..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/trackingmotion/Harris_Detector_Cover.jpg b/doc/tutorials/features2d/images/trackingmotion/Harris_Detector_Cover.jpg deleted file mode 100644 index bc4d816e327ca7d04892232da6cd8d5d784b2ee4..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/trackingmotion/Harris_Detector_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg b/doc/tutorials/features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg deleted file mode 100644 index e0ee608d9cbac95e4addfbac4c8ced26ce307d7b..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/features2d/table_of_content_features2d.markdown b/doc/tutorials/features2d/table_of_content_features2d.markdown index f42e2a571cb39b03bf0f013952a46b89ae6c1182..29c99018fc6509da75ee56f9188092e46560730a 100644 --- a/doc/tutorials/features2d/table_of_content_features2d.markdown +++ b/doc/tutorials/features2d/table_of_content_features2d.markdown @@ -1,128 +1,15 @@ 2D Features framework (feature2d module) {#tutorial_table_of_content_features2d} ========================================= -Learn about how to use the feature points detectors, descriptors and matching framework found inside -OpenCV. - - @subpage tutorial_harris_detector - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Why is it a good idea to track corners? We learn how to use the Harris method to detect - corners. - - @subpage tutorial_good_features_to_track - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we use an improved method to detect corners more accurately. - - @subpage tutorial_generic_corner_detector - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Here you will learn how to use OpenCV functions to make your personalized corner detector! - - *Languages:* C++, Java, Python - - @subpage tutorial_corner_subpixels - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Is pixel resolution enough? Here we learn a simple method to improve our corner location accuracy. - - @subpage tutorial_feature_detection - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - In this tutorial, you will use *features2d* to detect interest points. - - @subpage tutorial_feature_description - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - In this tutorial, you will use *features2d* to calculate feature vectors. - - @subpage tutorial_feature_flann_matcher - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - In this tutorial, you will use the FLANN library to make a fast matching. - - @subpage tutorial_feature_homography - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - In this tutorial, you will use *features2d* and *calib3d* to detect an object in a scene. - - @subpage tutorial_detection_of_planar_objects - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Victor Eruhimov - - You will use *features2d* and *calib3d* modules for detecting known planar objects in - scenes. - - @subpage tutorial_akaze_matching - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 3.0 - - *Author:* Fedor Morozov - - Using *AKAZE* local features to find correspondence between two images. - - @subpage tutorial_akaze_tracking - - *Languages:* C++ - - *Compatibility:* \> OpenCV 3.0 - - *Author:* Fedor Morozov - - Using *AKAZE* and *ORB* for planar object tracking. - - @subpage tutorial_homography - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 3.0 - - This tutorial will explain the basic concepts of the homography with some - demonstration codes. diff --git a/doc/tutorials/features2d/trackingmotion/corner_subpixels/corner_subpixels.markdown b/doc/tutorials/features2d/trackingmotion/corner_subpixels/corner_subpixels.markdown index a9316b732d635ae84bee69f8101ac2b9d071c1dc..9831d670dba44e123b0f885477cca4069532518e 100644 --- a/doc/tutorials/features2d/trackingmotion/corner_subpixels/corner_subpixels.markdown +++ b/doc/tutorials/features2d/trackingmotion/corner_subpixels/corner_subpixels.markdown @@ -4,6 +4,11 @@ Detecting corners location in subpixels {#tutorial_corner_subpixels} @prev_tutorial{tutorial_generic_corner_detector} @next_tutorial{tutorial_feature_detection} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.markdown b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.markdown index 6082b9b91de75453548b13794bbc629a1ec6edb6..93cdc2a6fc0659fb7b9173c3c0e984351058cfaf 100644 --- a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.markdown +++ b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.markdown @@ -4,6 +4,10 @@ Creating your own corner detector {#tutorial_generic_corner_detector} @prev_tutorial{tutorial_good_features_to_track} @next_tutorial{tutorial_corner_subpixels} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | Goal ---- diff --git a/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.markdown b/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.markdown index 7e8cf1157ee319a92fb30b7f32039945d032d111..5b579835a40ca12de5b7d757f03cc94939f5cec5 100644 --- a/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.markdown +++ b/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.markdown @@ -4,6 +4,11 @@ Shi-Tomasi corner detector {#tutorial_good_features_to_track} @prev_tutorial{tutorial_harris_detector} @next_tutorial{tutorial_generic_corner_detector} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.markdown b/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.markdown index f0b32683cea52819121d6522ca7638844cea7ac8..7179c4c53ed0e27c197e6ec6a8aaa1e716cb4fd9 100644 --- a/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.markdown +++ b/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.markdown @@ -3,6 +3,11 @@ Harris corner detector {#tutorial_harris_detector} @next_tutorial{tutorial_good_features_to_track} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/gapi/anisotropic_segmentation/porting_anisotropic_segmentation.markdown b/doc/tutorials/gapi/anisotropic_segmentation/porting_anisotropic_segmentation.markdown index 2912c6fba5306a08c8e8419a88b178991beef7b9..fa25c2b0b37b850b7f88c2ddae8512dc7c9890f7 100644 --- a/doc/tutorials/gapi/anisotropic_segmentation/porting_anisotropic_segmentation.markdown +++ b/doc/tutorials/gapi/anisotropic_segmentation/porting_anisotropic_segmentation.markdown @@ -1,5 +1,8 @@ # Porting anisotropic image segmentation on G-API {#tutorial_gapi_anisotropic_segmentation} +@prev_tutorial{tutorial_gapi_interactive_face_detection} +@next_tutorial{tutorial_gapi_face_beautification} + [TOC] # Introduction {#gapi_anisotropic_intro} diff --git a/doc/tutorials/gapi/face_beautification/face_beautification.markdown b/doc/tutorials/gapi/face_beautification/face_beautification.markdown index 9e56db0a54b03e1dbb0a0a2d0e93ba275f0ca6b3..1ceb416c999c2a1b3f4bf13ce3cb2330832910aa 100644 --- a/doc/tutorials/gapi/face_beautification/face_beautification.markdown +++ b/doc/tutorials/gapi/face_beautification/face_beautification.markdown @@ -1,5 +1,7 @@ # Implementing a face beautification algorithm with G-API {#tutorial_gapi_face_beautification} +@prev_tutorial{tutorial_gapi_anisotropic_segmentation} + [TOC] # Introduction {#gapi_fb_intro} diff --git a/doc/tutorials/gapi/interactive_face_detection/interactive_face_detection.markdown b/doc/tutorials/gapi/interactive_face_detection/interactive_face_detection.markdown index e5ca466da79c73455b2950ccde03bb60a05cf1b4..6f8b03bb61207fe85b6cbd1e5baf1ca183ccb867 100644 --- a/doc/tutorials/gapi/interactive_face_detection/interactive_face_detection.markdown +++ b/doc/tutorials/gapi/interactive_face_detection/interactive_face_detection.markdown @@ -1,5 +1,7 @@ # Face analytics pipeline with G-API {#tutorial_gapi_interactive_face_detection} +@next_tutorial{tutorial_gapi_anisotropic_segmentation} + [TOC] # Overview {#gapi_ifd_intro} diff --git a/doc/tutorials/highgui/images/Adding_Trackbars_Tutorial_Cover.jpg b/doc/tutorials/highgui/images/Adding_Trackbars_Tutorial_Cover.jpg deleted file mode 100644 index e914cab1d54822c36bfd8c258d7225fe21c3a799..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/highgui/images/Adding_Trackbars_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/highgui/table_of_content_highgui.markdown b/doc/tutorials/highgui/table_of_content_highgui.markdown deleted file mode 100644 index fb5a3436644577387eb32634c78e7493d3c93f26..0000000000000000000000000000000000000000 --- a/doc/tutorials/highgui/table_of_content_highgui.markdown +++ /dev/null @@ -1,14 +0,0 @@ -High Level GUI and Media (highgui module) {#tutorial_table_of_content_highgui} -========================================= - -This section contains tutorials about how to use the built-in graphical user interface of the library. - -- @subpage tutorial_trackbar - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - We will learn how to add a Trackbar to our applications diff --git a/doc/tutorials/images/calib3d.jpg b/doc/tutorials/images/calib3d.jpg deleted file mode 100644 index c5226a9a1d33976d49404ed0b4391cf885ae4f63..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/calib3d.jpg and /dev/null differ diff --git a/doc/tutorials/images/core.jpg b/doc/tutorials/images/core.jpg deleted file mode 100644 index 6fe819bd52a3d6a05cdc42429ff8787dea58d539..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/core.jpg and /dev/null differ diff --git a/doc/tutorials/images/feature2D.jpg b/doc/tutorials/images/feature2D.jpg deleted file mode 100644 index 6744de061023b93c1b2fad37943b6d3c2c896838..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/feature2D.jpg and /dev/null differ diff --git a/doc/tutorials/images/general.jpg b/doc/tutorials/images/general.jpg deleted file mode 100644 index 95829d9c647caabb77a1ce54c34500ac121116d4..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/general.jpg and /dev/null differ diff --git a/doc/tutorials/images/gpu.jpg b/doc/tutorials/images/gpu.jpg deleted file mode 100644 index 4cc053895cad07ba2dccf4ac3f4b6d78f8e21fc0..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/gpu.jpg and /dev/null differ diff --git a/doc/tutorials/images/highgui.jpg b/doc/tutorials/images/highgui.jpg deleted file mode 100644 index ada65fcb0365a34be9e2fd0098000494c92e981c..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/highgui.jpg and /dev/null differ diff --git a/doc/tutorials/images/imgproc.jpg b/doc/tutorials/images/imgproc.jpg deleted file mode 100644 index ad7dafb0b76a33670656f793c2c4c074d39f03ff..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/imgproc.jpg and /dev/null differ diff --git a/doc/tutorials/images/introduction.jpg b/doc/tutorials/images/introduction.jpg deleted file mode 100644 index 19a928478542712a0e205155da50b93591e2b0c3..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/introduction.jpg and /dev/null differ diff --git a/doc/tutorials/images/ml.jpg b/doc/tutorials/images/ml.jpg deleted file mode 100644 index 40acfcfbfd17b4190defae69167df38d68800043..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/ml.jpg and /dev/null differ diff --git a/doc/tutorials/images/objdetect.jpg b/doc/tutorials/images/objdetect.jpg deleted file mode 100644 index c811f348f548d94a1e676033642f96f04e7f601f..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/objdetect.jpg and /dev/null differ diff --git a/doc/tutorials/images/opencv_ios.png b/doc/tutorials/images/opencv_ios.png deleted file mode 100644 index ce2031d7c0b229e7eca3927fa172467c0895f561..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/opencv_ios.png and /dev/null differ diff --git a/doc/tutorials/images/photo.png b/doc/tutorials/images/photo.png deleted file mode 100644 index f701ffacf16e9dacb8270a0ede65b3f8d749ba44..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/photo.png and /dev/null differ diff --git a/doc/tutorials/images/retina.jpg b/doc/tutorials/images/retina.jpg deleted file mode 100644 index 2d2465070f694d31fff3820e163fa2e97d4d58f7..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/retina.jpg and /dev/null differ diff --git a/doc/tutorials/images/video.jpg b/doc/tutorials/images/video.jpg deleted file mode 100644 index dd5d0c4ed290fb63121013aca1f818a0930e2d3d..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/video.jpg and /dev/null differ diff --git a/doc/tutorials/images/viz.jpg b/doc/tutorials/images/viz.jpg deleted file mode 100644 index 7ac8f3ed8d641d2332755e8c9196517f1438b616..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/images/viz.jpg and /dev/null differ diff --git a/doc/tutorials/imgcodecs/images/gdal-io.jpg b/doc/tutorials/imgcodecs/images/gdal-io.jpg deleted file mode 100644 index b2974ed2fb36db5a54a125e674ce095173085673..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgcodecs/images/gdal-io.jpg and /dev/null differ diff --git a/doc/tutorials/imgcodecs/table_of_content_highgui.markdown b/doc/tutorials/imgcodecs/table_of_content_highgui.markdown deleted file mode 100644 index b63b7b00cef27d04fa0e1c9dcab2c31260db2c97..0000000000000000000000000000000000000000 --- a/doc/tutorials/imgcodecs/table_of_content_highgui.markdown +++ /dev/null @@ -1,14 +0,0 @@ -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 - - *Languages:* C++ - - *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/imgproc/anisotropic_image_segmentation/anisotropic_image_segmentation.markdown b/doc/tutorials/imgproc/anisotropic_image_segmentation/anisotropic_image_segmentation.markdown index 49fd621909c4d540a01e9ebfd04db9a4238dc56d..e8e130b6b33911592fe7d24ebef0778b915eb749 100644 --- a/doc/tutorials/imgproc/anisotropic_image_segmentation/anisotropic_image_segmentation.markdown +++ b/doc/tutorials/imgproc/anisotropic_image_segmentation/anisotropic_image_segmentation.markdown @@ -4,6 +4,11 @@ Anisotropic image segmentation by a gradient structure tensor {#tutorial_anisotr @prev_tutorial{tutorial_motion_deblur_filter} @next_tutorial{tutorial_periodic_noise_removing_filter} +| | | +| -: | :- | +| Original author | Karpushin Vladislav | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/basic_geometric_drawing/basic_geometric_drawing.markdown b/doc/tutorials/imgproc/basic_geometric_drawing/basic_geometric_drawing.markdown index 77c44219f9bd971bd818cd568ee7bd61f2461eda..29439d3f09f9b9fa9908265da3d5a74343f046d2 100644 --- a/doc/tutorials/imgproc/basic_geometric_drawing/basic_geometric_drawing.markdown +++ b/doc/tutorials/imgproc/basic_geometric_drawing/basic_geometric_drawing.markdown @@ -3,6 +3,11 @@ Basic Drawing {#tutorial_basic_geometric_drawing} @next_tutorial{tutorial_random_generator_and_text} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goals ----- diff --git a/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.markdown b/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.markdown index 42f8c7c38f4b411c537514ff2602a6b83dee7672..228f0dcc4b18c4f899c518cbc983479880f68fa4 100644 --- a/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.markdown +++ b/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.markdown @@ -4,6 +4,11 @@ Eroding and Dilating {#tutorial_erosion_dilatation} @prev_tutorial{tutorial_gausian_median_blur_bilateral_filter} @next_tutorial{tutorial_opening_closing_hats} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.markdown b/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.markdown index a03f95b6e404bdaa506692c0f2faa91602ee764d..c13b39280674a36c10556724fbd4d61a9662ba94 100644 --- a/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.markdown +++ b/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.markdown @@ -4,6 +4,11 @@ Smoothing Images {#tutorial_gausian_median_blur_bilateral_filter} @prev_tutorial{tutorial_random_generator_and_text} @next_tutorial{tutorial_erosion_dilatation} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/histograms/back_projection/back_projection.markdown b/doc/tutorials/imgproc/histograms/back_projection/back_projection.markdown index 61baca9bf1df8ab0c71f177618c8573edcdc2909..2ab6d09fcc44d8d351fbee0328b76248337dde60 100644 --- a/doc/tutorials/imgproc/histograms/back_projection/back_projection.markdown +++ b/doc/tutorials/imgproc/histograms/back_projection/back_projection.markdown @@ -4,6 +4,11 @@ Back Projection {#tutorial_back_projection} @prev_tutorial{tutorial_histogram_comparison} @next_tutorial{tutorial_template_matching} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.markdown b/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.markdown index 0623ba12f2daff10760c0d7f3b9d2c107381e391..a8d653d2e60fc14a555d49d4ba146cd7789597a7 100644 --- a/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.markdown +++ b/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.markdown @@ -4,6 +4,11 @@ Histogram Calculation {#tutorial_histogram_calculation} @prev_tutorial{tutorial_histogram_equalization} @next_tutorial{tutorial_histogram_comparison} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.markdown b/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.markdown index 8b7bf78377aae7983038dfe8ecd9fe2a26a367e6..93277678acf8dfa926dfe773f7235c731bcccedf 100644 --- a/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.markdown +++ b/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.markdown @@ -4,6 +4,11 @@ Histogram Comparison {#tutorial_histogram_comparison} @prev_tutorial{tutorial_histogram_calculation} @next_tutorial{tutorial_back_projection} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.markdown b/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.markdown index 271c6d1347246aa4ed75e3b3950cb3598298efeb..170bc026db07e0a2cf916514d0b08507d993b585 100644 --- a/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.markdown +++ b/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.markdown @@ -4,6 +4,11 @@ Histogram Equalization {#tutorial_histogram_equalization} @prev_tutorial{tutorial_warp_affine} @next_tutorial{tutorial_histogram_calculation} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/histograms/template_matching/template_matching.markdown b/doc/tutorials/imgproc/histograms/template_matching/template_matching.markdown index 5cc39e3b17cef74b817b36b403ae5d93aa8a5665..ac1432004b9cdd8f7767ec407e16e48995d357ae 100644 --- a/doc/tutorials/imgproc/histograms/template_matching/template_matching.markdown +++ b/doc/tutorials/imgproc/histograms/template_matching/template_matching.markdown @@ -4,6 +4,11 @@ Template Matching {#tutorial_template_matching} @prev_tutorial{tutorial_back_projection} @next_tutorial{tutorial_find_contours} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/hitOrMiss/hitOrMiss.markdown b/doc/tutorials/imgproc/hitOrMiss/hitOrMiss.markdown index c55f09296f5493f9dc82aa2dcfeda92696db1a6e..f8051f3b4e9f2cd6a62e4b239a7bd676eb69d612 100644 --- a/doc/tutorials/imgproc/hitOrMiss/hitOrMiss.markdown +++ b/doc/tutorials/imgproc/hitOrMiss/hitOrMiss.markdown @@ -4,6 +4,11 @@ Hit-or-Miss {#tutorial_hitOrMiss} @prev_tutorial{tutorial_opening_closing_hats} @next_tutorial{tutorial_morph_lines_detection} +| | | +| -: | :- | +| Original author | Lorena García | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/images/Morphology_1_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/Morphology_1_Tutorial_Cover.jpg deleted file mode 100644 index 67da3a5ac03c89f4abad94d54fe41092c7e1f2ea..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/Morphology_1_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/Morphology_2_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/Morphology_2_Tutorial_Cover.jpg deleted file mode 100644 index b3a1c5565989239ed56f6c225baf6604d7f329f4..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/Morphology_2_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/Morphology_3_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/Morphology_3_Tutorial_Cover.jpg deleted file mode 100644 index 1eddc17554ef55371cb3fca5620d6653e7265859..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/Morphology_3_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/Pyramids_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/Pyramids_Tutorial_Cover.jpg deleted file mode 100644 index 0851cab278e95de601691a23bb8b940be6c2a34d..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/Pyramids_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/Smoothing_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/Smoothing_Tutorial_Cover.jpg deleted file mode 100644 index 67656ab4b3c1a43f4c3702df3b8d27440eb28b06..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/Smoothing_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/Threshold_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/Threshold_Tutorial_Cover.jpg deleted file mode 100644 index 6b115d88f567171ea6dbb3d676c891843ee4a918..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/Threshold_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg deleted file mode 100644 index 013bdf6f2f554354fb7ee1994dcc9c30e4568f38..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg deleted file mode 100644 index 32d09e37e8beb3e11822d0096aed429b519c6199..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg deleted file mode 100644 index 7538a7203d958cfedef8821ceb6b0ab732bf0944..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg deleted file mode 100644 index fbc5866835ee5cd95ee0131e17577b78d8a12738..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg deleted file mode 100644 index e84f52119a0446464c20f9a2c345b5994f4ce2c4..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg deleted file mode 100644 index bcd9ff9ace48846d85caa2630fd8b6baba5cc797..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg deleted file mode 100644 index f241ff223803223a02abcb3f4c39595b9e7605d3..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Distance_Transformation_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Distance_Transformation_Tutorial_Cover.jpg deleted file mode 100644 index 8effc42a042bb2d4c2fc606e2c3cc3824aac8ce9..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Distance_Transformation_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg deleted file mode 100644 index c2f58091088538b8131d335a5d6d07cdf6dd4dac..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg deleted file mode 100644 index 175180ae817a58adb0b9207f8ea973dbe3f8fda7..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg deleted file mode 100644 index 4211ee26298e5c38ee55fa708e08906a7cf96399..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg deleted file mode 100644 index 14373f25b1efc10487e83472861a58b3c7c6f3f1..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg deleted file mode 100644 index bfb55dbdacbf242ea9942cae0d5ef41f2b6c45b0..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg deleted file mode 100644 index fbe17c8978bad5d6527d7d2d96ab30d8a0e876f5..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg deleted file mode 100644 index 5655789bd640367c5a9d8a3936de8cbb4a3a0208..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg deleted file mode 100644 index be2ae57d40c20da1c77cd8a90aa262d1544c0ea5..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg deleted file mode 100644 index b7330592b5c3bb269cad49ea32f3b57d0455c1a6..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg deleted file mode 100644 index 82888a1ba95e1af23b2ad91941a7e16f77c8f980..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg deleted file mode 100644 index a7a1b6ebebfb2ae13339dc1e3593e34ad0fe13d9..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg deleted file mode 100644 index 1e865eb371356264418c0f062a199da3759ac00a..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg b/doc/tutorials/imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg deleted file mode 100644 index 9980df84218cc547279a3ede067e6bdc651a3921..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.markdown b/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.markdown index 01bf6f862d61aa033df7ae913b4a0044189b210b..8e0cfcc59895cd0c229e48d37f99a235f5f85d1c 100644 --- a/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.markdown +++ b/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.markdown @@ -4,6 +4,11 @@ Canny Edge Detector {#tutorial_canny_detector} @prev_tutorial{tutorial_laplace_operator} @next_tutorial{tutorial_hough_lines} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.markdown b/doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.markdown index 8a4bbc0702b460f099fa972f85568e1c2b0512a0..a975576eb747a9703da548252d4050996b704944 100644 --- a/doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.markdown +++ b/doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.markdown @@ -4,6 +4,11 @@ Adding borders to your images {#tutorial_copyMakeBorder} @prev_tutorial{tutorial_filter_2d} @next_tutorial{tutorial_sobel_derivatives} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown b/doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown index a5afffdbb1917f80dfcfa88b9fc2b69f5684b932..4a0e2b6c058d69151b3f7264a00f85264bca216a 100644 --- a/doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown +++ b/doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown @@ -4,6 +4,11 @@ Image Segmentation with Distance Transform and Watershed Algorithm {#tutorial_di @prev_tutorial{tutorial_point_polygon_test} @next_tutorial{tutorial_out_of_focus_deblur_filter} +| | | +| -: | :- | +| Original author | Theodore Tsesmelis | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.markdown b/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.markdown index 454f745177ea371270e9c72ba90f3a2dfab3407f..3061dbb82f04cca69aff878dadf088052d86fe76 100644 --- a/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.markdown +++ b/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.markdown @@ -4,6 +4,11 @@ Making your own linear filters! {#tutorial_filter_2d} @prev_tutorial{tutorial_threshold_inRange} @next_tutorial{tutorial_copyMakeBorder} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown b/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown index fe2f88be155a6600a925848e1bee8636beb72189..c285cbba87ef336e72efac8cf85dea836e85d036 100644 --- a/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown +++ b/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown @@ -4,6 +4,11 @@ Hough Circle Transform {#tutorial_hough_circle} @prev_tutorial{tutorial_hough_lines} @next_tutorial{tutorial_remap} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.markdown b/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.markdown index 8b24d87a2df97457833aca4b2c929adc59593c90..eb72f10e72727bb1a81550abe164c647c9ff117a 100644 --- a/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.markdown +++ b/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.markdown @@ -4,6 +4,11 @@ Hough Line Transform {#tutorial_hough_lines} @prev_tutorial{tutorial_canny_detector} @next_tutorial{tutorial_hough_circle} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.markdown b/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.markdown index 63aed356b255fa8ee89ed47c21c06c789ae70094..3dd0b2170db279233d0de28137c74ee37a740533 100644 --- a/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.markdown +++ b/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.markdown @@ -4,6 +4,11 @@ Laplace Operator {#tutorial_laplace_operator} @prev_tutorial{tutorial_sobel_derivatives} @next_tutorial{tutorial_canny_detector} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/remap/remap.markdown b/doc/tutorials/imgproc/imgtrans/remap/remap.markdown index 58c79c60393744adbc8dc0ddce30ac26cf82579d..007e3b8ca29b18f8012e719de6d8ab7c0ca262c3 100644 --- a/doc/tutorials/imgproc/imgtrans/remap/remap.markdown +++ b/doc/tutorials/imgproc/imgtrans/remap/remap.markdown @@ -4,6 +4,11 @@ Remapping {#tutorial_remap} @prev_tutorial{tutorial_hough_circle} @next_tutorial{tutorial_warp_affine} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.markdown b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.markdown index f8725d2a12f955bf27ecf3a7c75285b7c5e0dfc9..b91ea7d3bd335adb20e9ed35c68383213109c442 100644 --- a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.markdown +++ b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.markdown @@ -4,6 +4,11 @@ Sobel Derivatives {#tutorial_sobel_derivatives} @prev_tutorial{tutorial_copyMakeBorder} @next_tutorial{tutorial_laplace_operator} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.markdown b/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.markdown index b5023ad03e376b04d02710aebb5aa814d2a62f73..68d4ebddab7c6d09aa91d2ebf828aa92ed082e2e 100644 --- a/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.markdown +++ b/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.markdown @@ -4,6 +4,11 @@ Affine Transformations {#tutorial_warp_affine} @prev_tutorial{tutorial_remap} @next_tutorial{tutorial_histogram_equalization} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/morph_lines_detection/morph_lines_detection.md b/doc/tutorials/imgproc/morph_lines_detection/morph_lines_detection.md index ce9e81e21180036b1e84973436e102e4d8543fab..360ea8a30c87586f85b5cd3f525c3b7094b79bf6 100644 --- a/doc/tutorials/imgproc/morph_lines_detection/morph_lines_detection.md +++ b/doc/tutorials/imgproc/morph_lines_detection/morph_lines_detection.md @@ -4,6 +4,11 @@ Extract horizontal and vertical lines by using morphological operations {#tutori @prev_tutorial{tutorial_hitOrMiss} @next_tutorial{tutorial_pyramids} +| | | +| -: | :- | +| Original author | Theodore Tsesmelis | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/motion_deblur_filter/motion_deblur_filter.markdown b/doc/tutorials/imgproc/motion_deblur_filter/motion_deblur_filter.markdown index 704e0ef275f9c55b0dbd7d9dc99ca1554ad7f4e3..af1b3b874f17439f8273850623a7d1089eb491df 100644 --- a/doc/tutorials/imgproc/motion_deblur_filter/motion_deblur_filter.markdown +++ b/doc/tutorials/imgproc/motion_deblur_filter/motion_deblur_filter.markdown @@ -4,6 +4,11 @@ Motion Deblur Filter {#tutorial_motion_deblur_filter} @prev_tutorial{tutorial_out_of_focus_deblur_filter} @next_tutorial{tutorial_anisotropic_image_segmentation_by_a_gst} +| | | +| -: | :- | +| Original author | Karpushin Vladislav | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.markdown b/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.markdown index e918c65ce7721fbb10757ecad65020f2668d9539..f6417b823ace7c0faf56bd71858f43846b311c94 100644 --- a/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.markdown +++ b/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.markdown @@ -4,6 +4,11 @@ More Morphology Transformations {#tutorial_opening_closing_hats} @prev_tutorial{tutorial_erosion_dilatation} @next_tutorial{tutorial_hitOrMiss} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/out_of_focus_deblur_filter/out_of_focus_deblur_filter.markdown b/doc/tutorials/imgproc/out_of_focus_deblur_filter/out_of_focus_deblur_filter.markdown index 800286d9a8194948da0618f57952a230338610e9..db8fca57f98a99ff067d23bbe6e494e8d6b96011 100644 --- a/doc/tutorials/imgproc/out_of_focus_deblur_filter/out_of_focus_deblur_filter.markdown +++ b/doc/tutorials/imgproc/out_of_focus_deblur_filter/out_of_focus_deblur_filter.markdown @@ -4,6 +4,11 @@ Out-of-focus Deblur Filter {#tutorial_out_of_focus_deblur_filter} @prev_tutorial{tutorial_distance_transform} @next_tutorial{tutorial_motion_deblur_filter} +| | | +| -: | :- | +| Original author | Karpushin Vladislav | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/periodic_noise_removing_filter/periodic_noise_removing_filter.markdown b/doc/tutorials/imgproc/periodic_noise_removing_filter/periodic_noise_removing_filter.markdown index 3c36a1e9c41e3a6787893ccb4243d7b4ac08ea86..5692fb94a820f8e34a0997cc1d5202b9172a8c95 100644 --- a/doc/tutorials/imgproc/periodic_noise_removing_filter/periodic_noise_removing_filter.markdown +++ b/doc/tutorials/imgproc/periodic_noise_removing_filter/periodic_noise_removing_filter.markdown @@ -3,6 +3,11 @@ Periodic Noise Removing Filter {#tutorial_periodic_noise_removing_filter} @prev_tutorial{tutorial_anisotropic_image_segmentation_by_a_gst} +| | | +| -: | :- | +| Original author | Karpushin Vladislav | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/pyramids/pyramids.markdown b/doc/tutorials/imgproc/pyramids/pyramids.markdown index c11a80527f287241f302b2164b17a67ac373092e..02f4a9a2d1d65ac37e1acf1eea7697c093f311c8 100644 --- a/doc/tutorials/imgproc/pyramids/pyramids.markdown +++ b/doc/tutorials/imgproc/pyramids/pyramids.markdown @@ -4,6 +4,11 @@ Image Pyramids {#tutorial_pyramids} @prev_tutorial{tutorial_morph_lines_detection} @next_tutorial{tutorial_threshold} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/random_generator_and_text/random_generator_and_text.markdown b/doc/tutorials/imgproc/random_generator_and_text/random_generator_and_text.markdown index f588bbc44d985967f06040938ed41be229cf96b2..d250775d870bebabb95a253db11c02ef271493ec 100644 --- a/doc/tutorials/imgproc/random_generator_and_text/random_generator_and_text.markdown +++ b/doc/tutorials/imgproc/random_generator_and_text/random_generator_and_text.markdown @@ -4,6 +4,11 @@ Random generator and text with OpenCV {#tutorial_random_generator_and_text} @prev_tutorial{tutorial_basic_geometric_drawing} @next_tutorial{tutorial_gausian_median_blur_bilateral_filter} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goals ----- diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.markdown b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.markdown index d6194dfd3f33453972331454368ccf1d0dc83f1c..70c7a872267300ba0048aef2fa1ef7c2bec73065 100644 --- a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.markdown +++ b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.markdown @@ -4,6 +4,11 @@ Creating Bounding boxes and circles for contours {#tutorial_bounding_rects_circl @prev_tutorial{tutorial_hull} @next_tutorial{tutorial_bounding_rotated_ellipses} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.markdown b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.markdown index a4c29b2fdefe11b413744b9f07c5514459437fc3..75d2da1f5706378b459301eba39e9c7e63fe511a 100644 --- a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.markdown +++ b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.markdown @@ -4,6 +4,11 @@ Creating Bounding rotated boxes and ellipses for contours {#tutorial_bounding_ro @prev_tutorial{tutorial_bounding_rects_circles} @next_tutorial{tutorial_moments} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.markdown b/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.markdown index b8aa6d898f2b83069b5ad46869f0421ae76eb2ef..daf42b46a6123508ad0131f8b40119178626f974 100644 --- a/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.markdown +++ b/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.markdown @@ -4,6 +4,11 @@ Finding contours in your image {#tutorial_find_contours} @prev_tutorial{tutorial_template_matching} @next_tutorial{tutorial_hull} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/shapedescriptors/hull/hull.markdown b/doc/tutorials/imgproc/shapedescriptors/hull/hull.markdown index e40934e6e2deab7b73eab2e4f00eef7341064cd8..0a29c5e3a17e7643d3a2b8aed0de119dc0df6b4c 100644 --- a/doc/tutorials/imgproc/shapedescriptors/hull/hull.markdown +++ b/doc/tutorials/imgproc/shapedescriptors/hull/hull.markdown @@ -4,6 +4,11 @@ Convex Hull {#tutorial_hull} @prev_tutorial{tutorial_find_contours} @next_tutorial{tutorial_bounding_rects_circles} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/shapedescriptors/moments/moments.markdown b/doc/tutorials/imgproc/shapedescriptors/moments/moments.markdown index 683568ab0cc99aad6e0ff5c223eb6a78ecbbb5bd..9eab42d3ca52070880d454be5eafa60848057f76 100644 --- a/doc/tutorials/imgproc/shapedescriptors/moments/moments.markdown +++ b/doc/tutorials/imgproc/shapedescriptors/moments/moments.markdown @@ -4,6 +4,11 @@ Image Moments {#tutorial_moments} @prev_tutorial{tutorial_bounding_rotated_ellipses} @next_tutorial{tutorial_point_polygon_test} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.markdown b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.markdown index 2e02fb8815aeccbac7c060f6d7514e25abe4c8bf..08d030f5de023bb06c38edbb2be0a6f8ec7bb289 100644 --- a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.markdown +++ b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.markdown @@ -4,6 +4,11 @@ Point Polygon Test {#tutorial_point_polygon_test} @prev_tutorial{tutorial_moments} @next_tutorial{tutorial_distance_transform} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/table_of_content_imgproc.markdown b/doc/tutorials/imgproc/table_of_content_imgproc.markdown index b0a8b8260b687899f140fa06b1af33d980a75068..edffd706bd11890607ecf87a4a4ec9b14b7ad14d 100644 --- a/doc/tutorials/imgproc/table_of_content_imgproc.markdown +++ b/doc/tutorials/imgproc/table_of_content_imgproc.markdown @@ -1,298 +1,52 @@ Image Processing (imgproc module) {#tutorial_table_of_content_imgproc} ================================= -In this section you will learn about the image processing (manipulation) functions inside OpenCV. - +Basic +----- - @subpage tutorial_basic_geometric_drawing - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - We will learn how to draw simple geometry with OpenCV! - - @subpage tutorial_random_generator_and_text - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - We will draw some *fancy-looking* stuff using OpenCV! - - @subpage tutorial_gausian_median_blur_bilateral_filter - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Let's take a look at some basic linear filters! - - @subpage tutorial_erosion_dilatation - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - Author: Ana Huamán - - Let's *change* the shape of objects! - - @subpage tutorial_opening_closing_hats - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Here we investigate different morphology operators - - @subpage tutorial_hitOrMiss - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.4 - - *Author:* Lorena García - - Learn how to find patterns in binary images using the Hit-or-Miss operation - - @subpage tutorial_morph_lines_detection - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Theodore Tsesmelis - - Here we will show how we can use different morphological operators to extract horizontal and vertical lines - - @subpage tutorial_pyramids - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - What if I need a bigger/smaller image? - - @subpage tutorial_threshold - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - After so much processing, it is time to decide which pixels stay - - @subpage tutorial_threshold_inRange - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Rishiraj Surti - - Thresholding operations using inRange function. - +Transformations +--------------- - @subpage tutorial_filter_2d - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn to design our own filters by using OpenCV functions - - @subpage tutorial_copyMakeBorder - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to pad our images - - @subpage tutorial_sobel_derivatives - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to calculate gradients and use them to detect edges - - @subpage tutorial_laplace_operator - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn about the *Laplace* operator and how to detect edges with it - - @subpage tutorial_canny_detector - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn a sophisticated alternative to detect edges - - @subpage tutorial_hough_lines - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to detect lines - - @subpage tutorial_hough_circle - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to detect circles - - @subpage tutorial_remap - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to manipulate pixels locations - - @subpage tutorial_warp_affine - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to rotate, translate and scale our images - +Histograms +---------- - @subpage tutorial_histogram_equalization - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to improve the contrast in our images - - @subpage tutorial_histogram_calculation - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to create and generate histograms - - @subpage tutorial_histogram_comparison - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn to calculate metrics between histograms - - @subpage tutorial_back_projection - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to use histograms to find similar objects in images - - @subpage tutorial_template_matching - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to match templates in an image - -- @subpage tutorial_table_of_contents_contours - - Learn how to find contours in images and investigate their properties and features. - +Contours +-------- +- @subpage tutorial_find_contours +- @subpage tutorial_hull +- @subpage tutorial_bounding_rects_circles +- @subpage tutorial_bounding_rotated_ellipses +- @subpage tutorial_moments +- @subpage tutorial_point_polygon_test + +Others +------ - @subpage tutorial_distance_transform - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Theodore Tsesmelis - - Where we learn to segment objects using Laplacian filtering, the Distance Transformation and the Watershed algorithm. - - @subpage tutorial_out_of_focus_deblur_filter - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Karpushin Vladislav - - You will learn how to recover an out-of-focus image by Wiener filter. - - @subpage tutorial_motion_deblur_filter - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Karpushin Vladislav - - You will learn how to recover an image with motion blur distortion using a Wiener filter. - - @subpage tutorial_anisotropic_image_segmentation_by_a_gst - - *Languages:* C++, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Karpushin Vladislav - - You will learn how to segment an anisotropic image with a single local orientation by a gradient structure tensor. - - @subpage tutorial_periodic_noise_removing_filter - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Karpushin Vladislav - - You will learn how to remove periodic noise in the Fourier domain. diff --git a/doc/tutorials/imgproc/table_of_contents_contours.markdown b/doc/tutorials/imgproc/table_of_contents_contours.markdown index 3e8bba3a62d34ecc2684d653f35b53e67f3198cf..cc2f133bfdeaa211de2406949d9410f9ea340207 100644 --- a/doc/tutorials/imgproc/table_of_contents_contours.markdown +++ b/doc/tutorials/imgproc/table_of_contents_contours.markdown @@ -1,62 +1,4 @@ Contours in OpenCV {#tutorial_table_of_contents_contours} ================== -- @subpage tutorial_find_contours - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to find contours of objects in our image - -- @subpage tutorial_hull - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to get hull contours and draw them - -- @subpage tutorial_bounding_rects_circles - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to obtain bounding boxes and circles for our contours - -- @subpage tutorial_bounding_rotated_ellipses - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to obtain rotated bounding boxes and ellipses for our contours - -- @subpage tutorial_moments - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn to calculate the moments of an image - -- @subpage tutorial_point_polygon_test - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Where we learn how to calculate distances from the image to contours +Content has been moved to this page: @ref tutorial_table_of_content_imgproc diff --git a/doc/tutorials/imgproc/threshold/threshold.markdown b/doc/tutorials/imgproc/threshold/threshold.markdown index a452d14042ef466a2555b58f9d8364220a7d66c9..2eb0b237b23d0bce7440838bb1560c036afb4c26 100644 --- a/doc/tutorials/imgproc/threshold/threshold.markdown +++ b/doc/tutorials/imgproc/threshold/threshold.markdown @@ -4,6 +4,11 @@ Basic Thresholding Operations {#tutorial_threshold} @prev_tutorial{tutorial_pyramids} @next_tutorial{tutorial_threshold_inRange} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/imgproc/threshold_inRange/threshold_inRange.markdown b/doc/tutorials/imgproc/threshold_inRange/threshold_inRange.markdown index 0995b9758c2341075ca26c8e7adb653b49bfb718..8ff49e5e75d51ea656b113251aace9df3d136275 100644 --- a/doc/tutorials/imgproc/threshold_inRange/threshold_inRange.markdown +++ b/doc/tutorials/imgproc/threshold_inRange/threshold_inRange.markdown @@ -4,6 +4,11 @@ Thresholding Operations using inRange {#tutorial_threshold_inRange} @prev_tutorial{tutorial_threshold} @next_tutorial{tutorial_filter_2d} +| | | +| -: | :- | +| Original author | Lorena García | +| Compatibility | Rishiraj Surti | + Goal ---- diff --git a/doc/tutorials/introduction/config_reference/config_reference.markdown b/doc/tutorials/introduction/config_reference/config_reference.markdown index a6bde80102d08bddae30e53cbca3bfad56abf559..714a392a85dad9aec928d880ea94791816012ad2 100644 --- a/doc/tutorials/introduction/config_reference/config_reference.markdown +++ b/doc/tutorials/introduction/config_reference/config_reference.markdown @@ -1,6 +1,9 @@ OpenCV configuration options reference {#tutorial_config_reference} ====================================== +@prev_tutorial{tutorial_general_install} +@next_tutorial{tutorial_linux_install} + @tableofcontents # Introduction {#tutorial_config_reference_intro} diff --git a/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.markdown b/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.markdown index 91353b29906ea006c8256ef0fbc54bffd11db1ba..058b5c92f27424cd0d29ec92d2280f6cf2bf6605 100644 --- a/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.markdown +++ b/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.markdown @@ -1,7 +1,7 @@ Cross compilation for ARM based Linux systems {#tutorial_arm_crosscompile_with_cmake} ============================================= -@prev_tutorial{tutorial_ios_install} +@prev_tutorial{tutorial_macos_install} @next_tutorial{tutorial_building_tegra_cuda} | | | diff --git a/doc/tutorials/introduction/documenting_opencv/documentation_tutorial.markdown b/doc/tutorials/introduction/documenting_opencv/documentation_tutorial.markdown index 2cce88c856fc28f544dfce2b0a17c816fce0dd2f..3654f939c0b4d1c949a6495c1aba108170ec6ef0 100644 --- a/doc/tutorials/introduction/documenting_opencv/documentation_tutorial.markdown +++ b/doc/tutorials/introduction/documenting_opencv/documentation_tutorial.markdown @@ -667,20 +667,9 @@ Write the tutorial {#tutorial_documentation_steps_tutorial} 6. Add newly created tutorial to the corresponding table of contents. Just find "table_of_content_*.markdown" file with the needed table and place new record in it similar to existing ones. - @verbatim -- @subpage tutorial_windows_visual_studio_image_watch - - _Languages:_ C++, Java, Python - - _Compatibility:_ \>= OpenCV 2.4 - _Author:_ Wolf Kienzle - - You will learn how to visualize OpenCV matrices and images within Visual Studio 2012. - @endverbatim - As you can see it is just a list item with special _subpage_ command which marks your page as a - child and places it into the existing pages hierarchy. Add compatibility information, - authors list and short description. Also note the list item indent, empty lines between + It is simply a list item with special _subpage_ command which marks your page as a + child and places it into the existing pages hierarchy. Also note the list item indent, empty lines between paragraphs and special _italic_ markers. 7. Generate doxygen documentation and verify results. diff --git a/doc/tutorials/introduction/general_install/general_install.markdown b/doc/tutorials/introduction/general_install/general_install.markdown index 2fa3a172234cad4dd881ea6af0a7ca75c8af5b90..e8c93f430eea3bed475667b1385c9bdf88ae4f09 100644 --- a/doc/tutorials/introduction/general_install/general_install.markdown +++ b/doc/tutorials/introduction/general_install/general_install.markdown @@ -1,6 +1,8 @@ OpenCV installation overview {#tutorial_general_install} ============================ +@next_tutorial{tutorial_config_reference} + @tableofcontents There are two ways of installing OpenCV on your machine: download prebuilt version for your platform or compile from sources. diff --git a/doc/tutorials/introduction/images/Display_Image_Tutorial_Result.jpg b/doc/tutorials/introduction/images/Display_Image_Tutorial_Result.jpg deleted file mode 100644 index 16400698f0751cdeaac542e152266aa1da5c8df7..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/Display_Image_Tutorial_Result.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/images/Java_logo.png b/doc/tutorials/introduction/images/Java_logo.png deleted file mode 100644 index 211475189677cef412eb00a5b0d63349be9444c4..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/Java_logo.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/android_logo.png b/doc/tutorials/introduction/images/android_logo.png deleted file mode 100644 index 69bccd74d26680f5ce66df2d5b4130f5aea0bfc1..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/android_logo.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/clojure-logo.png b/doc/tutorials/introduction/images/clojure-logo.png deleted file mode 100644 index f8a29b965cabd8da8d5b7af750407451fcda26dc..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/clojure-logo.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/eclipse-logo.png b/doc/tutorials/introduction/images/eclipse-logo.png deleted file mode 100644 index 64ec01c2534d34fbda3b02cef963da9d5e92ff9b..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/eclipse-logo.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/eclipse_cpp_logo.jpeg b/doc/tutorials/introduction/images/eclipse_cpp_logo.jpeg deleted file mode 100644 index e63e26b1b4f43c9368febdf1feda0f960e5056a5..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/eclipse_cpp_logo.jpeg and /dev/null differ diff --git a/doc/tutorials/introduction/images/gccegg-65.jpg b/doc/tutorials/introduction/images/gccegg-65.jpg deleted file mode 100644 index e3e44d1f6cc9549b306d65cf325a98f95efa3394..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/gccegg-65.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/images/how_to_write_a_tutorial.png b/doc/tutorials/introduction/images/how_to_write_a_tutorial.png deleted file mode 100644 index ae40fc3d328c108207691ee7d9faf7f11e796684..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/how_to_write_a_tutorial.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/lena.png b/doc/tutorials/introduction/images/lena.png deleted file mode 100644 index 68342fae532d5c6aa813e0abe6e407b09e37a6cc..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/lena.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/opencv_ios.png b/doc/tutorials/introduction/images/opencv_ios.png deleted file mode 100644 index ce2031d7c0b229e7eca3927fa172467c0895f561..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/opencv_ios.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/ubuntu-logo.jpg b/doc/tutorials/introduction/images/ubuntu-logo.jpg deleted file mode 100644 index a34243496c80d16cb7f0549a4d599b5263f61a34..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/ubuntu-logo.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/images/visual-studio-2010-logo.jpg b/doc/tutorials/introduction/images/visual-studio-2010-logo.jpg deleted file mode 100644 index 8b053695c46dd5f9a571563f81624d85ddacc110..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/visual-studio-2010-logo.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/images/visual_studio_image_watch.png b/doc/tutorials/introduction/images/visual_studio_image_watch.png deleted file mode 100644 index e693344df85b3a486630b43e8c779686ad1b4fa0..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/visual_studio_image_watch.png and /dev/null differ diff --git a/doc/tutorials/introduction/images/windows_logo.jpg b/doc/tutorials/introduction/images/windows_logo.jpg deleted file mode 100644 index e35a8a86aefcad19092358f52367cbb09e88f042..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/introduction/images/windows_logo.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/macos_install/macos_install.markdown b/doc/tutorials/introduction/macos_install/macos_install.markdown index ec708101a027eaf37ca1fb802576f5abc04124d7..dadce9304c81e436838ce5eb25905ac2cc129f81 100644 --- a/doc/tutorials/introduction/macos_install/macos_install.markdown +++ b/doc/tutorials/introduction/macos_install/macos_install.markdown @@ -2,7 +2,7 @@ Installation in MacOS {#tutorial_macos_install} ===================== @prev_tutorial{tutorial_android_ocl_intro} -@next_tutorial{tutorial_ios_install} +@next_tutorial{tutorial_arm_crosscompile_with_cmake} | | | | -: | :- | diff --git a/doc/tutorials/introduction/table_of_content_introduction.markdown b/doc/tutorials/introduction/table_of_content_introduction.markdown index 2eb95e7b72e8c95ef25106c4384c965c4e32e074..d1f2aa3ca31912fc506d9ea48b395bac34506a92 100644 --- a/doc/tutorials/introduction/table_of_content_introduction.markdown +++ b/doc/tutorials/introduction/table_of_content_introduction.markdown @@ -25,9 +25,9 @@ Introduction to OpenCV {#tutorial_table_of_content_introduction} ##### Other platforms - @subpage tutorial_macos_install -- @subpage tutorial_ios_install - @subpage tutorial_arm_crosscompile_with_cmake - @subpage tutorial_building_tegra_cuda +- @ref tutorial_ios_install ##### Usage basics - @subpage tutorial_display_image - We will learn how to load an image from file and display it using OpenCV diff --git a/doc/tutorials/ios/hello/hello.markdown b/doc/tutorials/ios/hello/hello.markdown index fc6992cc70d1100805222d710c8c86b0cd1a5150..ff1245f401a3374820ab4766445aff33484d925f 100644 --- a/doc/tutorials/ios/hello/hello.markdown +++ b/doc/tutorials/ios/hello/hello.markdown @@ -1,8 +1,14 @@ OpenCV iOS Hello {#tutorial_hello} ================ +@prev_tutorial{tutorial_ios_install} @next_tutorial{tutorial_image_manipulation} +| | | +| -: | :- | +| Original author | Charu Hans | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/ios/image_manipulation/image_manipulation.markdown b/doc/tutorials/ios/image_manipulation/image_manipulation.markdown index 61590d8f770107b715fb945f57278d6881a2d1f6..78bfe560725421b1ac566403b746fe22141f83dd 100644 --- a/doc/tutorials/ios/image_manipulation/image_manipulation.markdown +++ b/doc/tutorials/ios/image_manipulation/image_manipulation.markdown @@ -4,6 +4,11 @@ OpenCV iOS - Image Processing {#tutorial_image_manipulation} @prev_tutorial{tutorial_hello} @next_tutorial{tutorial_video_processing} +| | | +| -: | :- | +| Original author | Charu Hans | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/ios/images/facedetect.jpg b/doc/tutorials/ios/images/facedetect.jpg deleted file mode 100644 index 788b7d8262b75bc416edc75495663d592fa1d4e2..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/ios/images/facedetect.jpg and /dev/null differ diff --git a/doc/tutorials/ios/images/image_effects.png b/doc/tutorials/ios/images/image_effects.png deleted file mode 100644 index 25edb668f963d41661838a2d0970d21a89f351ec..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/ios/images/image_effects.png and /dev/null differ diff --git a/doc/tutorials/ios/images/intro.png b/doc/tutorials/ios/images/intro.png deleted file mode 100644 index 5f2dc1aa4c3d2d571e32953b813f8db890178a42..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/ios/images/intro.png and /dev/null differ diff --git a/doc/tutorials/introduction/ios_install/ios_install.markdown b/doc/tutorials/ios/ios_install/ios_install.markdown similarity index 96% rename from doc/tutorials/introduction/ios_install/ios_install.markdown rename to doc/tutorials/ios/ios_install/ios_install.markdown index cbe3902602948256794e249a4f1c94852bca0119..fe05728b89ac5f8df2002fd1cfa370fbabbcd123 100644 --- a/doc/tutorials/introduction/ios_install/ios_install.markdown +++ b/doc/tutorials/ios/ios_install/ios_install.markdown @@ -1,8 +1,7 @@ Installation in iOS {#tutorial_ios_install} =================== -@prev_tutorial{tutorial_macos_install} -@next_tutorial{tutorial_arm_crosscompile_with_cmake} +@next_tutorial{tutorial_hello} | | | | -: | :- | diff --git a/doc/tutorials/ios/table_of_content_ios.markdown b/doc/tutorials/ios/table_of_content_ios.markdown index 4031c6c80b96c85dab63a653389d70b857a3f230..99cfea53069276774dd82c19862c95594b521958 100644 --- a/doc/tutorials/ios/table_of_content_ios.markdown +++ b/doc/tutorials/ios/table_of_content_ios.markdown @@ -1,32 +1,6 @@ OpenCV iOS {#tutorial_table_of_content_ios} ========== - +- @subpage tutorial_ios_install - @subpage tutorial_hello - - *Languages:* Objective-C++ - - *Compatibility:* \> OpenCV 2.4.3 - - *Author:* Charu Hans - - You will learn how to link OpenCV with iOS and write a basic application. - - @subpage tutorial_image_manipulation - - *Languages:* Objective-C++ - - *Compatibility:* \> OpenCV 2.4.3 - - *Author:* Charu Hans - - You will learn how to do simple image manipulation using OpenCV in iOS. - - @subpage tutorial_video_processing - - *Languages:* Objective-C++ - - *Compatibility:* \> OpenCV 2.4.3 - - *Author:* Eduard Feicho - - You will learn how to capture and process video from camera using OpenCV in iOS. diff --git a/doc/tutorials/ios/video_processing/video_processing.markdown b/doc/tutorials/ios/video_processing/video_processing.markdown index 04bdd14e8994315c09fa581d8ed35c97ad71b8d0..c01576337f1795b5a063d7e6c1c9c4a6e2fc7bb7 100644 --- a/doc/tutorials/ios/video_processing/video_processing.markdown +++ b/doc/tutorials/ios/video_processing/video_processing.markdown @@ -3,6 +3,11 @@ OpenCV iOS - Video Processing {#tutorial_video_processing} @prev_tutorial{tutorial_image_manipulation} +| | | +| -: | :- | +| Original author | Eduard Feicho | +| Compatibility | OpenCV >= 3.0 | + This tutorial explains how to process video frames using the iPhone's camera and OpenCV. diff --git a/doc/tutorials/ml/images/introduction_to_pca_cover.png b/doc/tutorials/ml/images/introduction_to_pca_cover.png deleted file mode 100644 index ce230029ec70a0dc3a63aa5d8c05ad7e802801f9..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/ml/images/introduction_to_pca_cover.png and /dev/null differ diff --git a/doc/tutorials/ml/images/introduction_to_svm.png b/doc/tutorials/ml/images/introduction_to_svm.png deleted file mode 100644 index f2d63751fc07ea78272082cee0444c36ad1ada92..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/ml/images/introduction_to_svm.png and /dev/null differ diff --git a/doc/tutorials/ml/images/non_linear_svms.png b/doc/tutorials/ml/images/non_linear_svms.png deleted file mode 100644 index bd185d4c74edcaba204b71da5059d0fd57670803..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/ml/images/non_linear_svms.png and /dev/null differ diff --git a/doc/tutorials/ml/table_of_content_ml.markdown b/doc/tutorials/ml/table_of_content_ml.markdown deleted file mode 100644 index b4064777a2d7af581d63ab38a1eef12832d510e7..0000000000000000000000000000000000000000 --- a/doc/tutorials/ml/table_of_content_ml.markdown +++ /dev/null @@ -1,36 +0,0 @@ -Machine Learning (ml module) {#tutorial_table_of_content_ml} -============================ - -Use the powerful machine learning classes for statistical classification, regression and clustering -of data. - -- @subpage tutorial_introduction_to_svm - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Fernando Iglesias García - - Learn what a Support Vector Machine is. - -- @subpage tutorial_non_linear_svms - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Fernando Iglesias García - - Here you will learn how to define the optimization problem for SVMs when it is not possible to - separate linearly the training data. - -- @subpage tutorial_introduction_to_pca - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Theodore Tsesmelis - - Learn what a Principal Component Analysis (PCA) is. diff --git a/doc/tutorials/objdetect/images/Cascade_Classifier_Tutorial_Cover.jpg b/doc/tutorials/objdetect/images/Cascade_Classifier_Tutorial_Cover.jpg deleted file mode 100644 index cfa5de67e5f9dd5d39168a806e0d35ef0357eea9..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/objdetect/images/Cascade_Classifier_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/objdetect/table_of_content_objdetect.markdown b/doc/tutorials/objdetect/table_of_content_objdetect.markdown deleted file mode 100644 index 0b019d88a567f236edba612731d927ccb08867ed..0000000000000000000000000000000000000000 --- a/doc/tutorials/objdetect/table_of_content_objdetect.markdown +++ /dev/null @@ -1,18 +0,0 @@ -Object Detection (objdetect module) {#tutorial_table_of_content_objdetect} -=================================== - -Ever wondered how your digital camera detects peoples and faces? Look here to find out! - -- @subpage tutorial_cascade_classifier - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Ana Huamán - - Here we learn how to use *objdetect* to find objects in our images or videos - -- @subpage tutorial_traincascade - - This tutorial describes _opencv_traincascade_ application and its parameters. diff --git a/doc/tutorials/others/_old/table_of_content_ml.markdown b/doc/tutorials/others/_old/table_of_content_ml.markdown new file mode 100644 index 0000000000000000000000000000000000000000..5999b0208afb9b29d25eaa55cd1c133547c58c50 --- /dev/null +++ b/doc/tutorials/others/_old/table_of_content_ml.markdown @@ -0,0 +1,4 @@ +Machine Learning (ml module) {#tutorial_table_of_content_ml} +============================ + +Content has been moved to this page: @ref tutorial_table_of_content_other diff --git a/doc/tutorials/others/_old/table_of_content_objdetect.markdown b/doc/tutorials/others/_old/table_of_content_objdetect.markdown new file mode 100644 index 0000000000000000000000000000000000000000..0aa69fcd8d73356aee5c7068812e9428a5a05a38 --- /dev/null +++ b/doc/tutorials/others/_old/table_of_content_objdetect.markdown @@ -0,0 +1,4 @@ +Object Detection (objdetect module) {#tutorial_table_of_content_objdetect} +=================================== + +Content has been moved to this page: @ref tutorial_table_of_content_other diff --git a/doc/tutorials/others/_old/table_of_content_photo.markdown b/doc/tutorials/others/_old/table_of_content_photo.markdown new file mode 100644 index 0000000000000000000000000000000000000000..14a10a9c706a0e0a719be15dc40b332fd2ff4c4e --- /dev/null +++ b/doc/tutorials/others/_old/table_of_content_photo.markdown @@ -0,0 +1,4 @@ +Computational photography (photo module) {#tutorial_table_of_content_photo} +======================================== + +Content has been moved to this page: @ref tutorial_table_of_content_other diff --git a/doc/tutorials/others/_old/table_of_content_stitching.markdown b/doc/tutorials/others/_old/table_of_content_stitching.markdown new file mode 100644 index 0000000000000000000000000000000000000000..e8f91ba6599d42a8117e280b0204e3ffae6083f9 --- /dev/null +++ b/doc/tutorials/others/_old/table_of_content_stitching.markdown @@ -0,0 +1,4 @@ +Images stitching (stitching module) {#tutorial_table_of_content_stitching} +=================================== + +Content has been moved to this page: @ref tutorial_table_of_content_other diff --git a/doc/tutorials/others/_old/table_of_content_video.markdown b/doc/tutorials/others/_old/table_of_content_video.markdown new file mode 100644 index 0000000000000000000000000000000000000000..fae3e6ca7986d7d6ff8da3d0983f07484b2e2457 --- /dev/null +++ b/doc/tutorials/others/_old/table_of_content_video.markdown @@ -0,0 +1,4 @@ +Video analysis (video module) {#tutorial_table_of_content_video} +============================= + +Content has been moved to this page: @ref tutorial_table_of_content_other diff --git a/doc/tutorials/video/background_subtraction/background_subtraction.markdown b/doc/tutorials/others/background_subtraction.markdown similarity index 97% rename from doc/tutorials/video/background_subtraction/background_subtraction.markdown rename to doc/tutorials/others/background_subtraction.markdown index 420286960d120e2597d835054836a4c72dc65e0b..929005c7063930ff353235dd97e35ec1bdd8a1fb 100644 --- a/doc/tutorials/video/background_subtraction/background_subtraction.markdown +++ b/doc/tutorials/others/background_subtraction.markdown @@ -1,8 +1,14 @@ How to Use Background Subtraction Methods {#tutorial_background_subtraction} ========================================= +@prev_tutorial{tutorial_stitcher} @next_tutorial{tutorial_meanshift} +| | | +| -: | :- | +| Original author | Domenico Daniele Bloisi | +| Compatibility | OpenCV >= 3.0 | + - Background subtraction (BS) is a common and widely used technique for generating a foreground mask (namely, a binary image containing the pixels belonging to moving objects in the scene) by using static cameras. diff --git a/doc/tutorials/objdetect/cascade_classifier/cascade_classifier.markdown b/doc/tutorials/others/cascade_classifier.markdown similarity index 98% rename from doc/tutorials/objdetect/cascade_classifier/cascade_classifier.markdown rename to doc/tutorials/others/cascade_classifier.markdown index be942bdbddecaf00629952907d69eacfca7da146..8e4cd0040b276e3c29c5747487c07c63f9d785b4 100644 --- a/doc/tutorials/objdetect/cascade_classifier/cascade_classifier.markdown +++ b/doc/tutorials/others/cascade_classifier.markdown @@ -1,8 +1,14 @@ Cascade Classifier {#tutorial_cascade_classifier} ================== +@prev_tutorial{tutorial_optical_flow} @next_tutorial{tutorial_traincascade} +| | | +| -: | :- | +| Original author | Ana Huamán | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/photo/hdr_imaging/hdr_imaging.markdown b/doc/tutorials/others/hdr_imaging.markdown similarity index 98% rename from doc/tutorials/photo/hdr_imaging/hdr_imaging.markdown rename to doc/tutorials/others/hdr_imaging.markdown index 0bc15fd9b2ffecc9d4906cedcc88628b658f18d3..8c5e0a016189ec1d616231dc0975433833124de8 100644 --- a/doc/tutorials/photo/hdr_imaging/hdr_imaging.markdown +++ b/doc/tutorials/others/hdr_imaging.markdown @@ -1,6 +1,13 @@ High Dynamic Range Imaging {#tutorial_hdr_imaging} ========================== +@next_tutorial{tutorial_stitcher} + +| | | +| -: | :- | +| Original author | Fedor Morozov | +| Compatibility | OpenCV >= 3.0 | + Introduction ------------ diff --git a/doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_Scheme.png b/doc/tutorials/others/images/Background_Subtraction_Tutorial_Scheme.png similarity index 100% rename from doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_Scheme.png rename to doc/tutorials/others/images/Background_Subtraction_Tutorial_Scheme.png diff --git a/doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_frame.jpg b/doc/tutorials/others/images/Background_Subtraction_Tutorial_frame.jpg similarity index 100% rename from doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_frame.jpg rename to doc/tutorials/others/images/Background_Subtraction_Tutorial_frame.jpg diff --git a/doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_result_KNN.jpg b/doc/tutorials/others/images/Background_Subtraction_Tutorial_result_KNN.jpg similarity index 100% rename from doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_result_KNN.jpg rename to doc/tutorials/others/images/Background_Subtraction_Tutorial_result_KNN.jpg diff --git a/doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_result_MOG2.jpg b/doc/tutorials/others/images/Background_Subtraction_Tutorial_result_MOG2.jpg similarity index 100% rename from doc/tutorials/video/background_subtraction/images/Background_Subtraction_Tutorial_result_MOG2.jpg rename to doc/tutorials/others/images/Background_Subtraction_Tutorial_result_MOG2.jpg diff --git a/doc/tutorials/objdetect/cascade_classifier/images/Cascade_Classifier_Tutorial_Result_Haar.jpg b/doc/tutorials/others/images/Cascade_Classifier_Tutorial_Result_Haar.jpg similarity index 100% rename from doc/tutorials/objdetect/cascade_classifier/images/Cascade_Classifier_Tutorial_Result_Haar.jpg rename to doc/tutorials/others/images/Cascade_Classifier_Tutorial_Result_Haar.jpg diff --git a/doc/tutorials/objdetect/cascade_classifier/images/Cascade_Classifier_Tutorial_Result_LBP.jpg b/doc/tutorials/others/images/Cascade_Classifier_Tutorial_Result_LBP.jpg similarity index 100% rename from doc/tutorials/objdetect/cascade_classifier/images/Cascade_Classifier_Tutorial_Result_LBP.jpg rename to doc/tutorials/others/images/Cascade_Classifier_Tutorial_Result_LBP.jpg diff --git a/doc/tutorials/stitching/stitcher/images/affinepano.jpg b/doc/tutorials/others/images/affinepano.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/affinepano.jpg rename to doc/tutorials/others/images/affinepano.jpg diff --git a/doc/tutorials/stitching/stitcher/images/boat.jpg b/doc/tutorials/others/images/boat.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/boat.jpg rename to doc/tutorials/others/images/boat.jpg diff --git a/doc/tutorials/stitching/stitcher/images/budapest.jpg b/doc/tutorials/others/images/budapest.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/budapest.jpg rename to doc/tutorials/others/images/budapest.jpg diff --git a/doc/tutorials/stitching/stitcher/images/compressedPlaneA2B1.jpg b/doc/tutorials/others/images/compressedPlaneA2B1.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/compressedPlaneA2B1.jpg rename to doc/tutorials/others/images/compressedPlaneA2B1.jpg diff --git a/doc/tutorials/stitching/stitcher/images/fisheye.jpg b/doc/tutorials/others/images/fisheye.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/fisheye.jpg rename to doc/tutorials/others/images/fisheye.jpg diff --git a/doc/tutorials/photo/hdr_imaging/images/fusion.png b/doc/tutorials/others/images/fusion.png similarity index 100% rename from doc/tutorials/photo/hdr_imaging/images/fusion.png rename to doc/tutorials/others/images/fusion.png diff --git a/doc/tutorials/stitching/stitcher/images/gvedit.jpg b/doc/tutorials/others/images/gvedit.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/gvedit.jpg rename to doc/tutorials/others/images/gvedit.jpg diff --git a/doc/tutorials/objdetect/cascade_classifier/images/haar.png b/doc/tutorials/others/images/haar.png similarity index 100% rename from doc/tutorials/objdetect/cascade_classifier/images/haar.png rename to doc/tutorials/others/images/haar.png diff --git a/doc/tutorials/objdetect/cascade_classifier/images/haar_features.jpg b/doc/tutorials/others/images/haar_features.jpg similarity index 100% rename from doc/tutorials/objdetect/cascade_classifier/images/haar_features.jpg rename to doc/tutorials/others/images/haar_features.jpg diff --git a/doc/tutorials/photo/hdr_imaging/images/ldr.png b/doc/tutorials/others/images/ldr.png similarity index 100% rename from doc/tutorials/photo/hdr_imaging/images/ldr.png rename to doc/tutorials/others/images/ldr.png diff --git a/doc/tutorials/photo/hdr_imaging/images/memorial.png b/doc/tutorials/others/images/memorial.png similarity index 100% rename from doc/tutorials/photo/hdr_imaging/images/memorial.png rename to doc/tutorials/others/images/memorial.png diff --git a/doc/tutorials/stitching/stitcher/images/newspaper.jpg b/doc/tutorials/others/images/newspaper.jpg similarity index 100% rename from doc/tutorials/stitching/stitcher/images/newspaper.jpg rename to doc/tutorials/others/images/newspaper.jpg diff --git a/doc/tutorials/ml/introduction_to_svm/images/optimal-hyperplane.png b/doc/tutorials/others/images/optimal-hyperplane.png similarity index 100% rename from doc/tutorials/ml/introduction_to_svm/images/optimal-hyperplane.png rename to doc/tutorials/others/images/optimal-hyperplane.png diff --git a/doc/tutorials/ml/introduction_to_pca/images/pca_eigen.png b/doc/tutorials/others/images/pca_eigen.png similarity index 100% rename from doc/tutorials/ml/introduction_to_pca/images/pca_eigen.png rename to doc/tutorials/others/images/pca_eigen.png diff --git a/doc/tutorials/ml/introduction_to_pca/images/pca_line.png b/doc/tutorials/others/images/pca_line.png similarity index 100% rename from doc/tutorials/ml/introduction_to_pca/images/pca_line.png rename to doc/tutorials/others/images/pca_line.png diff --git a/doc/tutorials/ml/introduction_to_pca/images/pca_output.png b/doc/tutorials/others/images/pca_output.png similarity index 100% rename from doc/tutorials/ml/introduction_to_pca/images/pca_output.png rename to doc/tutorials/others/images/pca_output.png diff --git a/doc/tutorials/ml/introduction_to_pca/images/pca_test1.jpg b/doc/tutorials/others/images/pca_test1.jpg similarity index 100% rename from doc/tutorials/ml/introduction_to_pca/images/pca_test1.jpg rename to doc/tutorials/others/images/pca_test1.jpg diff --git a/doc/tutorials/ml/non_linear_svms/images/sample-errors-dist.png b/doc/tutorials/others/images/sample-errors-dist.png similarity index 100% rename from doc/tutorials/ml/non_linear_svms/images/sample-errors-dist.png rename to doc/tutorials/others/images/sample-errors-dist.png diff --git a/doc/tutorials/ml/introduction_to_svm/images/separating-lines.png b/doc/tutorials/others/images/separating-lines.png similarity index 100% rename from doc/tutorials/ml/introduction_to_svm/images/separating-lines.png rename to doc/tutorials/others/images/separating-lines.png diff --git a/doc/tutorials/ml/introduction_to_svm/images/svm_intro_result.png b/doc/tutorials/others/images/svm_intro_result.png similarity index 100% rename from doc/tutorials/ml/introduction_to_svm/images/svm_intro_result.png rename to doc/tutorials/others/images/svm_intro_result.png diff --git a/doc/tutorials/ml/non_linear_svms/images/svm_non_linear_result.png b/doc/tutorials/others/images/svm_non_linear_result.png similarity index 100% rename from doc/tutorials/ml/non_linear_svms/images/svm_non_linear_result.png rename to doc/tutorials/others/images/svm_non_linear_result.png diff --git a/doc/tutorials/objdetect/images/visualisation_single_stage.png b/doc/tutorials/others/images/visualisation_single_stage.png similarity index 100% rename from doc/tutorials/objdetect/images/visualisation_single_stage.png rename to doc/tutorials/others/images/visualisation_single_stage.png diff --git a/doc/tutorials/objdetect/images/visualisation_video.png b/doc/tutorials/others/images/visualisation_video.png similarity index 100% rename from doc/tutorials/objdetect/images/visualisation_video.png rename to doc/tutorials/others/images/visualisation_video.png diff --git a/doc/tutorials/ml/introduction_to_pca/introduction_to_pca.markdown b/doc/tutorials/others/introduction_to_pca.markdown similarity index 98% rename from doc/tutorials/ml/introduction_to_pca/introduction_to_pca.markdown rename to doc/tutorials/others/introduction_to_pca.markdown index c1c6c53a999b43f0b3fa94096902e76ec9b27fc4..1b9df5d5e56f404e1fd08e227a408f81677d977c 100644 --- a/doc/tutorials/ml/introduction_to_pca/introduction_to_pca.markdown +++ b/doc/tutorials/others/introduction_to_pca.markdown @@ -3,6 +3,11 @@ Introduction to Principal Component Analysis (PCA) {#tutorial_introduction_to_pc @prev_tutorial{tutorial_non_linear_svms} +| | | +| -: | :- | +| Original author | Theodore Tsesmelis | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/ml/introduction_to_svm/introduction_to_svm.markdown b/doc/tutorials/others/introduction_to_svm.markdown similarity index 98% rename from doc/tutorials/ml/introduction_to_svm/introduction_to_svm.markdown rename to doc/tutorials/others/introduction_to_svm.markdown index 13400612282faed00055f2292ce9c57cfe0ef7e9..584303d6a0482179b9cc4f54d661c5a809979787 100644 --- a/doc/tutorials/ml/introduction_to_svm/introduction_to_svm.markdown +++ b/doc/tutorials/others/introduction_to_svm.markdown @@ -1,8 +1,14 @@ Introduction to Support Vector Machines {#tutorial_introduction_to_svm} ======================================= +@prev_tutorial{tutorial_traincascade} @next_tutorial{tutorial_non_linear_svms} +| | | +| -: | :- | +| Original author | Fernando Iglesias García | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/video/meanshift/meanshift.markdown b/doc/tutorials/others/meanshift.markdown similarity index 100% rename from doc/tutorials/video/meanshift/meanshift.markdown rename to doc/tutorials/others/meanshift.markdown diff --git a/doc/tutorials/ml/non_linear_svms/non_linear_svms.markdown b/doc/tutorials/others/non_linear_svms.markdown similarity index 99% rename from doc/tutorials/ml/non_linear_svms/non_linear_svms.markdown rename to doc/tutorials/others/non_linear_svms.markdown index 025ae0cda16bd87da70b87479267d315461036d4..3bf2b00bb68d993c236af37e2e4133ebc9c29d8f 100644 --- a/doc/tutorials/ml/non_linear_svms/non_linear_svms.markdown +++ b/doc/tutorials/others/non_linear_svms.markdown @@ -4,6 +4,11 @@ Support Vector Machines for Non-Linearly Separable Data {#tutorial_non_linear_sv @prev_tutorial{tutorial_introduction_to_svm} @next_tutorial{tutorial_introduction_to_pca} +| | | +| -: | :- | +| Original author | Fernando Iglesias García | +| Compatibility | OpenCV >= 3.0 | + Goal ---- diff --git a/doc/tutorials/video/optical_flow/optical_flow.markdown b/doc/tutorials/others/optical_flow.markdown similarity index 99% rename from doc/tutorials/video/optical_flow/optical_flow.markdown rename to doc/tutorials/others/optical_flow.markdown index bcf88f7af19f701c53fff08b8371b0277e1f906c..810f6258e5b5341da3298a2cf572233c17d75b01 100644 --- a/doc/tutorials/video/optical_flow/optical_flow.markdown +++ b/doc/tutorials/others/optical_flow.markdown @@ -2,6 +2,7 @@ Optical Flow {#tutorial_optical_flow} ============ @prev_tutorial{tutorial_meanshift} +@next_tutorial{tutorial_cascade_classifier} Goal ---- diff --git a/doc/tutorials/stitching/stitcher/stitcher.markdown b/doc/tutorials/others/stitcher.markdown similarity index 97% rename from doc/tutorials/stitching/stitcher/stitcher.markdown rename to doc/tutorials/others/stitcher.markdown index 3670065bbe42406c8ee24bd888cba52b3b01f974..e1cee08f7ffd1c557a938d8294e6b021e2a7c344 100644 --- a/doc/tutorials/stitching/stitcher/stitcher.markdown +++ b/doc/tutorials/others/stitcher.markdown @@ -1,6 +1,14 @@ High level stitching API (Stitcher class) {#tutorial_stitcher} ========================================= +@prev_tutorial{tutorial_hdr_imaging} +@next_tutorial{tutorial_background_subtraction} + +| | | +| -: | :- | +| Original author | Jiri Horner | +| Compatibility | OpenCV >= 3.2 | + Goal ---- diff --git a/doc/tutorials/others/table_of_content_other.markdown b/doc/tutorials/others/table_of_content_other.markdown new file mode 100644 index 0000000000000000000000000000000000000000..a004df63e2ca1512b83e598434d1ae9ffb664576 --- /dev/null +++ b/doc/tutorials/others/table_of_content_other.markdown @@ -0,0 +1,13 @@ +Other tutorials (ml, objdetect, photo, stitching, video) {#tutorial_table_of_content_other} +======================================================== + +- photo. @subpage tutorial_hdr_imaging +- stitching. @subpage tutorial_stitcher +- video. @subpage tutorial_background_subtraction +- video. @subpage tutorial_meanshift +- video. @subpage tutorial_optical_flow +- objdetect. @subpage tutorial_cascade_classifier +- objdetect. @subpage tutorial_traincascade +- ml. @subpage tutorial_introduction_to_svm +- ml. @subpage tutorial_non_linear_svms +- ml. @subpage tutorial_introduction_to_pca diff --git a/doc/tutorials/objdetect/traincascade.markdown b/doc/tutorials/others/traincascade.markdown similarity index 99% rename from doc/tutorials/objdetect/traincascade.markdown rename to doc/tutorials/others/traincascade.markdown index 042aaccdc9c8464b8a0e5e1493a8270c2b84bd20..7f712628ef6e3bdd47e5871cd17897e377291e59 100644 --- a/doc/tutorials/objdetect/traincascade.markdown +++ b/doc/tutorials/others/traincascade.markdown @@ -2,6 +2,7 @@ Cascade Classifier Training {#tutorial_traincascade} =========================== @prev_tutorial{tutorial_cascade_classifier} +@next_tutorial{tutorial_introduction_to_svm} Introduction ------------ diff --git a/doc/tutorials/photo/images/hdr.png b/doc/tutorials/photo/images/hdr.png deleted file mode 100644 index 9d3782055c5e604949c9e1790bf12d2daf14e9ea..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/photo/images/hdr.png and /dev/null differ diff --git a/doc/tutorials/photo/table_of_content_photo.markdown b/doc/tutorials/photo/table_of_content_photo.markdown deleted file mode 100644 index 357c36996e917502337dfb3db6e46590104f9006..0000000000000000000000000000000000000000 --- a/doc/tutorials/photo/table_of_content_photo.markdown +++ /dev/null @@ -1,14 +0,0 @@ -Computational photography (photo module) {#tutorial_table_of_content_photo} -======================================== - -Use OpenCV for advanced photo processing. - -- @subpage tutorial_hdr_imaging - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 3.0 - - *Author:* Fedor Morozov - - Learn how to create and process high dynamic range images. diff --git a/doc/tutorials/stitching/table_of_content_stitching.markdown b/doc/tutorials/stitching/table_of_content_stitching.markdown deleted file mode 100644 index d5972f4343492739fefbcd2e322af3dc79f68c79..0000000000000000000000000000000000000000 --- a/doc/tutorials/stitching/table_of_content_stitching.markdown +++ /dev/null @@ -1,17 +0,0 @@ -Images stitching (stitching module) {#tutorial_table_of_content_stitching} -=================================== - -Sometimes a single image can't capture it all. Here you will learn how to join -more images together to create a large pano. Doesn't matter if you want to -create a photo panorama or you want to stitch scans. - -- @subpage tutorial_stitcher - - *Languages:* C++ - - *Compatibility:* \>= OpenCV 3.2 - - *Author:* Jiri Horner - - You will use high level stitching api to create a photo panorama. You will - learn about Stitcher class and its configurations. diff --git a/doc/tutorials/tutorials.markdown b/doc/tutorials/tutorials.markdown index 5a35077df9dfe0182423eddf202495b9010ff9a3..59aefc2b1f5c99e9b29370dccdb2b63e8da933de 100644 --- a/doc/tutorials/tutorials.markdown +++ b/doc/tutorials/tutorials.markdown @@ -4,18 +4,12 @@ OpenCV Tutorials {#tutorial_root} - @subpage tutorial_table_of_content_introduction - build and install OpenCV on your computer - @subpage tutorial_table_of_content_core - basic building blocks of the library - @subpage tutorial_table_of_content_imgproc - image processing functions -- @subpage tutorial_table_of_content_highgui - built-in graphical user interface -- @subpage tutorial_table_of_content_imgcodecs - read and write images from/to files using _imgcodecs_ module -- @subpage tutorial_table_of_content_videoio - read and write videos using _videio_ module +- @subpage tutorial_table_of_content_app - application utils (GUI, image/video input/output) - @subpage tutorial_table_of_content_calib3d - extract 3D world information from 2D images - @subpage tutorial_table_of_content_features2d - feature detectors, descriptors and matching framework -- @subpage tutorial_table_of_content_video - algorithms for video streams: motion detection, object and feature tracking, etc. -- @subpage tutorial_table_of_content_objdetect - detect objects using conventional CV methods - @subpage tutorial_table_of_content_dnn - infer neural networks using built-in _dnn_ module -- @subpage tutorial_table_of_content_ml - machine learning algorithms for statistical classification, regression and data clustering - @subpage tutorial_table_of_content_gapi - graph-based approach to computer vision algorithms building -- @subpage tutorial_table_of_content_photo - advanced photo processing -- @subpage tutorial_table_of_content_stitching - create panoramas and more using _stitching_ module +- @subpage tutorial_table_of_content_other - other modules (ml, objdetect, stitching, video, photo) - @subpage tutorial_table_of_content_ios - running OpenCV on an iDevice @cond CUDA_MODULES - @subpage tutorial_table_of_content_gpu - utilizing power of video card to run CV algorithms diff --git a/doc/tutorials/video/images/Background_Subtraction_Tutorial_Cover.jpg b/doc/tutorials/video/images/Background_Subtraction_Tutorial_Cover.jpg deleted file mode 100644 index d5c84a372280812ca5889a6bfd6c5c828e2f77f9..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/video/images/Background_Subtraction_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/video/table_of_content_video.markdown b/doc/tutorials/video/table_of_content_video.markdown deleted file mode 100644 index 1a80f716dab099da0330e9125c0c1a7f34d47416..0000000000000000000000000000000000000000 --- a/doc/tutorials/video/table_of_content_video.markdown +++ /dev/null @@ -1,28 +0,0 @@ -Video analysis (video module) {#tutorial_table_of_content_video} -============================= - -Look here in order to find use on your video stream algorithms like: motion extraction, feature -tracking and foreground extractions. - -- @subpage tutorial_background_subtraction - - *Languages:* C++, Java, Python - - *Compatibility:* \> OpenCV 2.4.6 - - *Author:* Domenico Daniele Bloisi - - We will learn how to extract foreground masks from both videos and sequences of images and - to show them. - -- @subpage tutorial_meanshift - - *Languages:* C++, Java, Python - - Learn how to use the Meanshift and Camshift algorithms to track objects in videos. - -- @subpage tutorial_optical_flow - - *Languages:* C++, Java, Python - - We will learn how to use optical flow methods to track sparse features or to create a dense representation. diff --git a/doc/tutorials/videoio/images/video-input-psnr-ssim.png b/doc/tutorials/videoio/images/video-input-psnr-ssim.png deleted file mode 100644 index de8c2835a6c1dad0ac299b7991760bc723291c20..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/videoio/images/video-input-psnr-ssim.png and /dev/null differ diff --git a/doc/tutorials/videoio/images/video-write.png b/doc/tutorials/videoio/images/video-write.png deleted file mode 100644 index 9413d80836cfdef73e6b8c2326ff48140a2badbc..0000000000000000000000000000000000000000 Binary files a/doc/tutorials/videoio/images/video-write.png and /dev/null differ diff --git a/doc/tutorials/videoio/table_of_content_videoio.markdown b/doc/tutorials/videoio/table_of_content_videoio.markdown deleted file mode 100644 index 393a0fc236fe35174d6d4d211213ff19a8d473a9..0000000000000000000000000000000000000000 --- a/doc/tutorials/videoio/table_of_content_videoio.markdown +++ /dev/null @@ -1,35 +0,0 @@ -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 - - *Languages:* C++, Python - - *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 - - *Languages:* C++ - - *Compatibility:* \> OpenCV 2.0 - - *Author:* Bernát Gábor - -- @subpage tutorial_kinect_openni - - *Languages:* C++ - -- @subpage tutorial_orbbec_astra - - *Languages:* C++ - -- @subpage tutorial_intelperc - - *Languages:* C++