generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3967 from Belev:fix-typo

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-28 14:47:05 +00:00
commit 07e07655d4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/tutorials/core/adding_images/adding_images.markdown
View File

@ -22,7 +22,7 @@ From our previous tutorial, we know already a bit of *Pixel operators*. An inter
\f[g(x) = (1 - \alpha)f_{0}(x) + \alpha f_{1}(x)\f] \f[g(x) = (1 - \alpha)f_{0}(x) + \alpha f_{1}(x)\f]
By varying \f$\alpha\f$ from \f$0 \rightarrow 1\f$ this operator can be used to perform a temporal By varying \f$\alpha\f$ from \f$0 \rightarrow 1\f$ 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, *cross-dissolve* between two images or videos, as seen in slide shows and film productions (cool,
eh?) eh?)
Code Code

2
doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.markdown
View File

@ -145,7 +145,7 @@ Explanation
of size **(w/4.0, w/16.0)** of size **(w/4.0, w/16.0)**
- The ellipse is rotated **angle** degrees - The ellipse is rotated **angle** degrees
- The ellipse extends an arc between **0** and **360** 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 RGB value.
- The ellipse's **thickness** is 2. - The ellipse's **thickness** is 2.
- *MyFilledCircle* - *MyFilledCircle*
@code{.cpp} @code{.cpp}

4
doc/tutorials/core/random_generator_and_text/random_generator_and_text.markdown
View File

@ -111,7 +111,7 @@ Explanation
pt1.y = rng.uniform( y_1, y_2 ); pt1.y = rng.uniform( y_1, y_2 );
@endcode @endcode
- We know that **rng** is a *Random number generator* object. In the code above we are - 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 calling **rng.uniform(a,b)**. This generates a randomly uniformed distribution between
the values **a** and **b** (inclusive in **a**, exclusive in **b**). 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 - 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 values, so the lines positions will be quite impredictable, giving a nice visual effect
@ -133,7 +133,7 @@ Explanation
are used as the *R*, *G* and *B* parameters for the line color. Hence, the color of the are used as the *R*, *G* and *B* parameters for the line color. Hence, the color of the
lines will be random too! lines will be random too!
-# The explanation above applies for the other functions generating circles, ellipses, polygones, -# The explanation above applies for the other functions generating circles, ellipses, polygons,
etc. The parameters such as *center* and *vertices* are also generated randomly. 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 -# 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: *Displaying_Big_End*, since they both have a few interesting features:

2
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -3494,7 +3494,7 @@ CV_EXPORTS_W double contourArea( InputArray contour, bool oriented = false );
The function calculates and returns the minimum-area bounding rectangle (possibly rotated) for a The function calculates and returns the minimum-area bounding rectangle (possibly rotated) for a
specified point set. See the OpenCV sample minarea.cpp . Developer should keep in mind that the specified point set. See the OpenCV sample minarea.cpp . Developer should keep in mind that the
returned rotatedRect can contain negative indices when data is close the the containing Mat element returned rotatedRect can contain negative indices when data is close to the containing Mat element
boundary. boundary.
@param points Input vector of 2D points, stored in std::vector\<\> or Mat @param points Input vector of 2D points, stored in std::vector\<\> or Mat