diff --git a/doc/tutorials/core/adding_images/adding_images.rst b/doc/tutorials/core/adding_images/adding_images.rst index 06b59610f9..e37f4f7064 100644 --- a/doc/tutorials/core/adding_images/adding_images.rst +++ b/doc/tutorials/core/adding_images/adding_images.rst @@ -116,4 +116,4 @@ Result .. image:: images/Adding_Images_Tutorial_Result_0.jpg :alt: Blending Images Tutorial - Final Result - :align: center + :align: center \ No newline at end of file diff --git a/doc/tutorials/core/adding_images/images/Adding_Images_Tutorial_Result_0.jpg b/doc/tutorials/core/adding_images/images/Adding_Images_Tutorial_Result_0.jpg index 596dd57a2c..f5c4526c44 100644 Binary files a/doc/tutorials/core/adding_images/images/Adding_Images_Tutorial_Result_0.jpg and b/doc/tutorials/core/adding_images/images/Adding_Images_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst b/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst index 5e4d5652f1..068ebc10d3 100644 --- a/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst +++ b/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst @@ -260,6 +260,6 @@ Result Compiling and running your program should give you a result like this: -.. image:: images/Drawing_1_Tutorial_Result_0.jpg +.. image:: images/Drawing_1_Tutorial_Result_0.png :alt: Drawing Tutorial 1 - Final Result :align: center diff --git a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0.jpg b/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0.jpg deleted file mode 100644 index ac01ca44f9..0000000000 Binary files a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0.jpg and /dev/null differ diff --git a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0.png b/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0.png new file mode 100644 index 0000000000..29abc4a123 Binary files /dev/null and b/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0.png differ diff --git a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0a.jpg b/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0a.jpg deleted file mode 100644 index b03f4d4f31..0000000000 Binary files a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0a.jpg and /dev/null differ diff --git a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0b.jpg b/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0b.jpg deleted file mode 100644 index 4dfce32ece..0000000000 Binary files a/doc/tutorials/core/basic_geometric_drawing/images/Drawing_1_Tutorial_Result_0b.jpg and /dev/null differ diff --git a/doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst b/doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst index 7076159fc5..d5c9a268d6 100644 --- a/doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst +++ b/doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst @@ -92,9 +92,10 @@ Code { for( int x = 0; x < image.cols; x++ ) { for( int c = 0; c < 3; c++ ) { - new_image.at(y,x)[c] = saturate_cast( alpha*( image.at(y,x)[c] ) + beta ); + new_image.at(y,x)[c] = + saturate_cast( alpha*( image.at(y,x)[c] ) + beta ); } - } + } } /// Create Windows @@ -145,8 +146,9 @@ Explanation for( int y = 0; y < image.rows; y++ ) { for( int x = 0; x < image.cols; x++ ) { for( int c = 0; c < 3; c++ ) - { new_image.at(y,x)[c] = saturate_cast( alpha*( image.at(y,x)[c] ) + beta ); } - } + { new_image.at(y,x)[c] = + saturate_cast( alpha*( image.at(y,x)[c] ) + beta ); } + } } Notice the following: @@ -194,6 +196,5 @@ Result * We get this: .. image:: images/Basic_Linear_Transform_Tutorial_Result_0.jpg - :height: 400px :alt: Basic Linear Transform - Final Result - :align: center + :align: center \ No newline at end of file diff --git a/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_Tutorial_Result_0.jpg b/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_Tutorial_Result_0.jpg index 7caffecd52..527367cc92 100644 Binary files a/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_Tutorial_Result_0.jpg and b/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_a.jpg b/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_a.jpg deleted file mode 100644 index cc805da486..0000000000 Binary files a/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_a.jpg and /dev/null differ diff --git a/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_b.jpg b/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_b.jpg deleted file mode 100644 index fbbf77f2de..0000000000 Binary files a/doc/tutorials/core/basic_linear_transform/images/Basic_Linear_Transform_b.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut1.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut1.jpg deleted file mode 100644 index 0f559bc7dc..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut1.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut1.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut1.png new file mode 100644 index 0000000000..414fba4ac7 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut1.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut10.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut10.jpg deleted file mode 100644 index 4647737df9..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut10.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut10.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut10.png new file mode 100644 index 0000000000..425dde830c Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut10.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut11.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut11.jpg deleted file mode 100644 index cc2adf62d6..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut11.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut11.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut11.png new file mode 100644 index 0000000000..37db1db2bb Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut11.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut12.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut12.jpg deleted file mode 100644 index 57f333dfd4..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut12.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut12.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut12.png new file mode 100644 index 0000000000..765275374b Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut12.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut13.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut13.jpg deleted file mode 100644 index 29d89ee243..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut13.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut13.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut13.png new file mode 100644 index 0000000000..95fece4626 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut13.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut14.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut14.jpg deleted file mode 100644 index c32d3008f2..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut14.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut14.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut14.png new file mode 100644 index 0000000000..50bad2a77d Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut14.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut15.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut15.jpg deleted file mode 100644 index 6bfcd0d0cd..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut15.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut15.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut15.png new file mode 100644 index 0000000000..08514cee48 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut15.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut16.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut16.jpg deleted file mode 100644 index b4f5902cab..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut16.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut16.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut16.png new file mode 100644 index 0000000000..1420957136 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut16.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut2.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut2.jpg deleted file mode 100644 index a9012c4da1..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut2.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut2.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut2.png new file mode 100644 index 0000000000..0efb6c61f9 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut2.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut3.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut3.jpg deleted file mode 100644 index ef79387533..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut3.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut3.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut3.png new file mode 100644 index 0000000000..046705f08d Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut3.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut6.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut6.jpg deleted file mode 100644 index e79bd9909c..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut6.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut6.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut6.png new file mode 100644 index 0000000000..8e1cf63721 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut6.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut7.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut7.jpg deleted file mode 100644 index 7aec2d3c2d..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut7.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut7.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut7.png new file mode 100644 index 0000000000..211595e7a3 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut7.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut8.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut8.jpg deleted file mode 100644 index 56e8322fff..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut8.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut8.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut8.png new file mode 100644 index 0000000000..70c3eaa4e0 Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut8.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut9.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut9.jpg deleted file mode 100644 index 9138b86181..0000000000 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut9.jpg and /dev/null differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut9.png b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut9.png new file mode 100644 index 0000000000..674712566e Binary files /dev/null and b/doc/tutorials/core/mat - the basic image container/images/MatBasicContainerOut9.png differ diff --git a/doc/tutorials/core/mat - the basic image container/images/MatBasicImageForComputer.jpg b/doc/tutorials/core/mat - the basic image container/images/MatBasicImageForComputer.jpg index 8fb8cde1e0..0277296808 100644 Binary files a/doc/tutorials/core/mat - the basic image container/images/MatBasicImageForComputer.jpg and b/doc/tutorials/core/mat - the basic image container/images/MatBasicImageForComputer.jpg differ diff --git a/doc/tutorials/core/mat - the basic image container/mat - the basic image container.rst b/doc/tutorials/core/mat - the basic image container/mat - the basic image container.rst index 6da3eedc65..b2d20e19ba 100644 --- a/doc/tutorials/core/mat - the basic image container/mat - the basic image container.rst +++ b/doc/tutorials/core/mat - the basic image container/mat - the basic image container.rst @@ -97,7 +97,7 @@ Although *Mat* is a great class as image container it is also a general matrix c :tab-width: 4 :lines: 27-28 - .. image:: images/MatBasicContainerOut1.jpg + .. image:: images/MatBasicContainerOut1.png :alt: Demo image of the matrix output :align: center @@ -125,7 +125,7 @@ Although *Mat* is a great class as image container it is also a general matrix c .. code-block:: cpp - IplImage* img = cvLoadImage("greatwave.jpg", 1); + IplImage* img = cvLoadImage("greatwave.png", 1); Mat mtx(img); // convert IplImage* -> Mat + :basicstructures:`Create() ` function: @@ -135,7 +135,7 @@ Although *Mat* is a great class as image container it is also a general matrix c :tab-width: 4 :lines: 31-32 - .. image:: images/MatBasicContainerOut2.jpg + .. image:: images/MatBasicContainerOut2.png :alt: Demo image of the matrix output :align: center @@ -148,7 +148,7 @@ Although *Mat* is a great class as image container it is also a general matrix c :tab-width: 4 :lines: 40-47 - .. image:: images/MatBasicContainerOut3.jpg + .. image:: images/MatBasicContainerOut3.png :alt: Demo image of the matrix output :align: center @@ -159,7 +159,7 @@ Although *Mat* is a great class as image container it is also a general matrix c :tab-width: 4 :lines: 50-51 - .. image:: images/MatBasicContainerOut6.jpg + .. image:: images/MatBasicContainerOut6.png :alt: Demo image of the matrix output :align: center @@ -170,7 +170,7 @@ Although *Mat* is a great class as image container it is also a general matrix c :tab-width: 4 :lines: 53-54 - .. image:: images/MatBasicContainerOut7.jpg + .. image:: images/MatBasicContainerOut7.png :alt: Demo image of the matrix output :align: center @@ -197,7 +197,7 @@ In the above examples you could see the default formatting option. Nevertheless, :tab-width: 4 :lines: 61 - .. image:: images/MatBasicContainerOut8.jpg + .. image:: images/MatBasicContainerOut8.png :alt: Default Output :align: center @@ -208,7 +208,7 @@ In the above examples you could see the default formatting option. Nevertheless, :tab-width: 4 :lines: 62 - .. image:: images/MatBasicContainerOut16.jpg + .. image:: images/MatBasicContainerOut16.png :alt: Default Output :align: center @@ -219,7 +219,7 @@ In the above examples you could see the default formatting option. Nevertheless, :tab-width: 4 :lines: 64 - .. image:: images/MatBasicContainerOut10.jpg + .. image:: images/MatBasicContainerOut10.png :alt: Default Output :align: center @@ -230,7 +230,7 @@ In the above examples you could see the default formatting option. Nevertheless, :tab-width: 4 :lines: 63 - .. image:: images/MatBasicContainerOut9.jpg + .. image:: images/MatBasicContainerOut9.png :alt: Default Output :align: center @@ -241,7 +241,7 @@ In the above examples you could see the default formatting option. Nevertheless, :tab-width: 4 :lines: 65 - .. image:: images/MatBasicContainerOut11.jpg + .. image:: images/MatBasicContainerOut11.png :alt: Default Output :align: center @@ -259,7 +259,7 @@ OpenCV offers support for print of other common OpenCV data structures too via t :tab-width: 4 :lines: 67-68 - .. image:: images/MatBasicContainerOut12.jpg + .. image:: images/MatBasicContainerOut12.png :alt: Default Output :align: center @@ -271,7 +271,7 @@ OpenCV offers support for print of other common OpenCV data structures too via t :tab-width: 4 :lines: 70-71 - .. image:: images/MatBasicContainerOut13.jpg + .. image:: images/MatBasicContainerOut13.png :alt: Default Output :align: center @@ -282,7 +282,7 @@ OpenCV offers support for print of other common OpenCV data structures too via t :tab-width: 4 :lines: 74-77 - .. image:: images/MatBasicContainerOut14.jpg + .. image:: images/MatBasicContainerOut14.png :alt: Default Output :align: center @@ -293,7 +293,7 @@ OpenCV offers support for print of other common OpenCV data structures too via t :tab-width: 4 :lines: 79-83 - .. image:: images/MatBasicContainerOut15.jpg + .. image:: images/MatBasicContainerOut15.png :alt: Default Output :align: center diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_0.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_0.jpg index f483af99db..7c66c50d2f 100644 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_0.jpg and b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_1.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_1.jpg deleted file mode 100644 index 07b7c26279..0000000000 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_1.jpg and /dev/null differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_2.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_2.jpg index 97767e3371..81e9313ab2 100644 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_2.jpg and b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_2.jpg differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_3.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_3.jpg index ca1218c7ee..20e274dcfc 100644 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_3.jpg and b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_3.jpg differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_4.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_4.jpg deleted file mode 100644 index 458811574c..0000000000 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_4.jpg and /dev/null differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_5.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_5.jpg index 204ccb1c23..a540fb4259 100644 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_5.jpg and b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_5.jpg differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_6.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_6.jpg deleted file mode 100644 index fa6078ce63..0000000000 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_6.jpg and /dev/null differ diff --git a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_7.jpg b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_7.jpg index 3cc9414410..cc38466e23 100644 Binary files a/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_7.jpg and b/doc/tutorials/core/random_generator_and_text/images/Drawing_2_Tutorial_Result_7.jpg differ diff --git a/doc/tutorials/core/random_generator_and_text/random_generator_and_text.rst b/doc/tutorials/core/random_generator_and_text/random_generator_and_text.rst index 8a9b0def21..5e3f1dec65 100644 --- a/doc/tutorials/core/random_generator_and_text/random_generator_and_text.rst +++ b/doc/tutorials/core/random_generator_and_text/random_generator_and_text.rst @@ -230,56 +230,35 @@ As you just saw in the Code section, the program will sequentially execute diver #. First a random set of *NUMBER* lines will appear on screen such as it can be seen in this screenshot: .. image:: images/Drawing_2_Tutorial_Result_0.jpg - :height: 300px :alt: Drawing Tutorial 2 - Final Result 0 :align: center -#. Then, a new set of figures, these time *rectangles* will follow: - - .. image:: images/Drawing_2_Tutorial_Result_1.jpg - :height: 300px - :alt: Drawing Tutorial 2 - Final Result 1 - :align: center +#. Then, a new set of figures, these time *rectangles* will follow. #. Now some ellipses will appear, each of them with random position, size, thickness and arc length: .. image:: images/Drawing_2_Tutorial_Result_2.jpg - :height: 300px :alt: Drawing Tutorial 2 - Final Result 2 :align: center #. Now, *polylines* with 03 segments will appear on screen, again in random configurations. .. image:: images/Drawing_2_Tutorial_Result_3.jpg - :height: 300px :alt: Drawing Tutorial 2 - Final Result 3 :align: center -#. Filled polygons (in this example triangles) will follow: - - .. image:: images/Drawing_2_Tutorial_Result_4.jpg - :height: 300px - :alt: Drawing Tutorial 2 - Final Result 4 - :align: center +#. Filled polygons (in this example triangles) will follow. #. The last geometric figure to appear: circles! .. image:: images/Drawing_2_Tutorial_Result_5.jpg - :height: 300px :alt: Drawing Tutorial 2 - Final Result 5 :align: center #. Near the end, the text *"Testing Text Rendering"* will appear in a variety of fonts, sizes, colors and positions. - .. image:: images/Drawing_2_Tutorial_Result_6.jpg - :height: 300px - :alt: Drawing Tutorial 2 - Final Result 6 - :align: center - #. And the big end (which by the way expresses a big truth too): .. image:: images/Drawing_2_Tutorial_Result_7.jpg - :height: 300px :alt: Drawing Tutorial 2 - Final Result 7 - :align: center - + :align: center \ No newline at end of file diff --git a/doc/tutorials/core/table_of_content_core/images/Adding_Images_Tutorial_Result_0.jpg b/doc/tutorials/core/table_of_content_core/images/Adding_Images_Tutorial_Result_0.jpg index 2775154394..940b54c82f 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/Adding_Images_Tutorial_Result_0.jpg and b/doc/tutorials/core/table_of_content_core/images/Adding_Images_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg b/doc/tutorials/core/table_of_content_core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg index 54d3419b9e..eccf37aa20 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg and b/doc/tutorials/core/table_of_content_core/images/Basic_Linear_Transform_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/Drawing_1_Tutorial_Result_0.jpg b/doc/tutorials/core/table_of_content_core/images/Drawing_1_Tutorial_Result_0.jpg index e3718a41a5..05e8f01232 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/Drawing_1_Tutorial_Result_0.jpg and b/doc/tutorials/core/table_of_content_core/images/Drawing_1_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/Drawing_2_Tutorial_Result_7.jpg b/doc/tutorials/core/table_of_content_core/images/Drawing_2_Tutorial_Result_7.jpg index cd04700d65..d650c18427 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/Drawing_2_Tutorial_Result_7.jpg and b/doc/tutorials/core/table_of_content_core/images/Drawing_2_Tutorial_Result_7.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/Morphology_1_Tutorial_Cover.jpg b/doc/tutorials/core/table_of_content_core/images/Morphology_1_Tutorial_Cover.jpg index cdb78d3e08..71509ba5b8 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/Morphology_1_Tutorial_Cover.jpg and b/doc/tutorials/core/table_of_content_core/images/Morphology_1_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/Smoothing_Tutorial_Cover.jpg b/doc/tutorials/core/table_of_content_core/images/Smoothing_Tutorial_Cover.jpg index f6cd1606e2..c11f2ed024 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/Smoothing_Tutorial_Cover.jpg and b/doc/tutorials/core/table_of_content_core/images/Smoothing_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/howToScanImages.jpg b/doc/tutorials/core/table_of_content_core/images/howToScanImages.jpg index a269eb6e84..4e0fa26d0d 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/howToScanImages.jpg and b/doc/tutorials/core/table_of_content_core/images/howToScanImages.jpg differ diff --git a/doc/tutorials/core/table_of_content_core/images/matTheBasicImageStructure.jpg b/doc/tutorials/core/table_of_content_core/images/matTheBasicImageStructure.jpg index 013180bee2..ab6704a3c9 100644 Binary files a/doc/tutorials/core/table_of_content_core/images/matTheBasicImageStructure.jpg and b/doc/tutorials/core/table_of_content_core/images/matTheBasicImageStructure.jpg differ diff --git a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg index 6eb4f934fa..61ec8d1d89 100644 Binary files a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg and b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Corner_Subpixeles_Cover.jpg differ diff --git a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg index 08b4739dc2..89fc7bef7c 100644 Binary files a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg and b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Generic_Corner_Detector_Cover.jpg differ diff --git a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Harris_Detector_Cover.jpg b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Harris_Detector_Cover.jpg index bce3bb6cda..bc4d816e32 100644 Binary files a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Harris_Detector_Cover.jpg and b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Harris_Detector_Cover.jpg differ diff --git a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg index 8770065f25..e0ee608d9c 100644 Binary files a/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg and b/doc/tutorials/features2d/table_of_content_features2d/images/trackingmotion/Shi_Tomasi_Detector_Cover.jpg differ diff --git a/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst b/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst index 9af8b15c48..e3291a8556 100644 --- a/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst +++ b/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst @@ -55,7 +55,7 @@ This tutorial code's is shown lines below. You can also download it from `here < namedWindow( source_window, CV_WINDOW_AUTOSIZE ); /// Create Trackbar to set the number of corners - createTrackbar( "Max corners:", source_window, &maxCorners, maxTrackbar, goodFeaturesToTrack_Demo ); + createTrackbar( "Max corners:", source_window, &maxCorners, maxTrackbar, goodFeaturesToTrack_Demo); imshow( source_window, src ); @@ -101,7 +101,8 @@ This tutorial code's is shown lines below. You can also download it from `here < cout<<"** Number of corners detected: "<(j,i) > myShiTomasi_minVal + ( myShiTomasi_maxVal - myShiTomasi_minVal )*myShiTomasi_qualityLevel/max_qualityLevel ) - { circle( myShiTomasi_copy, Point(i,j), 4, Scalar( rng.uniform(0,255), rng.uniform(0,255), rng.uniform(0,255) ), -1, 8, 0 ); } + if( myShiTomasi_dst.at(j,i) > myShiTomasi_minVal + ( myShiTomasi_maxVal - + myShiTomasi_minVal )*myShiTomasi_qualityLevel/max_qualityLevel ) + { circle( myShiTomasi_copy, Point(i,j), 4, Scalar( rng.uniform(0,255), + rng.uniform(0,255), rng.uniform(0,255) ), -1, 8, 0 ); } } } imshow( myShiTomasi_window, myShiTomasi_copy ); @@ -129,8 +133,10 @@ This tutorial code's is shown lines below. You can also download it from `here < for( int j = 0; j < src_gray.rows; j++ ) { for( int i = 0; i < src_gray.cols; i++ ) { - if( Mc.at(j,i) > myHarris_minVal + ( myHarris_maxVal - myHarris_minVal )*myHarris_qualityLevel/max_qualityLevel ) - { circle( myHarris_copy, Point(i,j), 4, Scalar( rng.uniform(0,255), rng.uniform(0,255), rng.uniform(0,255) ), -1, 8, 0 ); } + if( Mc.at(j,i) > myHarris_minVal + ( myHarris_maxVal - myHarris_minVal ) + *myHarris_qualityLevel/max_qualityLevel ) + { circle( myHarris_copy, Point(i,j), 4, Scalar( rng.uniform(0,255), rng.uniform(0,255), + rng.uniform(0,255) ), -1, 8, 0 ); } } } imshow( myHarris_window, myHarris_copy ); @@ -145,11 +151,9 @@ Result ====== .. image:: images/My_Harris_corner_detector_Result.jpg - :height: 200pt :align: center .. image:: images/My_Shi_Tomasi_corner_detector_Result.jpg - :height: 200pt :align: center diff --git a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Harris_corner_detector_Result.jpg b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Harris_corner_detector_Result.jpg index 978eef16dc..d2ef409b19 100644 Binary files a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Harris_corner_detector_Result.jpg and b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Harris_corner_detector_Result.jpg differ diff --git a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Shi_Tomasi_corner_detector_Result.jpg b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Shi_Tomasi_corner_detector_Result.jpg index 08b4739dc2..0cca430d8c 100644 Binary files a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Shi_Tomasi_corner_detector_Result.jpg and b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/images/My_Shi_Tomasi_corner_detector_Result.jpg differ diff --git a/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst b/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst index 9721ef88c8..00782364b2 100644 --- a/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst +++ b/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst @@ -102,7 +102,8 @@ This tutorial code's is shown lines below. You can also download it from `here < cout<<"** Number of corners detected: "< OpenCV 2.0 - - We will learn how to add a Trackbar to our applications - - =============== ====================================================== - - .. |Beginners_5| image:: images/Adding_Trackbars_Tutorial_Cover.jpg - :height: 100pt - :width: 100pt ++ + .. tabularcolumns:: m{100pt} m{300pt} + .. cssclass:: toctableopencv + + =============== ====================================================== + |Beginners_5| *Title:* :ref:`Adding_Trackbars` + + *Compatibility:* > OpenCV 2.0 + + We will learn how to add a Trackbar to our applications + + =============== ====================================================== + + .. |Beginners_5| image:: images/Adding_Trackbars_Tutorial_Cover.jpg + :height: 90pt + :width: 90pt .. raw:: latex diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Cover.jpg b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Cover.jpg deleted file mode 100644 index f79f147d6b..0000000000 Binary files a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_0.jpg b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_0.jpg index 5c7c59ce84..d18529711b 100644 Binary files a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_0.jpg and b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1.jpg b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1.jpg index cbd5ff48c0..a1ef11f9c6 100644 Binary files a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1.jpg and b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1.jpg differ diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1a.jpg b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1a.jpg deleted file mode 100644 index dfc91fdeac..0000000000 Binary files a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1a.jpg and /dev/null differ diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1b.jpg b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1b.jpg deleted file mode 100644 index fd3c71844c..0000000000 Binary files a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Result_1b.jpg and /dev/null differ diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.jpg b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.jpg deleted file mode 100644 index cde081fffc..0000000000 Binary files a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.jpg and /dev/null differ diff --git a/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.png b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.png new file mode 100644 index 0000000000..16a6feec5a Binary files /dev/null and b/doc/tutorials/highgui/trackbar/images/Adding_Trackbars_Tutorial_Trackbar.png differ diff --git a/doc/tutorials/highgui/trackbar/trackbar.rst b/doc/tutorials/highgui/trackbar/trackbar.rst index 1a4b801783..21f8b3687c 100644 --- a/doc/tutorials/highgui/trackbar/trackbar.rst +++ b/doc/tutorials/highgui/trackbar/trackbar.rst @@ -7,7 +7,7 @@ Adding a Trackbar to our applications! * Well, it is time to use some fancy GUI tools. OpenCV provides some GUI utilities (*highgui.h*) for you. An example of this is a **Trackbar** - .. image:: images/Adding_Trackbars_Tutorial_Trackbar.jpg + .. image:: images/Adding_Trackbars_Tutorial_Trackbar.png :alt: Trackbar example :align: center @@ -153,7 +153,6 @@ Result .. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg :alt: Adding Trackbars - Lena - :height: 500px :align: center diff --git a/doc/tutorials/images/calib3d.jpg b/doc/tutorials/images/calib3d.jpg index d54050cf64..c5226a9a1d 100644 Binary files a/doc/tutorials/images/calib3d.jpg and b/doc/tutorials/images/calib3d.jpg differ diff --git a/doc/tutorials/images/core.jpg b/doc/tutorials/images/core.jpg index 884522884a..6fe819bd52 100644 Binary files a/doc/tutorials/images/core.jpg and b/doc/tutorials/images/core.jpg differ diff --git a/doc/tutorials/images/feature2D.jpg b/doc/tutorials/images/feature2D.jpg index bf6f44bba2..6744de0610 100644 Binary files a/doc/tutorials/images/feature2D.jpg and b/doc/tutorials/images/feature2D.jpg differ diff --git a/doc/tutorials/images/general.jpg b/doc/tutorials/images/general.jpg index 6ab3054622..95829d9c64 100644 Binary files a/doc/tutorials/images/general.jpg and b/doc/tutorials/images/general.jpg differ diff --git a/doc/tutorials/images/gpu.jpg b/doc/tutorials/images/gpu.jpg index 7f81e4ce6e..4cc053895c 100644 Binary files a/doc/tutorials/images/gpu.jpg and b/doc/tutorials/images/gpu.jpg differ diff --git a/doc/tutorials/images/highgui.jpg b/doc/tutorials/images/highgui.jpg index 522183ce53..ada65fcb03 100644 Binary files a/doc/tutorials/images/highgui.jpg and b/doc/tutorials/images/highgui.jpg differ diff --git a/doc/tutorials/images/imgproc.jpg b/doc/tutorials/images/imgproc.jpg index c55abbea73..ad7dafb0b7 100644 Binary files a/doc/tutorials/images/imgproc.jpg and b/doc/tutorials/images/imgproc.jpg differ diff --git a/doc/tutorials/images/introduction.jpg b/doc/tutorials/images/introduction.jpg index b6e4a8f238..19a9284785 100644 Binary files a/doc/tutorials/images/introduction.jpg and b/doc/tutorials/images/introduction.jpg differ diff --git a/doc/tutorials/images/ml.jpg b/doc/tutorials/images/ml.jpg index 2d534797bd..40acfcfbfd 100644 Binary files a/doc/tutorials/images/ml.jpg and b/doc/tutorials/images/ml.jpg differ diff --git a/doc/tutorials/images/objdetect.jpg b/doc/tutorials/images/objdetect.jpg index 06216a85c2..c811f348f5 100644 Binary files a/doc/tutorials/images/objdetect.jpg and b/doc/tutorials/images/objdetect.jpg differ diff --git a/doc/tutorials/images/video.jpg b/doc/tutorials/images/video.jpg index 940062292e..dd5d0c4ed2 100644 Binary files a/doc/tutorials/images/video.jpg and b/doc/tutorials/images/video.jpg differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst b/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst index 04934628a9..601abb893b 100644 --- a/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst +++ b/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst @@ -34,9 +34,8 @@ Morphological Operations * We will explain dilation and erosion briefly, using the following image as an example: - .. image:: images/Morphology_1_Tutorial_Theory_Original_Image.jpg + .. image:: images/Morphology_1_Tutorial_Theory_Original_Image.png :alt: Original image - :height: 100px :align: center Dilation @@ -48,9 +47,8 @@ Dilation * As the kernel :math:`B` is scanned over the image, we compute the maximal pixel value overlapped by :math:`B` and replace the image pixel in the anchor point position with that maximal value. As you can deduce, this maximizing operation causes bright regions within an image to "grow" (therefore the name *dilation*). Take as an example the image above. Applying dilation we can get: - .. image:: images/Morphology_1_Tutorial_Theory_Dilation.jpg + .. image:: images/Morphology_1_Tutorial_Theory_Dilation.png :alt: Dilation result - Theory example - :height: 100px :align: center The background (bright) dilates around the black regions of the letter. @@ -64,9 +62,8 @@ Erosion * Analagously to the example for dilation, we can apply the erosion operator to the original image (shown above). You can see in the result below that the bright areas of the image (the background, apparently), get thinner, whereas the dark zones (the "writing"( gets bigger. - .. image:: images/Morphology_1_Tutorial_Theory_Erosion.jpg + .. image:: images/Morphology_1_Tutorial_Theory_Erosion.png :alt: Erosion result - Theory example - :height: 100px :align: center @@ -268,13 +265,10 @@ Results .. image:: images/Morphology_1_Tutorial_Original_Image.jpg :alt: Original image - :height: 200px :align: center We get the results below. Varying the indices in the Trackbars give different output images, naturally. Try them out! You can even try to add a third Trackbar to control the number of iterations. .. image:: images/Morphology_1_Tutorial_Cover.jpg :alt: Dilation and Erosion application - :height: 400px - :align: center - + :align: center \ No newline at end of file diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Cover.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Cover.jpg index 6542612b5c..64de099f70 100644 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Dilation_Result.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Dilation_Result.jpg index ed262dacd0..f5dcfcca0f 100644 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Dilation_Result.jpg and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Dilation_Result.jpg differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Erosion_Result.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Erosion_Result.jpg index d3f2f61d85..bda78a60e7 100644 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Erosion_Result.jpg and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Erosion_Result.jpg differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Original_Image.jpg index 727df90782..5b61a95527 100644 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Dilation.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Dilation.jpg deleted file mode 100644 index ed27a494ac..0000000000 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Dilation.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Dilation.png b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Dilation.png new file mode 100644 index 0000000000..dae930ec1e Binary files /dev/null and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Dilation.png differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Erosion.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Erosion.jpg deleted file mode 100644 index cfa497fc21..0000000000 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Erosion.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Erosion.png b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Erosion.png new file mode 100644 index 0000000000..755561023f Binary files /dev/null and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Erosion.png differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Original_Image.jpg b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Original_Image.jpg deleted file mode 100644 index c734bb0d5a..0000000000 Binary files a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Original_Image.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Original_Image.png b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Original_Image.png new file mode 100644 index 0000000000..d7e8a9a429 Binary files /dev/null and b/doc/tutorials/imgproc/erosion_dilatation/images/Morphology_1_Tutorial_Theory_Original_Image.png differ diff --git a/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst b/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst index 37e23779d1..379ce0cc80 100644 --- a/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst +++ b/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst @@ -69,7 +69,6 @@ Gaussian Filter * Just to make the picture clearer, remember how a 1D Gaussian kernel look like? .. image:: images/Smoothing_Tutorial_theory_gaussian_0.jpg - :height: 100pt :align: center Assuming that an image is 1D, you can notice that the pixel located in the middle would have the biggest weight. The weight of its neighbors decreases as the spatial distance between them and the center pixel increases. @@ -324,5 +323,4 @@ Results .. image:: images/Smoothing_Tutorial_Result_Median_Filter.jpg :alt: Smoothing with a median filter - :height: 200pt :align: center diff --git a/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/images/Smoothing_Tutorial_Result_Median_Filter.jpg b/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/images/Smoothing_Tutorial_Result_Median_Filter.jpg index 38a822b2fc..da5f1bac00 100644 Binary files a/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/images/Smoothing_Tutorial_Result_Median_Filter.jpg and b/doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/images/Smoothing_Tutorial_Result_Median_Filter.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/back_projection.rst b/doc/tutorials/imgproc/histograms/back_projection/back_projection.rst index e975f4c677..f6512f6c29 100644 --- a/doc/tutorials/imgproc/histograms/back_projection/back_projection.rst +++ b/doc/tutorials/imgproc/histograms/back_projection/back_projection.rst @@ -47,11 +47,9 @@ How does it work? ====== ====== .. |T0| image:: images/Back_Projection_Theory0.jpg - :height: 200pt :align: middle .. |T1| image:: images/Back_Projection_Theory1.jpg - :height: 200pt :align: middle @@ -62,11 +60,9 @@ How does it work? ====== ====== .. |T2| image:: images/Back_Projection_Theory2.jpg - :height: 200pt :align: middle .. |T3| image:: images/Back_Projection_Theory3.jpg - :height: 200pt :align: middle @@ -81,7 +77,6 @@ How does it work? d. Applying the steps above, we get the following BackProjection image for our Test Image: .. image:: images/Back_Projection_Theory4.jpg - :height: 200pt :align: center e. In terms of statistics, the values stored in *BackProjection* represent the *probability* that a pixel in *Test Image* belongs to a skin area, based on the *model histogram* that we use. For instance in our Test image, the brighter areas are more probable to be skin area (as they actually are), whereas the darker areas have less probability (notice that these "dark" areas belong to surfaces that have some shadow on it, which in turns affects the detection). @@ -301,13 +296,10 @@ Results ====== ====== ====== .. |R0| image:: images/Back_Projection1_Source_Image.jpg - :height: 200pt :align: middle .. |R1| image:: images/Back_Projection1_Histogram.jpg - :height: 200pt :align: middle .. |R2| image:: images/Back_Projection1_BackProj.jpg - :height: 200pt :align: middle diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_BackProj.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_BackProj.jpg index c45f7479fe..baf9cc28ec 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_BackProj.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_BackProj.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Histogram.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Histogram.jpg index 1ac0199782..b2d6a2dfbe 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Histogram.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Histogram.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Source_Image.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Source_Image.jpg index 3feb2a0277..21ed375fcf 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Source_Image.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection1_Source_Image.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_BackProj.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_BackProj.jpg index b805302785..5f3824ccfb 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_BackProj.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_BackProj.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Mask.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Mask.jpg index 2684f0689d..38cd4c8251 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Mask.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Mask.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Source_Image.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Source_Image.jpg index 332336847b..0c5c6f91d1 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Source_Image.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection2_Source_Image.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory0.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory0.jpg index 4c42898ec3..8d0ac9e4ab 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory0.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory0.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory1.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory1.jpg index 1b8da16661..4107e5e976 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory1.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory1.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory2.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory2.jpg index 2b84056a31..5f2b2f23dd 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory2.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory2.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory3.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory3.jpg index feba2bf3ee..cca1e81fda 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory3.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory3.jpg differ diff --git a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory4.jpg b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory4.jpg index 5afc3d8ffb..55ca013ba7 100644 Binary files a/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory4.jpg and b/doc/tutorials/imgproc/histograms/back_projection/images/Back_Projection_Theory4.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst b/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst index 833ff699ae..e8eb67f214 100644 --- a/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst +++ b/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst @@ -34,7 +34,6 @@ What are histograms? .. image:: images/Histogram_Calculation_Theory_Hist0.jpg - :height: 300pt :align: center * What happens if we want to *count* this data in an organized way? Since we know that the *range* of information value for this case is 256 values, we can segment our range in subparts (called **bins**) like: @@ -49,7 +48,6 @@ What are histograms? .. image:: images/Histogram_Calculation_Theory_Hist1.jpg - :height: 150pt :align: center * This was just a simple example of how an histogram works and why it is useful. An histogram can keep count not only of color intensities, but of whatever image features that we want to measure (i.e. gradients, directions, etc). @@ -324,12 +322,10 @@ Result #. Using as input argument an image like the shown below: .. image:: images/Histogram_Calculation_Original_Image.jpg - :height: 150pt :align: center #. Produces the following histogram: .. image:: images/Histogram_Calculation_Result.jpg - :height: 200pt :align: center diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Original_Image.jpg b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Original_Image.jpg index 06d6e328c9..d9da998b5c 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Original_Image.jpg and b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Result.jpg b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Result.jpg index 4915557632..07b7e320d1 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Result.jpg and b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Result.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist0.jpg b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist0.jpg index 7f6947e72c..07ba95dbbe 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist0.jpg and b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist0.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist1.jpg b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist1.jpg index 6fed3fdefa..7e420ba13b 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist1.jpg and b/doc/tutorials/imgproc/histograms/histogram_calculation/images/Histogram_Calculation_Theory_Hist1.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst b/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst index c96b27ee81..5dbae046d3 100644 --- a/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst +++ b/doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst @@ -272,15 +272,12 @@ Results ============ ============ ============ .. |Base_0| image:: images/Histogram_Comparison_Source_0.jpg - :height: 150pt :align: middle .. |Test_1| image:: images/Histogram_Comparison_Source_1.jpg - :height: 150pt :align: middle .. |Test_2| image:: images/Histogram_Comparison_Source_2.jpg - :height: 150pt :align: middle where the first one is the base (to be compared to the others), the other 2 are the test images. We will also compare the first image with respect to itself and with respect of half the base image. diff --git a/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_0.jpg b/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_0.jpg index 4c42898ec3..8d0ac9e4ab 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_0.jpg and b/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_0.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_1.jpg b/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_1.jpg index 8ca11f9fb1..2cafdaa48d 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_1.jpg and b/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_1.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_2.jpg b/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_2.jpg index bd339a00a0..2b783930eb 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_2.jpg and b/doc/tutorials/imgproc/histograms/histogram_comparison/images/Histogram_Comparison_Source_2.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst b/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst index e88fe94b85..857002e8f7 100644 --- a/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst +++ b/doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst @@ -29,7 +29,6 @@ What is an Image Histogram? * It quantifies the number of pixels for each intensity value considered. .. image:: images/Histogram_Equalization_Theory_0.jpg - :height: 200pt :align: center @@ -43,7 +42,6 @@ What is Histogram Equalization? * To make it clearer, from the image above, you can see that the pixels seem clustered around the middle of the available range of intensities. What Histogram Equalization does is to *stretch out* this range. Take a look at the figure below: The green circles indicate the *underpopulated* intensities. After applying the equalization, we get an histogram like the figure in the center. The resulting image is shown in the picture at right. .. image:: images/Histogram_Equalization_Theory_1.jpg - :height: 200pt :align: center How does it work? @@ -62,7 +60,6 @@ How does it work? To use this as a remapping function, we have to normalize :math:`H^{'}(i)` such that the maximum value is 255 ( or the maximum value for the intensity of the image ). From the example above, the cumulative function is: .. image:: images/Histogram_Equalization_Theory_2.jpg - :height: 200pt :align: center * Finally, we use a simple remapping procedure to obtain the intensity values of the equalized image: @@ -194,13 +191,11 @@ Results #. To appreciate better the results of equalization, let's introduce an image with not much contrast, such as: .. image:: images/Histogram_Equalization_Original_Image.jpg - :height: 200pt :align: center which, by the way, has this histogram: .. image:: images/Histogram_Equalization_Original_Histogram.jpg - :height: 150pt :align: center notice that the pixels are clustered around the center of the histogram. @@ -208,13 +203,11 @@ Results #. After applying the equalization with our program, we get this result: .. image:: images/Histogram_Equalization_Equalized_Image.jpg - :height: 200pt :align: center this image has certainly more contrast. Check out its new histogram like this: .. image:: images/Histogram_Equalization_Equalized_Histogram.jpg - :height: 150pt :align: center Notice how the number of pixels is more distributed through the intensity range. diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Histogram.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Histogram.jpg index 59572af427..aa80cfa994 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Histogram.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Histogram.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Image.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Image.jpg index 3992ed28ea..70f885daf1 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Image.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Equalized_Image.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Histogram.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Histogram.jpg index 4177a961b3..a10e660b34 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Histogram.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Histogram.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Image.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Image.jpg index bb16964681..cf5ddca8c5 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Image.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_0.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_0.jpg index c9aa79d6de..4f6257961e 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_0.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_0.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_1.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_1.jpg index 6894d2b872..64b285ad85 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_1.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_1.jpg differ diff --git a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_2.jpg b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_2.jpg index cc2496e5fe..0a5695841e 100644 Binary files a/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_2.jpg and b/doc/tutorials/imgproc/histograms/histogram_equalization/images/Histogram_Equalization_Theory_2.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_0.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_0.jpg index cd3edb478c..30b65ea923 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_0.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_0.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_1.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_1.jpg index f84e5998f5..3e2128b8dd 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_1.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_1.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_2.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_2.jpg index df0de48248..5427448699 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_2.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_2.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_3.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_3.jpg index e9056951d4..61e4a62f3e 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_3.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_3.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_4.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_4.jpg index ff99705c9b..642764ed98 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_4.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_4.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_5.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_5.jpg index e8c4183acb..845a4a91a0 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_5.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Correl_Result_5.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Image_Result.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Image_Result.jpg index 601ca6fb14..7eed84e5bc 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Image_Result.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Image_Result.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Original_Image.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Original_Image.jpg index 7809066923..7411ccb968 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Original_Image.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Result.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Result.jpg index 8383cc25ac..c81afa1c3f 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Result.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Result.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Sliding.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Sliding.jpg index a862ee6a3a..7afeb00d7a 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Sliding.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Sliding.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Summary.jpg b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Summary.jpg index c7c0dcd125..ebb5ddb1d0 100644 Binary files a/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Summary.jpg and b/doc/tutorials/imgproc/histograms/template_matching/images/Template_Matching_Template_Theory_Summary.jpg differ diff --git a/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst b/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst index d1726c8f81..5d760bd217 100644 --- a/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst +++ b/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst @@ -37,13 +37,11 @@ How does it work? our goal is to detect the highest matching area: .. image:: images/Template_Matching_Template_Theory_Summary.jpg - :height: 200pt :align: center * To identify the matching area, we have to *compare* the template image against the source image by sliding it: .. image:: images/Template_Matching_Template_Theory_Sliding.jpg - :height: 200pt :align: center * By **sliding**, we mean moving the patch one pixel at a time (left to right, up to down). At each location, a metric is calculated so it represents how "good" or "bad" the match at that location is (or how similar the patch is to that particular area of the source image). @@ -51,7 +49,6 @@ How does it work? * For each location of **T** over **I**, you *store* the metric in the *result matrix* **(R)**. Each location :math:`(x,y)` in **R** contains the match metric: .. image:: images/Template_Matching_Template_Theory_Result.jpg - :height: 200pt :align: center the image above is the result **R** of sliding the patch with a metric **TM_CCORR_NORMED**. The brightest locations indicate the highest matches. As you can see, the location marked by the red circle is probably the one with the highest value, so that location (the rectangle formed by that point as a corner and width and height equal to the patch image) is considered the match. @@ -335,13 +332,11 @@ Results #. Testing our program with an input image such as: .. image:: images/Template_Matching_Original_Image.jpg - :height: 200pt :align: center and a template image: .. image:: images/Template_Matching_Template_Image.jpg - :height: 50pt :align: center #. Generate the following result matrices (first row are the standard methods SQDIFF, CCORR and CCOEFF, second row are the same methods in its normalized version). In the first column, the darkest is the better match, for the other two columns, the brighter a location, the higher the match. @@ -353,32 +348,25 @@ Results ============ ============ ============ .. |Result_0| image:: images/Template_Matching_Correl_Result_0.jpg - :height: 150pt :align: middle .. |Result_1| image:: images/Template_Matching_Correl_Result_1.jpg - :height: 150pt :align: middle .. |Result_2| image:: images/Template_Matching_Correl_Result_2.jpg - :height: 150pt :align: middle .. |Result_3| image:: images/Template_Matching_Correl_Result_3.jpg - :height: 150pt :align: middle .. |Result_4| image:: images/Template_Matching_Correl_Result_4.jpg - :height: 150pt :align: middle .. |Result_5| image:: images/Template_Matching_Correl_Result_5.jpg - :height: 150pt :align: middle #. The right match is shown below (black rectangle around the face of the guy at the right). Notice that CCORR and CCDEFF gave erroneous best matches, however their normalized version did it right, this may be due to the fact that we are only considering the "highest match" and not the other possible high matches. .. image:: images/Template_Matching_Image_Result.jpg - :height: 200pt :align: center diff --git a/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Original_Image.jpg index b4545669fd..bf448f3c0f 100644 Binary files a/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Result.jpg b/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Result.jpg index bbddc716f6..21c8e1b35f 100644 Binary files a/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Result.jpg and b/doc/tutorials/imgproc/imgtrans/canny_detector/images/Canny_Detector_Tutorial_Result.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/copyMakeBorder/images/CopyMakeBorder_Tutorial_Results.jpg b/doc/tutorials/imgproc/imgtrans/copyMakeBorder/images/CopyMakeBorder_Tutorial_Results.jpg index 1c83dcb4c7..10c6c54159 100644 Binary files a/doc/tutorials/imgproc/imgtrans/copyMakeBorder/images/CopyMakeBorder_Tutorial_Results.jpg and b/doc/tutorials/imgproc/imgtrans/copyMakeBorder/images/CopyMakeBorder_Tutorial_Results.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst b/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst index 648148f769..7fad4b56a7 100644 --- a/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst +++ b/doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst @@ -25,7 +25,7 @@ What is a kernel? ------------------ A kernel is essentially a fixed size array of numerical coefficeints along with an *anchor point* in that array, which is tipically located at the center. -.. image:: images/filter_2d_tutorial_kernel_theory.jpg +.. image:: images/filter_2d_tutorial_kernel_theory.png :alt: kernel example :align: center diff --git a/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_kernel_theory.jpg b/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_kernel_theory.jpg deleted file mode 100644 index d26066cf21..0000000000 Binary files a/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_kernel_theory.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_kernel_theory.png b/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_kernel_theory.png new file mode 100644 index 0000000000..4105288e64 Binary files /dev/null and b/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_kernel_theory.png differ diff --git a/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_result.jpg b/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_result.jpg index 5f326f5c61..2cf9f5c16b 100644 Binary files a/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_result.jpg and b/doc/tutorials/imgproc/imgtrans/filter_2d/images/filter_2d_tutorial_result.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst b/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst index 862243caa0..bd90c0930e 100644 --- a/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst +++ b/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst @@ -26,7 +26,6 @@ Hough Circle Transform .. image:: images/Hough_Circle_Tutorial_Theory_0.jpg :alt: Result of detecting circles with Hough Transform - :height: 200pt :align: center * For sake of efficiency, OpenCV implements a detection method slightly trickier than the standard Hough Transform: *The Hough gradient method*. For more details, please check the book *Learning OpenCV* or your favorite Computer Vision bibliography diff --git a/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Result.jpg b/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Result.jpg index 2a599fc6ca..b05618478e 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Result.jpg and b/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Result.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Theory_0.jpg b/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Theory_0.jpg index 8b729ca2fd..a09c46e1ea 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Theory_0.jpg and b/doc/tutorials/imgproc/imgtrans/hough_circle/images/Hough_Circle_Tutorial_Theory_0.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst b/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst index 147f293ab4..3d29793161 100644 --- a/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst +++ b/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst @@ -31,7 +31,6 @@ How does it work? .. image:: images/Hough_Lines_Tutorial_Theory_0.jpg :alt: Line variables - :height: 200pt :align: center For Hough Transforms, we will express lines in the *Polar system*. Hence, a line equation can be written as: @@ -54,7 +53,6 @@ How does it work? .. image:: images/Hough_Lines_Tutorial_Theory_1.jpg :alt: Polar plot of a the family of lines of a point - :height: 200pt :align: center We consider only points such that :math:`r > 0` and :math:`0< \theta < 2 \pi`. @@ -63,7 +61,6 @@ How does it work? .. image:: images/Hough_Lines_Tutorial_Theory_2.jpg :alt: Polar plot of the family of lines for three points - :height: 200pt :align: center The three plots intersect in one single point :math:`(0.925, 9.6)`, these coordinates are the parameters (:math:`\theta, r`) or the line in which :math:`(x_{0}, y_{0})`, :math:`(x_{1}, y_{1})` and :math:`(x_{2}, y_{2})` lay. diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Original_Image.jpg index 2e6211dbd3..ec75831989 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Result.jpg b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Result.jpg index a6107b02b5..125437d8e8 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Result.jpg and b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Result.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_0.jpg b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_0.jpg index e8111eb42e..0e0ff22ca1 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_0.jpg and b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_0.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_1.jpg b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_1.jpg index 0f297046c5..edbbcf65c8 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_1.jpg and b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_1.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_2.jpg b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_2.jpg index ae0dc05122..996f7c6e50 100644 Binary files a/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_2.jpg and b/doc/tutorials/imgproc/imgtrans/hough_lines/images/Hough_Lines_Tutorial_Theory_2.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Original_Image.jpg index 2369ba57ce..beb114c7b5 100644 Binary files a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Result.jpg b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Result.jpg index 2354d9a5db..9cba13315b 100644 Binary files a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Result.jpg and b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Result.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_Previous.jpg b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_Previous.jpg index 1d5a29d8ba..6a16926e39 100644 Binary files a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_Previous.jpg and b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_Previous.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_ddIntensity.jpg b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_ddIntensity.jpg index 7bc1768b0a..67d95d237a 100644 Binary files a/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_ddIntensity.jpg and b/doc/tutorials/imgproc/imgtrans/laplace_operator/images/Laplace_Operator_Tutorial_Theory_ddIntensity.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst b/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst index b7a8ee7519..99bb326ac5 100644 --- a/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst +++ b/doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst @@ -19,14 +19,12 @@ Theory .. image:: images/Laplace_Operator_Tutorial_Theory_Previous.jpg :alt: Previous theory - :height: 200pt :align: center #. And...what happens if we take the second derivative? .. image:: images/Laplace_Operator_Tutorial_Theory_ddIntensity.jpg :alt: Second derivative - :height: 200pt :align: center You can observe that the second derivative is zero! So, we can also use this criterion to attempt to detect edges in an image. However, note that zeros will not only appear in edges (they can actually appear in other meaningless locations); this can be solved by applying filtering where needed. diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Original_Image.jpg index 46cce16364..422ce19dbb 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_0.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_0.jpg index a38f383111..5020931d86 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_0.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_0.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_1.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_1.jpg index 9d2a4e3431..e601fdfe57 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_1.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_1.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_2.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_2.jpg index 934d78c2ed..f597d49292 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_2.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_2.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_3.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_3.jpg index 74d598264b..fabfaf0569 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_3.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Result_3.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_0.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_0.jpg index cf5a74a900..e58669623e 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_0.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_0.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_1.jpg b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_1.jpg index 8d1aa125a9..7195da79c3 100644 Binary files a/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_1.jpg and b/doc/tutorials/imgproc/imgtrans/remap/images/Remap_Tutorial_Theory_1.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Result.jpg b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Result.jpg index ead594e5eb..45f44b8cd5 100644 Binary files a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Result.jpg and b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Result.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_0.jpg b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_0.jpg index c79d50634a..2c84310632 100644 Binary files a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_0.jpg and b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_0.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_Intensity_Function.jpg b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_Intensity_Function.jpg index bd77398107..adaab86673 100644 Binary files a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_Intensity_Function.jpg and b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_Intensity_Function.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_dIntensity_Function.jpg b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_dIntensity_Function.jpg index ce43af116c..3a5b13a3f9 100644 Binary files a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_dIntensity_Function.jpg and b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_dIntensity_Function.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_ddIntensity_Function.jpg b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_ddIntensity_Function.jpg index 7bc1768b0a..3fae177233 100644 Binary files a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_ddIntensity_Function.jpg and b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/images/Sobel_Derivatives_Tutorial_Theory_ddIntensity_Function.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst index 213dcb591c..d544b109cd 100644 --- a/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst +++ b/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst @@ -26,7 +26,6 @@ Theory .. image:: images/Sobel_Derivatives_Tutorial_Theory_0.jpg :alt: How intensity changes in an edge - :height: 200pt :align: center You can easily notice that in an *edge*, the pixel intensity *changes* in a notorious way. A good way to express *changes* is by using *derivatives*. A high change in gradient indicates a major change in the image. @@ -35,14 +34,12 @@ Theory .. image:: images/Sobel_Derivatives_Tutorial_Theory_Intensity_Function.jpg :alt: Intensity Plot for an edge - :height: 200pt :align: center #. The edge "jump" can be seen more easily if we take the first derivative (actually, here appears as a maximum) .. image:: images/Sobel_Derivatives_Tutorial_Theory_dIntensity_Function.jpg :alt: First derivative of Intensity - Plot for an edge - :height: 200pt :align: center #. So, from the explanation above, we can deduce that a method to detect edges in an image can be performed by locating pixel locations where the gradient is higher than its neighbors (or to generalize, higher than a threshold). diff --git a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Original_Image.jpg index 52737c5eae..6c1c77341b 100644 Binary files a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp.jpg b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp.jpg index 611bfd6df7..8fa7d65c4c 100644 Binary files a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp.jpg and b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp_Rotate.jpg b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp_Rotate.jpg index 55763fdbd2..1f828309ff 100644 Binary files a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp_Rotate.jpg and b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Result_Warp_Rotate.jpg differ diff --git a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Theory_0.jpg b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Theory_0.jpg index dd6a46a33a..8294823bd8 100644 Binary files a/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Theory_0.jpg and b/doc/tutorials/imgproc/imgtrans/warp_affine/images/Warp_Affine_Tutorial_Theory_0.jpg differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Cover.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Cover.jpg index 25cd4fb8a3..dc2d1e7486 100644 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Original_Image.jpg index 2f98d8359b..8aa7ff2bc0 100644 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_BlackHat.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_BlackHat.jpg deleted file mode 100644 index 05ef8812ec..0000000000 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_BlackHat.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_BlackHat.png b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_BlackHat.png new file mode 100644 index 0000000000..ce6ff35550 Binary files /dev/null and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_BlackHat.png differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Closing.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Closing.jpg deleted file mode 100644 index 0279812bcf..0000000000 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Closing.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Closing.png b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Closing.png new file mode 100644 index 0000000000..f112bfef11 Binary files /dev/null and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Closing.png differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Gradient.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Gradient.jpg deleted file mode 100644 index 80e7416077..0000000000 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Gradient.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Gradient.png b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Gradient.png new file mode 100644 index 0000000000..5d8077f0d2 Binary files /dev/null and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Gradient.png differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Opening.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Opening.jpg deleted file mode 100644 index a3014094cf..0000000000 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Opening.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Opening.png b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Opening.png new file mode 100644 index 0000000000..7b8b0850fd Binary files /dev/null and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_Opening.png differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_TopHat.jpg b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_TopHat.jpg deleted file mode 100644 index c000766fd1..0000000000 Binary files a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_TopHat.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_TopHat.png b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_TopHat.png new file mode 100644 index 0000000000..ca22789b03 Binary files /dev/null and b/doc/tutorials/imgproc/opening_closing_hats/images/Morphology_2_Tutorial_Theory_TopHat.png differ diff --git a/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst b/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst index f233f0671a..40b06a5ea5 100644 --- a/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst +++ b/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst @@ -43,8 +43,7 @@ Opening * For instance, check out the example below. The image at the left is the original and the image at the right is the result after applying the opening transformation. We can observe that the small spaces in the corners of the letter tend to dissapear. - .. image:: images/Morphology_2_Tutorial_Theory_Opening.jpg - :height: 150pt + .. image:: images/Morphology_2_Tutorial_Theory_Opening.png :alt: Opening :align: center @@ -59,8 +58,7 @@ Closing * Useful to remove small holes (dark regions). - .. image:: images/Morphology_2_Tutorial_Theory_Closing.jpg - :height: 150pt + .. image:: images/Morphology_2_Tutorial_Theory_Closing.png :alt: Closing example :align: center @@ -76,8 +74,7 @@ Morphological Gradient * It is useful for finding the outline of an object as can be seen below: - .. image:: images/Morphology_2_Tutorial_Theory_Gradient.jpg - :height: 150pt + .. image:: images/Morphology_2_Tutorial_Theory_Gradient.png :alt: Gradient :align: center @@ -91,8 +88,7 @@ Top Hat dst = tophat( src, element ) = src - open( src, element ) - .. image:: images/Morphology_2_Tutorial_Theory_TopHat.jpg - :height: 150pt + .. image:: images/Morphology_2_Tutorial_Theory_TopHat.png :alt: Top Hat :align: center @@ -105,8 +101,7 @@ Black Hat dst = blackhat( src, element ) = close( src, element ) - src - .. image:: images/Morphology_2_Tutorial_Theory_BlackHat.jpg - :height: 150pt + .. image:: images/Morphology_2_Tutorial_Theory_BlackHat.png :alt: Black Hat :align: center @@ -270,17 +265,15 @@ Explanation Results ======== -* After compiling the code above we can execute it giving an image path as an argument. For this tutorial we use as input the image: **baboon.jpg**: +* After compiling the code above we can execute it giving an image path as an argument. For this tutorial we use as input the image: **baboon.png**: .. image:: images/Morphology_2_Tutorial_Original_Image.jpg - :height: 200pt :alt: Morphology 2: Original image :align: center * And here are two snapshots of the display window. The first picture shows the output after using the operator **Opening** with a cross kernel. The second picture (right side, shows the result of using a **Blackhat** operator with an ellipse kernel. .. image:: images/Morphology_2_Tutorial_Cover.jpg - :height: 300pt :alt: Morphology 2: Result sample :align: center diff --git a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Cover.jpg b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Cover.jpg deleted file mode 100644 index 2a1f5970b2..0000000000 Binary files a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Cover.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Original_Image.jpg index a9857cee52..2a4fc40d24 100644 Binary files a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrDown_Result.jpg b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrDown_Result.jpg index 71f30a7432..69382aae2d 100644 Binary files a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrDown_Result.jpg and b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrDown_Result.jpg differ diff --git a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrUp_Result.jpg b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrUp_Result.jpg index d2acb7c07c..76a3b81f95 100644 Binary files a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrUp_Result.jpg and b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_PyrUp_Result.jpg differ diff --git a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Pyramid_Theory.jpg b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Pyramid_Theory.jpg deleted file mode 100644 index 573b87d94d..0000000000 Binary files a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Pyramid_Theory.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Pyramid_Theory.png b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Pyramid_Theory.png new file mode 100644 index 0000000000..8321c362db Binary files /dev/null and b/doc/tutorials/imgproc/pyramids/images/Pyramids_Tutorial_Pyramid_Theory.png differ diff --git a/doc/tutorials/imgproc/pyramids/pyramids.rst b/doc/tutorials/imgproc/pyramids/pyramids.rst index 90190c6842..41c734742f 100644 --- a/doc/tutorials/imgproc/pyramids/pyramids.rst +++ b/doc/tutorials/imgproc/pyramids/pyramids.rst @@ -41,7 +41,7 @@ Gaussian Pyramid * Imagine the pyramid as a set of layers in which the higher the layer, the smaller the size. - .. image:: images/Pyramids_Tutorial_Pyramid_Theory.jpg + .. image:: images/Pyramids_Tutorial_Pyramid_Theory.png :alt: Pyramid figure :align: center diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst index 336cd624ba..1d7e1f2642 100644 --- a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst +++ b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst @@ -117,10 +117,8 @@ Result ========== ========== .. |BRC_0| image:: images/Bounding_Rects_Circles_Source_Image.jpg - :height: 300pt :align: middle .. |BRC_1| image:: images/Bounding_Rects_Circles_Result.jpg - :height: 300pt :align: middle diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Result.jpg b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Result.jpg index c22558aae1..d13234543d 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Result.jpg and b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Result.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Source_Image.jpg b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Source_Image.jpg index 4747eadc11..3c08c13161 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Source_Image.jpg and b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/images/Bounding_Rects_Circles_Source_Image.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst index 8bc7dddae7..1e679ea397 100644 --- a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst +++ b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst @@ -119,10 +119,8 @@ Result ========== ========== .. |BRE_0| image:: images/Bounding_Rotated_Ellipses_Source_Image.jpg - :height: 300pt :align: middle .. |BRE_1| image:: images/Bounding_Rotated_Ellipses_Result.jpg - :height: 300pt :align: middle diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Result.jpg b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Result.jpg index 2d8eb5dcff..cc869fd808 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Result.jpg and b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Result.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Source_Image.jpg b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Source_Image.jpg index 623bf8a780..c475ebd221 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Source_Image.jpg and b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/images/Bounding_Rotated_Ellipses_Source_Image.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst b/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst index 8f838e1275..fa46610d94 100644 --- a/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst +++ b/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst @@ -100,10 +100,8 @@ Result ============= ============= .. |contour_0| image:: images/Find_Contours_Original_Image.jpg - :height: 300pt :align: middle .. |contour_1| image:: images/Find_Contours_Result.jpg - :height: 300pt :align: middle diff --git a/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Original_Image.jpg b/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Original_Image.jpg index 34010cb5aa..0372edad81 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Original_Image.jpg and b/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Result.jpg b/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Result.jpg index a0b1c92cb0..953eeabf92 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Result.jpg and b/doc/tutorials/imgproc/shapedescriptors/find_contours/images/Find_Contours_Result.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst b/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst index 93837713e5..b47125a24b 100644 --- a/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst +++ b/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst @@ -109,10 +109,8 @@ Result ========== ========== .. |Hull_0| image:: images/Hull_Original_Image.jpg - :height: 300pt :align: middle .. |Hull_1| image:: images/Hull_Result.jpg - :height: 300pt :align: middle diff --git a/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Original_Image.jpg b/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Original_Image.jpg index 63e3ad23a8..8b3f0d34a2 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Original_Image.jpg and b/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Result.jpg b/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Result.jpg index 4703d869f7..16ca49c01d 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Result.jpg and b/doc/tutorials/imgproc/shapedescriptors/hull/images/Hull_Result.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result1.jpg b/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result1.jpg index 7f7b45b932..1e8112a3fb 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result1.jpg and b/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result1.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result2.jpg b/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result2.jpg index 18fe1ffc66..d63de9a099 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result2.jpg and b/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Result2.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Source_Image.jpg b/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Source_Image.jpg index 8b8c34e6a1..f285fdbfd3 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Source_Image.jpg and b/doc/tutorials/imgproc/shapedescriptors/moments/images/Moments_Source_Image.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg index d82dd0267d..e420f472ea 100644 Binary files a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg and b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg differ diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Source_Image.jpg b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Source_Image.jpg deleted file mode 100644 index a9a2567f27..0000000000 Binary files a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Source_Image.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Source_Image.png b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Source_Image.png new file mode 100644 index 0000000000..87bf5d2100 Binary files /dev/null and b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Source_Image.png differ diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst index db85c2b2ee..f3fa84c542 100644 --- a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst +++ b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst @@ -109,11 +109,9 @@ Result |PPT_0| |PPT_1| ========== ========== - .. |PPT_0| image:: images/Point_Polygon_Test_Source_Image.jpg - :height: 300pt + .. |PPT_0| image:: images/Point_Polygon_Test_Source_Image.png :align: middle .. |PPT_1| image:: images/Point_Polygon_Test_Result.jpg - :height: 300pt :align: middle diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_1_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_1_Tutorial_Cover.jpg index cdb78d3e08..67da3a5ac0 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_1_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_1_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_2_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_2_Tutorial_Cover.jpg index 27685b82cb..b3a1c55659 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_2_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/Morphology_2_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/Pyramids_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/Pyramids_Tutorial_Cover.jpg index da24ffb769..0851cab278 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/Pyramids_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/Pyramids_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/Smoothing_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/Smoothing_Tutorial_Cover.jpg index c471fb41ca..67656ab4b3 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/Smoothing_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/Smoothing_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/Threshold_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/Threshold_Tutorial_Cover.jpg index 28f24bd5a5..6b115d88f5 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/Threshold_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/Threshold_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg index c45f7479fe..013bdf6f2f 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Back_Projection_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg index 4915557632..32d09e37e8 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Calculation_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg index 5ab4327f47..7538a7203d 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Comparison_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg index d01ad5e306..fbc5866835 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Histogram_Equalization_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg index 08d49f1dd0..e84f52119a 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/histograms/Template_Matching_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg index bbddc716f6..bcd9ff9ace 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Canny_Detector_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg index 5e91f407fa..f241ff2238 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/CopyMakeBorder_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg index eb02934d38..c2f5809108 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Filter_2D_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg index 2a599fc6ca..175180ae81 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Circle_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg index a6107b02b5..4211ee2629 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Hough_Lines_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg index 2354d9a5db..14373f25b1 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Laplace_Operator_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg index 74d598264b..bfb55dbdac 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Remap_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg index ead594e5eb..fbe17c8978 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Sobel_Derivatives_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg index 611bfd6df7..5655789bd6 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/imgtrans/Warp_Affine_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg index c22558aae1..be2ae57d40 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rects_Circles_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg index 2d8eb5dcff..b7330592b5 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Bounding_Rotated_Ellipses_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg index a0b1c92cb0..82888a1ba9 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Find_Contours_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg index 4703d869f7..a7a1b6ebeb 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Hull_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg index 7f7b45b932..1e865eb371 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Moments_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg index d82dd0267d..9980df8421 100644 Binary files a/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/table_of_content_imgproc/images/shapedescriptors/Point_Polygon_Test_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Cover.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Cover.jpg index 54622de159..82a12d28e4 100644 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Cover.jpg and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Cover.jpg differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Original_Image.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Original_Image.jpg index a9857cee52..7aaa61dc6d 100644 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Original_Image.jpg and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Original_Image.jpg differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Binary_Inverted.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Binary_Inverted.jpg index 8b9e38f1f7..7f6ee08aaf 100644 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Binary_Inverted.jpg and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Binary_Inverted.jpg differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Zero.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Zero.jpg index 2f25cab153..ea3039bfee 100644 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Zero.jpg and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Result_Zero.jpg differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Base_Figure.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Base_Figure.jpg deleted file mode 100644 index dea9229d34..0000000000 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Base_Figure.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Base_Figure.png b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Base_Figure.png new file mode 100644 index 0000000000..5078bba83d Binary files /dev/null and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Base_Figure.png differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary.jpg deleted file mode 100644 index cbf7700eb8..0000000000 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary.png b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary.png new file mode 100644 index 0000000000..a06972d250 Binary files /dev/null and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary.png differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary_Inverted.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary_Inverted.jpg deleted file mode 100644 index 7c74247ca3..0000000000 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary_Inverted.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary_Inverted.png b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary_Inverted.png new file mode 100644 index 0000000000..1962a8c1c7 Binary files /dev/null and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Binary_Inverted.png differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Example.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Example.jpg index bbc32e5bbf..73112e110b 100644 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Example.jpg and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Example.jpg differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Truncate.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Truncate.jpg deleted file mode 100644 index 7f6357eb34..0000000000 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Truncate.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Truncate.png b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Truncate.png new file mode 100644 index 0000000000..6e4c657ce2 Binary files /dev/null and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Truncate.png differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero.jpg deleted file mode 100644 index e71d5959b9..0000000000 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero.png b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero.png new file mode 100644 index 0000000000..6ab10a7808 Binary files /dev/null and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero.png differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero_Inverted.jpg b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero_Inverted.jpg deleted file mode 100644 index 494a25ad44..0000000000 Binary files a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero_Inverted.jpg and /dev/null differ diff --git a/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero_Inverted.png b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero_Inverted.png new file mode 100644 index 0000000000..f8cb3b38fc Binary files /dev/null and b/doc/tutorials/imgproc/threshold/images/Threshold_Tutorial_Theory_Zero_Inverted.png differ diff --git a/doc/tutorials/imgproc/threshold/threshold.rst b/doc/tutorials/imgproc/threshold/threshold.rst index b4a64430e8..1ac4919bd0 100644 --- a/doc/tutorials/imgproc/threshold/threshold.rst +++ b/doc/tutorials/imgproc/threshold/threshold.rst @@ -30,7 +30,6 @@ What is Thresholding? .. image:: images/Threshold_Tutorial_Theory_Example.jpg :alt: Threshold simple example - :height: 150pt :align: center Types of Thresholding @@ -42,9 +41,8 @@ Types of Thresholding * To illustrate how these thresholding processes work, let's consider that we have a source image with pixels with intensity values :math:`src(x,y)`. The plot below depicts this. The horizontal blue line represents the threshold :math:`thresh` (fixed). - .. image:: images/Threshold_Tutorial_Theory_Base_Figure.jpg + .. image:: images/Threshold_Tutorial_Theory_Base_Figure.png :alt: Threshold Binary - :height: 100pt :align: center Threshold Binary @@ -58,9 +56,8 @@ Threshold Binary * So, if the intensity of the pixel :math:`src(x,y)` is higher than :math:`thresh`, then the new pixel intensity is set to a :math:`MaxVal`. Otherwise, the pixels are set to :math:`0`. - .. image:: images/Threshold_Tutorial_Theory_Binary.jpg + .. image:: images/Threshold_Tutorial_Theory_Binary.png :alt: Threshold Binary - :height: 100pt :align: center @@ -75,9 +72,8 @@ Threshold Binary, Inverted * If the intensity of the pixel :math:`src(x,y)` is higher than :math:`thresh`, then the new pixel intensity is set to a :math:`0`. Otherwise, it is set to :math:`MaxVal`. - .. image:: images/Threshold_Tutorial_Theory_Binary_Inverted.jpg + .. image:: images/Threshold_Tutorial_Theory_Binary_Inverted.png :alt: Threshold Binary Inverted - :height: 100pt :align: center Truncate @@ -91,9 +87,8 @@ Truncate * The maximum intensity value for the pixels is :math:`thresh`, if :math:`src(x,y)` is greater, then its value is *truncated*. See figure below: - .. image:: images/Threshold_Tutorial_Theory_Truncate.jpg + .. image:: images/Threshold_Tutorial_Theory_Truncate.png :alt: Threshold Truncate - :height: 100pt :align: center @@ -109,9 +104,8 @@ Threshold to Zero * If :math:`src(x,y)` is lower than :math:`thresh`, the new pixel value will be set to :math:`0`. - .. image:: images/Threshold_Tutorial_Theory_Zero.jpg + .. image:: images/Threshold_Tutorial_Theory_Zero.png :alt: Threshold Zero - :height: 100pt :align: center @@ -126,9 +120,8 @@ Threshold to Zero, Inverted * If :math:`src(x,y)` is greater than :math:`thresh`, the new pixel value will be set to :math:`0`. - .. image:: images/Threshold_Tutorial_Theory_Zero_Inverted.jpg + .. image:: images/Threshold_Tutorial_Theory_Zero_Inverted.png :alt: Threshold Zero Inverted - :height: 100pt :align: center @@ -298,7 +291,6 @@ Results .. image:: images/Threshold_Tutorial_Original_Image.jpg :alt: Threshold Original Image - :height: 200pt :align: center #. First, we try to threshold our image with a *binary threhold inverted*. We expect that the pixels brighter than the :math:`thresh` will turn dark, which is what actually happens, as we can see in the snapshot below (notice from the original image, that the doggie's tongue and eyes are particularly bright in comparison with the image, this is reflected in the output image). @@ -306,7 +298,6 @@ Results .. image:: images/Threshold_Tutorial_Result_Binary_Inverted.jpg :alt: Threshold Result Binary Inverted - :height: 200pt :align: center @@ -314,7 +305,4 @@ Results .. image:: images/Threshold_Tutorial_Result_Zero.jpg :alt: Threshold Result Zero - :height: 200pt - :align: center - - + :align: center \ No newline at end of file diff --git a/doc/tutorials/introduction/android_binary_package/android_binary_package.rst b/doc/tutorials/introduction/android_binary_package/android_binary_package.rst index 33c3bab21d..cb92101b5e 100644 --- a/doc/tutorials/introduction/android_binary_package/android_binary_package.rst +++ b/doc/tutorials/introduction/android_binary_package/android_binary_package.rst @@ -53,7 +53,6 @@ You need the following tools to be installed: This is minimal platform supported by OpenCV Java API. And it is set as default for OpenCV distribution. It is possible to use platform having higher number with OpenCV package but it requires to edit OpenCV project settings. .. image:: images/android_sdk_and_avd_manager.png - :height: 400px :alt: Android SDK and AVD manager :align: center @@ -107,7 +106,6 @@ Get the OpenCV package for Android development You can unpack it using any popular archiver (for example with |seven_zip|_): .. image:: images/android_package_7zip.png - :height: 314px :alt: Exploring OpenCV package with 7-Zip :align: center @@ -133,7 +131,6 @@ Open OpenCV library and samples in Eclipse I recommend to start familiarising yourself with OpenCV for Android from new clean workspase. So I have choosen my OpenCV package directory for new workspace: .. image:: images/eclipse_1_choose_workspace.png - :height: 387px :alt: Choosing C:\Work\android-opencv\ as workspace location :align: center @@ -144,17 +141,11 @@ Open OpenCV library and samples in Eclipse * Select **Window > Preferences...** to open the Preferences panel (Mac OS X: **Eclipse > Preferences**): - .. image:: images/eclipse_2_window_preferences.png - :height: 400px - :alt: Select Window > Preferences... - :align: center - * Select **Android** from the left panel. You may see a dialog asking whether you want to send usage statistics to Google. If so, make your choice and click **Proceed**. You cannot continue with this procedure until you click **Proceed**. .. image:: images/eclipse_3_preferences_android.png - :height: 396px :alt: Select Android from the left panel :align: center @@ -179,14 +170,12 @@ Open OpenCV library and samples in Eclipse * Right click on the *Package Explorer* window and choose **Import...** option from context menu: .. image:: images/eclipse_5_import_command.png - :height: 400px :alt: Select Import... from context menu :align: center * In the main panel select **General** > **Existing Projects into Workspace** and press **Next** buton: .. image:: images/eclipse_6_import_existing_projects.png - :height: 450px :alt: General > Existing Projects into Workspace :align: center @@ -254,6 +243,5 @@ Well, running samples from Eclipse is very simple: Here is sample ``Tutorial 1 Basic - 1. Add OpenCV`` detecting edges using Canny algorithm from OpenCV: .. image:: images/emulator_canny.png - :height: 600px :alt: Tutorial 1 Basic - 1. Add OpenCV - running Canny :align: center diff --git a/doc/tutorials/introduction/android_binary_package/images/android_package_7zip.png b/doc/tutorials/introduction/android_binary_package/images/android_package_7zip.png index 4435cc0dbd..6e7f28c472 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/android_package_7zip.png and b/doc/tutorials/introduction/android_binary_package/images/android_package_7zip.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png b/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png index f2bab8e236..37315991cf 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png and b/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_10_crystal_clean.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_10_crystal_clean.png index 4019d72245..1ca38a1457 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_10_crystal_clean.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_10_crystal_clean.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_11_run_as.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_11_run_as.png index 2df23a0276..05e6671fa8 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_11_run_as.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_11_run_as.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_1_choose_workspace.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_1_choose_workspace.png index 9850fb83c7..8a3b0a773e 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_1_choose_workspace.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_1_choose_workspace.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_2_window_preferences.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_2_window_preferences.png deleted file mode 100644 index acbf20d696..0000000000 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_2_window_preferences.png and /dev/null differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_3_preferences_android.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_3_preferences_android.png index da8a66d2d5..1b2dd53baa 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_3_preferences_android.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_3_preferences_android.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_4_locate_sdk.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_4_locate_sdk.png index 48ed39381c..ff699ebb1e 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_4_locate_sdk.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_4_locate_sdk.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_5_import_command.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_5_import_command.png index 0a59a7473e..349cc98713 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_5_import_command.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_5_import_command.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_6_import_existing_projects.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_6_import_existing_projects.png index afc0429be6..38c4da71f7 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_6_import_existing_projects.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_6_import_existing_projects.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_7_select_projects.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_7_select_projects.png index f3b4e9c153..e7aab5a8f1 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_7_select_projects.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_7_select_projects.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_8_false_alarm.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_8_false_alarm.png index 5dd864e757..428b2efdc6 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_8_false_alarm.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_8_false_alarm.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_9_errors_dissapearing.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_9_errors_dissapearing.png index cde9689a31..ffa938c319 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_9_errors_dissapearing.png and b/doc/tutorials/introduction/android_binary_package/images/eclipse_9_errors_dissapearing.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/emulator_canny.png b/doc/tutorials/introduction/android_binary_package/images/emulator_canny.png index 2dc9d7ce9d..baff852dbb 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/emulator_canny.png and b/doc/tutorials/introduction/android_binary_package/images/emulator_canny.png differ diff --git a/doc/tutorials/introduction/display_image/images/Display_Image_Tutorial_Result.jpg b/doc/tutorials/introduction/display_image/images/Display_Image_Tutorial_Result.jpg index 8d3063f8b5..16400698f0 100644 Binary files a/doc/tutorials/introduction/display_image/images/Display_Image_Tutorial_Result.jpg and b/doc/tutorials/introduction/display_image/images/Display_Image_Tutorial_Result.jpg differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/EclipseLogo.jpeg b/doc/tutorials/introduction/linux_eclipse/images/EclipseLogo.jpeg deleted file mode 100644 index f1aecfe85b..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/EclipseLogo.jpeg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a0.jpg b/doc/tutorials/introduction/linux_eclipse/images/a0.jpg deleted file mode 100644 index eb2fafda3c..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a0.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a0.png b/doc/tutorials/introduction/linux_eclipse/images/a0.png new file mode 100644 index 0000000000..00577b7e48 Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a0.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a1.jpg b/doc/tutorials/introduction/linux_eclipse/images/a1.jpg deleted file mode 100644 index b01e13e010..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a1.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a1.png b/doc/tutorials/introduction/linux_eclipse/images/a1.png new file mode 100644 index 0000000000..edbb69ea45 Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a1.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a10.jpg b/doc/tutorials/introduction/linux_eclipse/images/a10.jpg deleted file mode 100644 index 8725d38f58..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a10.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a10.png b/doc/tutorials/introduction/linux_eclipse/images/a10.png new file mode 100644 index 0000000000..d3603ba75d Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a10.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a11.jpg b/doc/tutorials/introduction/linux_eclipse/images/a11.jpg deleted file mode 100644 index 8454d297a0..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a11.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a12.jpg b/doc/tutorials/introduction/linux_eclipse/images/a12.jpg deleted file mode 100644 index 3c8fbc599d..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a12.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a12.png b/doc/tutorials/introduction/linux_eclipse/images/a12.png new file mode 100644 index 0000000000..4838501d5b Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a12.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a13.jpg b/doc/tutorials/introduction/linux_eclipse/images/a13.jpg deleted file mode 100644 index a84d628c2b..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a13.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a14.jpg b/doc/tutorials/introduction/linux_eclipse/images/a14.jpg deleted file mode 100644 index b0cf9ada41..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a14.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a14.png b/doc/tutorials/introduction/linux_eclipse/images/a14.png new file mode 100644 index 0000000000..7db82993b0 Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a14.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a15.jpg b/doc/tutorials/introduction/linux_eclipse/images/a15.jpg index 9e39e1e568..4f1fa43716 100644 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a15.jpg and b/doc/tutorials/introduction/linux_eclipse/images/a15.jpg differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a2.jpg b/doc/tutorials/introduction/linux_eclipse/images/a2.jpg deleted file mode 100644 index 04ac3d0ab4..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a2.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a3.jpg b/doc/tutorials/introduction/linux_eclipse/images/a3.jpg deleted file mode 100644 index 73af38cbb4..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a3.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a3.png b/doc/tutorials/introduction/linux_eclipse/images/a3.png new file mode 100644 index 0000000000..53f700e00c Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a3.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a4.jpg b/doc/tutorials/introduction/linux_eclipse/images/a4.jpg deleted file mode 100644 index 92f90a28d0..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a4.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a4.png b/doc/tutorials/introduction/linux_eclipse/images/a4.png new file mode 100644 index 0000000000..fc1eb71008 Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a4.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a5.jpg b/doc/tutorials/introduction/linux_eclipse/images/a5.jpg deleted file mode 100644 index b7b7348a3d..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a5.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a6.jpg b/doc/tutorials/introduction/linux_eclipse/images/a6.jpg deleted file mode 100644 index d95c5c293d..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a6.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a7.jpg b/doc/tutorials/introduction/linux_eclipse/images/a7.jpg deleted file mode 100644 index 039879578c..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a7.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a7.png b/doc/tutorials/introduction/linux_eclipse/images/a7.png new file mode 100644 index 0000000000..a87d6eb41b Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a7.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a8.jpg b/doc/tutorials/introduction/linux_eclipse/images/a8.jpg deleted file mode 100644 index 66ea78e068..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a8.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a9.jpg b/doc/tutorials/introduction/linux_eclipse/images/a9.jpg deleted file mode 100644 index 75c6cdbe95..0000000000 Binary files a/doc/tutorials/introduction/linux_eclipse/images/a9.jpg and /dev/null differ diff --git a/doc/tutorials/introduction/linux_eclipse/images/a9.png b/doc/tutorials/introduction/linux_eclipse/images/a9.png new file mode 100644 index 0000000000..0e34c7e1a7 Binary files /dev/null and b/doc/tutorials/introduction/linux_eclipse/images/a9.png differ diff --git a/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst b/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst index ec91213a22..1e0f586112 100644 --- a/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst +++ b/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst @@ -24,29 +24,21 @@ Making a project #. Go to **File -> New -> C/C++ Project** - .. image:: images/a0.jpg - :height: 400px + .. image:: images/a0.png :alt: Eclipse Tutorial Screenshot 0 :align: center #. Choose a name for your project (i.e. DisplayImage). An **Empty Project** should be okay for this example. - .. image:: images/a1.jpg - :height: 400px + .. image:: images/a1.png :alt: Eclipse Tutorial Screenshot 1 :align: center #. Leave everything else by default. Press **Finish**. - .. image:: images/a2.jpg - :height: 400px - :alt: Eclipse Tutorial Screenshot 2 - :align: center - #. Your project (in this case DisplayImage) should appear in the **Project Navigator** (usually at the left side of your window). - .. image:: images/a3.jpg - :height: 400px + .. image:: images/a3.png :alt: Eclipse Tutorial Screenshot 3 :align: center @@ -55,29 +47,17 @@ Making a project * Right click on **DisplayImage** (in the Navigator). **New -> Folder** . - .. image:: images/a4.jpg - :height: 400px + .. image:: images/a4.png :alt: Eclipse Tutorial Screenshot 4 :align: center * Name your folder **src** and then hit **Finish** - .. image:: images/a5.jpg - :height: 400px - :alt: Eclipse Tutorial Screenshot 5 - :align: center - * Right click on your newly created **src** folder. Choose **New source file**: - .. image:: images/a6.jpg - :height: 400px - :alt: Eclipse Tutorial Screenshot 6 - :align: center - * Call it **DisplayImage.cpp**. Hit **Finish** - .. image:: images/a7.jpg - :height: 400px + .. image:: images/a7.png :alt: Eclipse Tutorial Screenshot 7 :align: center @@ -113,17 +93,11 @@ Making a project * Go to **Project-->Properties** - .. image:: images/a8.jpg - :height: 400px - :alt: Eclipse Tutorial Screenshot 8 - :align: center - * In **C/C++ Build**, click on **Settings**. At the right, choose the **Tool Settings** Tab. Here we will enter the headers and libraries info: a. In **GCC C++ Compiler**, go to **Includes**. In **Include paths(-l)** you should include the path of the folder where opencv was installed. In our example, this is ``/usr/local/include/opencv``. - .. image:: images/a9.jpg - :height: 400px + .. image:: images/a9.png :alt: Eclipse Tutorial Screenshot 9 :align: center @@ -163,8 +137,7 @@ Making a project opencv_legacy opencv_flann - .. image:: images/a10.jpg - :height: 400px + .. image:: images/a10.png :alt: Eclipse Tutorial Screenshot 10 :align: center @@ -184,15 +157,9 @@ Making a project * Your project should be ready to be built. For this, go to **Project->Build all** - .. image:: images/a11.jpg - :height: 400px - :alt: Eclipse Tutorial Screenshot 11 - :align: center - In the Console you should get something like - .. image:: images/a12.jpg - :height: 200px + .. image:: images/a12.png :alt: Eclipse Tutorial Screenshot 12 :align: center @@ -207,24 +174,18 @@ So, now we have an executable ready to run. If we were to use the Terminal, we w cd cd src - ./DisplayImage ../images/HappyLittleFish.jpg + ./DisplayImage ../images/HappyLittleFish.png -Assuming that the image to use as the argument would be located in /images/HappyLittleFish.jpg. We can still do this, but let's do it from Eclipse: +Assuming that the image to use as the argument would be located in /images/HappyLittleFish.png. We can still do this, but let's do it from Eclipse: #. Go to **Run->Run Configurations** - .. image:: images/a13.jpg - :height: 300px - :alt: Eclipse Tutorial Screenshot 13 - :align: center - #. Under C/C++ Application you will see the name of your executable + Debug (if not, click over C/C++ Application a couple of times). Select the name (in this case **DisplayImage Debug**). -#. Now, in the right side of the window, choose the **Arguments** Tab. Write the path of the image file we want to open (path relative to the workspace/DisplayImage folder). Let's use **HappyLittleFish.jpg**: +#. Now, in the right side of the window, choose the **Arguments** Tab. Write the path of the image file we want to open (path relative to the workspace/DisplayImage folder). Let's use **HappyLittleFish.png**: - .. image:: images/a14.jpg - :height: 300px + .. image:: images/a14.png :alt: Eclipse Tutorial Screenshot 14 :align: center @@ -234,5 +195,4 @@ Assuming that the image to use as the argument would be located in SVN Checkout...` in the directory. - .. image:: images/TortoiseSVNCheckout.jpg + .. image:: images/TortoiseSVNCheckout.png :alt: The TortoiseSVN Checkout Menu :align: center A window will appear where you can select from what repository you want to download source files (1) and to which directory (2): - .. image:: images/TortoiseSVNCheckoutWindow.jpg + .. image:: images/TortoiseSVNCheckoutWindow.png :alt: The TortoiseSVN Checkout Window :align: center Add here either ones of the versions described above. Then push the OK button and be patient as the repository currently is over 330MB to download. It will take some time until it is finished depending on your Internet connection. - .. image:: images/SVNCheckOutProgress.jpg + .. image:: images/SVNCheckOutProgress.png :alt: The TortoiseSVN Checkout Progress :align: center @@ -173,7 +173,7 @@ Building the library :alt: The Windows Command Startup :align: center - .. image:: images/Sphinx_Install.jpg + .. image:: images/Sphinx_Install.png :alt: How to start the command window :align: center @@ -187,13 +187,13 @@ Building the library #) Download the |Miktex|_ and install it. Again just follow the wizard. At the fourth step make sure you select for the *"Install missing packages on-the-fly"* the *Yes* option, as you can see on the image below. Again this will take quite some time so be patient. - .. image:: images/MiktexInstall.jpg + .. image:: images/MiktexInstall.png :alt: The Miktex Install Screen :align: center #) For the |IntelTBB|_ download the source files and extract it inside a directory on your system. For example let there be :file:`D:/OpenCV/dep`. For installing the |IntelIIP|_ the story is the same. For exctracting the archives I recommend using the `7-Zip `_ application. - .. image:: images/IntelTBB.jpg + .. image:: images/IntelTBB.png :alt: The Miktex Install Screen :align: center @@ -207,7 +207,7 @@ Building the library #) In case of the |qtframework|_ you need to build yourself the binary files (unless you use the Microsoft Visual Studio 2008 with 32 bit compiler). To do this go to the `Qt Downloads `_ page. Download the source files (not the installers!!!): - .. image:: images/qtDownloadThisPackage.jpg + .. image:: images/qtDownloadThisPackage.png :alt: Download this Qt Package :align: center @@ -309,13 +309,13 @@ Building the library For the documentation you need to explicitly issue the build commands on the *doc* project for the PDF files and on the *doc_html* for the HTML ones. Each of these will call *Sphinx* to do all the hard work. You can find the generated documentation inside the :file:`Build/Doc/_html` for the HTML pages and within the :file:`Build/Doc` the PDF manuals. - .. image:: images/WindowsBuildDoc.jpg + .. image:: images/WindowsBuildDoc.png :alt: The Documentation Projects :align: center To collect the header and the binary files, that you will use during your own projects, into a separate directory (simillary to how the pre-built binaries ship) you need to explicitely build the *Install* project. - .. image:: images/WindowsBuildInstall.jpg + .. image:: images/WindowsBuildInstall.png :alt: The Install Project :align: center @@ -325,14 +325,14 @@ Building the library To create an installer you need to install `NSIS `_. Then just build the *Package* project to build the installer into the :file:`Build/_CPack_Packages/{win32}/NSIS` folder. You can then use this to distribute OpenCV with your build settings on other systems. - .. image:: images/WindowsOpenCVInstaller.jpg + .. image:: images/WindowsOpenCVInstaller.png :alt: The Installer directory :align: center To test your build just go into the :file:`Build/bin/Debug` or :file:`Build/bin/Release` directory and start a couple of applications like the *contours.exe*. If they run, you are done. Otherwise, something definitely went awfully wrong. In this case you should contact us via our :opencv_group:`user group <>`. If everything is okay the *contours.exe* output should resemble the following image (if built with Qt support): - .. image:: images/WindowsQtContoursOutput.jpg + .. image:: images/WindowsQtContoursOutput.png :alt: A good output result :align: center @@ -359,11 +359,11 @@ If you built static libraries then you are done. Otherwise, you need to add the %OPENCV_DIR%\bin -.. image:: images/PathEditorOpenCVInsertNew.jpg +.. image:: images/PathEditorOpenCVInsertNew.png :alt: Right click to insert new path manually. :align: center -.. image:: images/PathEditorOpenCVSetPath.jpg +.. image:: images/PathEditorOpenCVSetPath.png :alt: Add the entry. :align: center diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/AddNewPropertySheet.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/AddNewPropertySheet.jpg index 4ad0bad6b4..773d4d0b2a 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/AddNewPropertySheet.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/AddNewPropertySheet.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/NewProjectVisualStudio.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/NewProjectVisualStudio.jpg index c02f203665..fb12f8f0f1 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/NewProjectVisualStudio.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/NewProjectVisualStudio.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCVEditEnviromentVisual.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCVEditEnviromentVisual.jpg index 6226c2b0e4..f5e55ab395 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCVEditEnviromentVisual.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCVEditEnviromentVisual.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCV_Install_Directory.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCV_Install_Directory.jpg index 6c6625ab08..3f32c0f674 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCV_Install_Directory.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCV_Install_Directory.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageAddExisting.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageAddExisting.jpg index 7e92c73de8..30c3194f97 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageAddExisting.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageAddExisting.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageExample.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageExample.jpg index bfe861409f..f2f2034adc 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageExample.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageExample.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetInsideFolder.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetInsideFolder.jpg index 5ece6c4598..a20d59f111 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetInsideFolder.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetInsideFolder.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVInclude.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVInclude.jpg index 136ddc7d97..5826f4dd6c 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVInclude.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVInclude.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLib.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLib.jpg index 484bba4eab..25c88b3762 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLib.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLib.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebug.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebug.jpg index 58c7880b28..c28841acfa 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebug.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebug.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg index fb8b2d9502..7fcbf9d8f0 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesRelease.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesRelease.jpg index 45b23ebeb9..dd93d21688 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesRelease.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesRelease.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetVS2010.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetVS2010.jpg index 56f2c3f0a6..64446ac422 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetVS2010.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetVS2010.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/SuccessVisualStudioWindows.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/SuccessVisualStudioWindows.jpg index 1043c41e57..d63b5c981d 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/SuccessVisualStudioWindows.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/SuccessVisualStudioWindows.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2008.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2008.jpg index d053c4fa19..7cb6aa9151 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2008.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2008.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2010.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2010.jpg index dd898ed526..4cf1fcd3d8 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2010.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2010.jpg differ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VisualStudioCommandLineArguments.jpg b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VisualStudioCommandLineArguments.jpg index 14a70aeb25..9d52d98945 100644 Binary files a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VisualStudioCommandLineArguments.jpg and b/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VisualStudioCommandLineArguments.jpg differ