From 83eb1d3608a580871410d12057177fe7bcf51a5a Mon Sep 17 00:00:00 2001 From: Belev Date: Mon, 27 Apr 2015 11:10:47 +0300 Subject: [PATCH] Fix typo Fixed difference in the given arguments to the ellipse function and the description after that Fixed two more typos Replaced unnecessary the with to Conflicts: doc/tutorials/core/adding_images/adding_images.markdown doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.markdown doc/tutorials/core/random_generator_and_text/random_generator_and_text.markdown modules/imgproc/include/opencv2/imgproc.hpp --- doc/tutorials/core/adding_images/adding_images.rst | 2 +- .../core/basic_geometric_drawing/basic_geometric_drawing.rst | 2 +- .../random_generator_and_text/random_generator_and_text.rst | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/tutorials/core/adding_images/adding_images.rst b/doc/tutorials/core/adding_images/adding_images.rst index 601dbc07ef..ba25c6b896 100644 --- a/doc/tutorials/core/adding_images/adding_images.rst +++ b/doc/tutorials/core/adding_images/adding_images.rst @@ -26,7 +26,7 @@ From our previous tutorial, we know already a bit of *Pixel operators*. An inter g(x) = (1 - \alpha)f_{0}(x) + \alpha f_{1}(x) -By varying :math:`\alpha` from :math:`0 \rightarrow 1` this operator can be used to perform a temporal *cross-disolve* between two images or videos, as seen in slide shows and film productions (cool, eh?) +By varying :math:`\alpha` from :math:`0 \rightarrow 1` this operator can be used to perform a temporal *cross-dissolve* between two images or videos, as seen in slide shows and film productions (cool, eh?) Code ===== 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 ea7450c986..a50f1c5e3d 100644 --- a/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst +++ b/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst @@ -167,7 +167,7 @@ Explanation * The ellipse center is located in the point **(w/2.0, w/2.0)** and is enclosed in a box of size **(w/4.0, w/16.0)** * The ellipse is rotated **angle** degrees * The ellipse extends an arc between **0** and **360** degrees - * The color of the figure will be **Scalar( 255, 255, 0)** which means blue in RGB value. + * The color of the figure will be **Scalar( 255, 0, 0)** which means blue in BGR value. * The ellipse's **thickness** is 2. 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 38c761fc6e..a5c4bb7ed6 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 @@ -116,7 +116,7 @@ Explanation pt1.x = rng.uniform( x_1, x_2 ); pt1.y = rng.uniform( y_1, y_2 ); - * We know that **rng** is a *Random number generator* object. In the code above we are calling **rng.uniform(a,b)**. This generates a radombly uniformed distribution between the values **a** and **b** (inclusive in **a**, exclusive in **b**). + * We know that **rng** is a *Random number generator* object. In the code above we are calling **rng.uniform(a,b)**. This generates a randomly uniformed distribution between the values **a** and **b** (inclusive in **a**, exclusive in **b**). * From the explanation above, we deduce that the extremes *pt1* and *pt2* will be random values, so the lines positions will be quite impredictable, giving a nice visual effect (check out the Result section below). @@ -138,7 +138,7 @@ Explanation As we can see, the return value is an *Scalar* with 3 randomly initialized values, which are used as the *R*, *G* and *B* parameters for the line color. Hence, the color of the lines will be random too! -#. The explanation above applies for the other functions generating circles, ellipses, polygones, etc. The parameters such as *center* and *vertices* are also generated randomly. +#. The explanation above applies for the other functions generating circles, ellipses, polygons, etc. The parameters such as *center* and *vertices* are also generated randomly. #. Before finishing, we also should take a look at the functions *Display_Random_Text* and *Displaying_Big_End*, since they both have a few interesting features: