From: Bernat Gabor Date: Wed, 20 Jul 2011 18:08:25 +0000 (+0000) Subject: Ok, now optimized the tutorial size for real. Made JPG/PNG optimization for all the... X-Git-Tag: accepted/2.0/20130307.220821~2330 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43e083f14502e76e2f41e0cf8a7aeee320faa250;p=profile%2Fivi%2Fopencv.git Ok, now optimized the tutorial size for real. Made JPG/PNG optimization for all the images. Modified some tutorial files to follow these size optimizations. Now the tutorial PDF generated is 3.95MB, so enjoy! --- diff --git a/doc/tutorials/core/adding_images/adding_images.rst b/doc/tutorials/core/adding_images/adding_images.rst index 06b5961..e37f4f7 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 596dd57..f5c4526 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 5e4d565..068ebc1 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 ac01ca4..0000000 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 0000000..29abc4a 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 b03f4d4..0000000 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 4dfce32..0000000 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 7076159..d5c9a26 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 7caffec..527367c 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 cc805da..0000000 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 fbbf77f..0000000 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 0f559bc..0000000 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 0000000..414fba4 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 4647737..0000000 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 0000000..425dde8 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 cc2adf6..0000000 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 0000000..37db1db 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 57f333d..0000000 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 0000000..7652753 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 29d89ee..0000000 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 0000000..95fece4 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 c32d300..0000000 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 0000000..50bad2a 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 6bfcd0d..0000000 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 0000000..08514ce 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 b4f5902..0000000 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 0000000..1420957 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 a9012c4..0000000 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 0000000..0efb6c6 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 ef79387..0000000 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 0000000..046705f 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 e79bd99..0000000 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 0000000..8e1cf63 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 7aec2d3..0000000 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 0000000..211595e 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 56e8322..0000000 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 0000000..70c3eaa 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 9138b86..0000000 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 0000000..6747125 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 8fb8cde..0277296 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 6da3eed..b2d20e1 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 f483af9..7c66c50 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 07b7c26..0000000 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 97767e3..81e9313 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 ca1218c..20e274d 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 4588115..0000000 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 204ccb1..a540fb4 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 fa6078c..0000000 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 3cc9414..cc38466 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 8a9b0de..5e3f1de 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 2775154..940b54c 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 54d3419..eccf37a 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 e3718a4..05e8f01 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 cd04700..d650c18 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 cdb78d3..71509ba 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 f6cd160..c11f2ed 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 a269eb6..4e0fa26 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 013180b..ab6704a 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 6eb4f93..61ec8d1 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 08b4739..89fc7be 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 bce3bb6..bc4d816 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 8770065..e0ee608 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 9af8b15..e3291a8 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 978eef1..d2ef409 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 08b4739..0cca430 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 9721ef8..0078236 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 f79f147..0000000 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 5c7c59c..d185297 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 cbd5ff4..a1ef11f 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 dfc91fd..0000000 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 fd3c718..0000000 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 cde081f..0000000 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 0000000..16a6fee 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 1a4b801..21f8b36 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 d54050c..c5226a9 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 8845228..6fe819b 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 bf6f44b..6744de0 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 6ab3054..95829d9 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 7f81e4c..4cc0538 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 522183c..ada65fc 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 c55abbe..ad7dafb 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 b6e4a8f..19a9284 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 2d53479..40acfcf 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 06216a8..c811f34 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 9400622..dd5d0c4 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 0493462..601abb8 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 6542612..64de099 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 ed262da..f5dcfcc 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 d3f2f61..bda78a6 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 727df90..5b61a95 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 ed27a49..0000000 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 0000000..dae930e 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 cfa497f..0000000 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 0000000..7555610 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 c734bb0..0000000 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 0000000..d7e8a9a 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 37e2377..379ce0c 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 38a822b..da5f1ba 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 e975f4c..f6512f6 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 c45f747..baf9cc2 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 1ac0199..b2d6a2d 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 3feb2a0..21ed375 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 b805302..5f3824c 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 2684f06..38cd4c8 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 3323368..0c5c6f9 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 4c42898..8d0ac9e 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 1b8da16..4107e5e 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 2b84056..5f2b2f2 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 feba2bf..cca1e81 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 5afc3d8..55ca013 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 833ff69..e8eb67f 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 06d6e32..d9da998 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 4915557..07b7e32 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 7f6947e..07ba95d 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 6fed3fd..7e420ba 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 c96b27e..5dbae04 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 4c42898..8d0ac9e 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 8ca11f9..2cafdaa 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 bd339a0..2b78393 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 e88fe94..857002e 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 59572af..aa80cfa 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 3992ed2..70f885d 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 4177a96..a10e660 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 bb16964..cf5ddca 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 c9aa79d..4f62579 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 6894d2b..64b285a 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 cc2496e..0a56958 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 cd3edb4..30b65ea 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 f84e599..3e2128b 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 df0de48..5427448 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 e905695..61e4a62 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 ff99705..642764e 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 e8c4183..845a4a9 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 601ca6f..7eed84e 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 7809066..7411ccb 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 8383cc2..c81afa1 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 a862ee6..7afeb00 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 c7c0dcd..ebb5ddb 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 d1726c8..5d760bd 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 b454566..bf448f3 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 bbddc71..21c8e1b 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 1c83dcb..10c6c54 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 648148f..7fad4b5 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 d26066c..0000000 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 0000000..4105288 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 5f326f5..2cf9f5c 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 862243c..bd90c09 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 2a599fc..b056184 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 8b729ca..a09c46e 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 147f293..3d29793 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 2e6211d..ec75831 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 a6107b0..125437d 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 e8111eb..0e0ff22 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 0f29704..edbbcf6 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 ae0dc05..996f7c6 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 2369ba5..beb114c 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 2354d9a..9cba133 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 1d5a29d..6a16926 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 7bc1768..67d95d2 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 b7a8ee7..99bb326 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 46cce16..422ce19 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 a38f383..5020931 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 9d2a4e3..e601fdf 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 934d78c..f597d49 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 74d5982..fabfaf0 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 cf5a74a..e586696 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 8d1aa12..7195da7 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 ead594e..45f44b8 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 c79d506..2c84310 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 bd77398..adaab86 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 ce43af1..3a5b13a 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 7bc1768..3fae177 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 213dcb5..d544b10 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 52737c5..6c1c773 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 611bfd6..8fa7d65 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 55763fd..1f82830 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 dd6a46a..8294823 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 25cd4fb..dc2d1e7 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 2f98d83..8aa7ff2 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 05ef881..0000000 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 0000000..ce6ff35 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 0279812..0000000 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 0000000..f112bfe 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 80e7416..0000000 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 0000000..5d8077f 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 a301409..0000000 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 0000000..7b8b085 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 c000766..0000000 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 0000000..ca22789 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 f233f06..40b06a5 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 2a1f597..0000000 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 a9857ce..2a4fc40 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 71f30a7..69382aa 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 d2acb7c..76a3b81 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 573b87d..0000000 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 0000000..8321c36 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 90190c6..41c7347 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 336cd62..1d7e1f2 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 c22558a..d132345 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 4747ead..3c08c13 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 8bc7ddd..1e679ea 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 2d8eb5d..cc869fd 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 623bf8a..c475ebd 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 8f838e1..fa46610 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 34010cb..0372eda 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 a0b1c92..953eeab 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 9383771..b47125a 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 63e3ad2..8b3f0d3 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 4703d86..16ca49c 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 7f7b45b..1e8112a 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 18fe1ff..d63de9a 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 8b8c34e..f285fdb 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 d82dd02..e420f47 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 a9a2567..0000000 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 0000000..87bf5d2 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 db85c2b..f3fa84c 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 cdb78d3..67da3a5 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 27685b8..b3a1c55 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 da24ffb..0851cab 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 c471fb4..67656ab 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 28f24bd..6b115d8 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 c45f747..013bdf6 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 4915557..32d09e3 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 5ab4327..7538a72 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 d01ad5e..fbc5866 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 08d49f1..e84f521 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 bbddc71..bcd9ff9 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 5e91f40..f241ff2 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 eb02934..c2f5809 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 2a599fc..175180a 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 a6107b0..4211ee2 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 2354d9a..14373f2 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 74d5982..bfb55db 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 ead594e..fbe17c8 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 611bfd6..5655789 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 c22558a..be2ae57 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 2d8eb5d..b733059 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 a0b1c92..82888a1 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 4703d86..a7a1b6e 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 7f7b45b..1e865eb 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 d82dd02..9980df8 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 54622de..82a12d2 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 a9857ce..7aaa61d 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 8b9e38f..7f6ee08 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 2f25cab..ea3039b 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 dea9229..0000000 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 0000000..5078bba 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 cbf7700..0000000 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 0000000..a06972d 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 7c74247..0000000 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 0000000..1962a8c 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 bbc32e5..73112e1 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 7f6357e..0000000 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 0000000..6e4c657 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 e71d595..0000000 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 0000000..6ab10a7 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 494a25a..0000000 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 0000000..f8cb3b3 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 b4a6443..1ac4919 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 33c3bab..cb92101 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 4435cc0..6e7f28c 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 f2bab8e..3731599 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 4019d72..1ca38a1 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 2df23a0..05e6671 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 9850fb8..8a3b0a7 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 acbf20d..0000000 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 da8a66d..1b2dd53 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 48ed393..ff699eb 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 0a59a74..349cc98 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 afc0429..38c4da7 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 f3b4e9c..e7aab5a 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 5dd864e..428b2ef 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 cde9689..ffa938c 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 2dc9d7c..baff852 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 8d3063f..1640069 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 f1aecfe..0000000 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 eb2fafd..0000000 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 0000000..00577b7e 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 b01e13e..0000000 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 0000000..edbb69e 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 8725d38..0000000 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 0000000..d3603ba 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 8454d29..0000000 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 3c8fbc5..0000000 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 0000000..4838501 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 a84d628..0000000 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 b0cf9ad..0000000 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 0000000..7db8299 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 9e39e1e..4f1fa43 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 04ac3d0..0000000 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 73af38c..0000000 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 0000000..53f700e 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 92f90a2..0000000 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 0000000..fc1eb71 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 b7b7348..0000000 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 d95c5c2..0000000 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 0398795..0000000 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 0000000..a87d6eb 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 66ea78e..0000000 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 75c6cdb..0000000 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 0000000..0e34c7e 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 ec91213..1e0f586 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 4ad0bad..773d4d0 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 c02f203..fb12f8f 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 6226c2b..f5e55ab 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 6c6625a..3f32c0f 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 7e92c73..30c3194 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 bfe8614..f2f2034 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 5ece6c4..a20d59f 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 136ddc7..5826f4d 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 484bba4..25c88b3 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 58c7880..c28841a 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 fb8b2d9..7fcbf9d 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 45b23eb..dd93d21 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 56f2c3f..64446ac 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 1043c41..d63b5c9 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 d053c4f..7cb6aa9 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 dd898ed..4cf1fcd 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 14a70ae..9d52d98 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