mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3478 from akarsakov:rect_fix_typo

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-12-06 08:08:27 +00:00
commit ef534537b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/doc/basic_structures.rst
View File

@ -285,7 +285,7 @@ In addition to the class members, the following operations on rectangles are imp
* ``rect = rect1 & rect2`` (rectangle intersection)
* ``rect = rect1 | rect2`` (minimum area rectangle containing ``rect2`` and ``rect3`` )
* ``rect = rect1 | rect2`` (minimum area rectangle containing ``rect1`` and ``rect2`` )
* ``rect &= rect1, rect |= rect1`` (and the corresponding augmenting operations)

2
modules/core/include/opencv2/core/types.hpp
View File

@ -356,7 +356,7 @@ In addition to the class members, the following operations on rectangles are imp
certain amount)
- rect += point, rect -= point, rect += size, rect -= size (augmenting operations)
- rect = rect1 & rect2 (rectangle intersection)
- rect = rect1 | rect2 (minimum area rectangle containing rect2 and rect3 )
- rect = rect1 | rect2 (minimum area rectangle containing rect1 and rect2 )
- rect &= rect1, rect |= rect1 (and the corresponding augmenting operations)
- rect == rect1, rect != rect1 (rectangle comparison)