Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5f990566
Commit
5f990566
authored
Mar 02, 2017
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8297 from csukuangfj:csukuangfj-patch
parents
ddfe688b
34c70e7a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
imgproc.hpp
modules/imgproc/include/opencv2/imgproc.hpp
+11
-11
No files found.
modules/imgproc/include/opencv2/imgproc.hpp
View file @
5f990566
...
@@ -416,7 +416,7 @@ enum ConnectedComponentsTypes {
...
@@ -416,7 +416,7 @@ enum ConnectedComponentsTypes {
//! connected components algorithm
//! connected components algorithm
enum
ConnectedComponentsAlgorithmsTypes
{
enum
ConnectedComponentsAlgorithmsTypes
{
CCL_WU
=
0
,
//!< SAUF algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity
CCL_WU
=
0
,
//!< SAUF algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity
CCL_DEFAULT
=
-
1
,
//!< BBDT algor
ti
hm for 8-way connectivity, SAUF algorithm for 4-way connectivity
CCL_DEFAULT
=
-
1
,
//!< BBDT algor
it
hm for 8-way connectivity, SAUF algorithm for 4-way connectivity
CCL_GRANA
=
1
//!< BBDT algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity
CCL_GRANA
=
1
//!< BBDT algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity
};
};
...
@@ -826,7 +826,7 @@ public:
...
@@ -826,7 +826,7 @@ public:
};
};
//! Ballard, D.H. (1981). Generalizing the Hough transform to detect arbitrary shapes. Pattern Recognition 13 (2): 111-122.
//! Ballard, D.H. (1981). Generalizing the Hough transform to detect arbitrary shapes. Pattern Recognition 13 (2): 111-122.
//! Detects position only without traslation and rotation
//! Detects position only without tra
n
slation and rotation
class
CV_EXPORTS
GeneralizedHoughBallard
:
public
GeneralizedHough
class
CV_EXPORTS
GeneralizedHoughBallard
:
public
GeneralizedHough
{
{
public
:
public
:
...
@@ -840,7 +840,7 @@ public:
...
@@ -840,7 +840,7 @@ public:
};
};
//! Guil, N., González-Linares, J.M. and Zapata, E.L. (1999). Bidimensional shape detection using an invariant approach. Pattern Recognition 32 (6): 1025-1038.
//! Guil, N., González-Linares, J.M. and Zapata, E.L. (1999). Bidimensional shape detection using an invariant approach. Pattern Recognition 32 (6): 1025-1038.
//! Detects position, traslation and rotation
//! Detects position, tra
n
slation and rotation
class
CV_EXPORTS
GeneralizedHoughGuil
:
public
GeneralizedHough
class
CV_EXPORTS
GeneralizedHoughGuil
:
public
GeneralizedHough
{
{
public
:
public
:
...
@@ -995,7 +995,7 @@ public:
...
@@ -995,7 +995,7 @@ public:
- The point is outside the subdivision reference rectangle. The function returns PTLOC_OUTSIDE_RECT
- The point is outside the subdivision reference rectangle. The function returns PTLOC_OUTSIDE_RECT
and no pointers are filled.
and no pointers are filled.
- One of input arguments is invalid. A runtime error is raised or, if silent or “parent” error
- One of input arguments is invalid. A runtime error is raised or, if silent or “parent” error
processing mode is selected, CV_PTLOC_ERROR is returnd.
processing mode is selected, CV_PTLOC_ERROR is return
e
d.
*/
*/
CV_WRAP
int
locate
(
Point2f
pt
,
CV_OUT
int
&
edge
,
CV_OUT
int
&
vertex
);
CV_WRAP
int
locate
(
Point2f
pt
,
CV_OUT
int
&
edge
,
CV_OUT
int
&
vertex
);
...
@@ -1407,7 +1407,7 @@ CV_EXPORTS_W void bilateralFilter( InputArray src, OutputArray dst, int d,
...
@@ -1407,7 +1407,7 @@ CV_EXPORTS_W void bilateralFilter( InputArray src, OutputArray dst, int d,
/** @brief Blurs an image using the box filter.
/** @brief Blurs an image using the box filter.
The function smooth
e
s an image using the kernel:
The function smooths an image using the kernel:
\f[\texttt{K} = \alpha \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \end{bmatrix}\f]
\f[\texttt{K} = \alpha \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \end{bmatrix}\f]
...
@@ -1459,7 +1459,7 @@ CV_EXPORTS_W void sqrBoxFilter( InputArray _src, OutputArray _dst, int ddepth,
...
@@ -1459,7 +1459,7 @@ CV_EXPORTS_W void sqrBoxFilter( InputArray _src, OutputArray _dst, int ddepth,
/** @brief Blurs an image using the normalized box filter.
/** @brief Blurs an image using the normalized box filter.
The function smooth
e
s an image using the kernel:
The function smooths an image using the kernel:
\f[\texttt{K} = \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \end{bmatrix}\f]
\f[\texttt{K} = \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \end{bmatrix}\f]
...
@@ -3584,7 +3584,7 @@ CV_EXPORTS_W void cvtColor( InputArray src, OutputArray dst, int code, int dstCn
...
@@ -3584,7 +3584,7 @@ CV_EXPORTS_W void cvtColor( InputArray src, OutputArray dst, int code, int dstCn
//! @} imgproc_misc
//! @} imgproc_misc
// main function for all demosaicing proc
ce
ses
// main function for all demosaicing proc
es
ses
CV_EXPORTS_W
void
demosaicing
(
InputArray
_src
,
OutputArray
_dst
,
int
code
,
int
dcn
=
0
);
CV_EXPORTS_W
void
demosaicing
(
InputArray
_src
,
OutputArray
_dst
,
int
code
,
int
dcn
=
0
);
//! @addtogroup imgproc_shape
//! @addtogroup imgproc_shape
...
@@ -3766,7 +3766,7 @@ If mode equals to cv::RETR_CCOMP or cv::RETR_FLOODFILL, the input can also be a
...
@@ -3766,7 +3766,7 @@ If mode equals to cv::RETR_CCOMP or cv::RETR_FLOODFILL, the input can also be a
std::vector<std::vector<cv::Point> >).
std::vector<std::vector<cv::Point> >).
@param hierarchy Optional output vector (e.g. std::vector<cv::Vec4i>), containing information about the image topology. It has
@param hierarchy Optional output vector (e.g. std::vector<cv::Vec4i>), containing information about the image topology. It has
as many elements as the number of contours. For each i-th contour contours[i], the elements
as many elements as the number of contours. For each i-th contour contours[i], the elements
hierarchy[i][0] , hie
archy[i][1] , hiearchy[i][2] , and hie
archy[i][3] are set to 0-based indices
hierarchy[i][0] , hie
rarchy[i][1] , hierarchy[i][2] , and hier
archy[i][3] are set to 0-based indices
in contours of the next and previous contours at the same hierarchical level, the first child
in contours of the next and previous contours at the same hierarchical level, the first child
contour and the parent contour, respectively. If for the contour i there are no next, previous,
contour and the parent contour, respectively. If for the contour i there are no next, previous,
parent, or nested contours, the corresponding elements of hierarchy[i] will be negative.
parent, or nested contours, the corresponding elements of hierarchy[i] will be negative.
...
@@ -4054,7 +4054,7 @@ CV_EXPORTS_W double pointPolygonTest( InputArray contour, Point2f pt, bool measu
...
@@ -4054,7 +4054,7 @@ CV_EXPORTS_W double pointPolygonTest( InputArray contour, Point2f pt, bool measu
/** @brief Finds out if there is any intersection between two rotated rectangles.
/** @brief Finds out if there is any intersection between two rotated rectangles.
If there is then the vertices of the inter
e
secting region are returned as well.
If there is then the vertices of the intersecting region are returned as well.
Below are some examples of intersection configurations. The hatched pattern indicates the
Below are some examples of intersection configurations. The hatched pattern indicates the
intersecting region and the red vertices are returned by the function.
intersecting region and the red vertices are returned by the function.
...
@@ -4074,11 +4074,11 @@ CV_EXPORTS_W int rotatedRectangleIntersection( const RotatedRect& rect1, const R
...
@@ -4074,11 +4074,11 @@ CV_EXPORTS_W int rotatedRectangleIntersection( const RotatedRect& rect1, const R
CV_EXPORTS_W
Ptr
<
CLAHE
>
createCLAHE
(
double
clipLimit
=
40.0
,
Size
tileGridSize
=
Size
(
8
,
8
));
CV_EXPORTS_W
Ptr
<
CLAHE
>
createCLAHE
(
double
clipLimit
=
40.0
,
Size
tileGridSize
=
Size
(
8
,
8
));
//! Ballard, D.H. (1981). Generalizing the Hough transform to detect arbitrary shapes. Pattern Recognition 13 (2): 111-122.
//! Ballard, D.H. (1981). Generalizing the Hough transform to detect arbitrary shapes. Pattern Recognition 13 (2): 111-122.
//! Detects position only without traslation and rotation
//! Detects position only without tra
n
slation and rotation
CV_EXPORTS
Ptr
<
GeneralizedHoughBallard
>
createGeneralizedHoughBallard
();
CV_EXPORTS
Ptr
<
GeneralizedHoughBallard
>
createGeneralizedHoughBallard
();
//! Guil, N., González-Linares, J.M. and Zapata, E.L. (1999). Bidimensional shape detection using an invariant approach. Pattern Recognition 32 (6): 1025-1038.
//! Guil, N., González-Linares, J.M. and Zapata, E.L. (1999). Bidimensional shape detection using an invariant approach. Pattern Recognition 32 (6): 1025-1038.
//! Detects position, traslation and rotation
//! Detects position, tra
n
slation and rotation
CV_EXPORTS
Ptr
<
GeneralizedHoughGuil
>
createGeneralizedHoughGuil
();
CV_EXPORTS
Ptr
<
GeneralizedHoughGuil
>
createGeneralizedHoughGuil
();
//! Performs linear blending of two images
//! Performs linear blending of two images
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment