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
72e4f72a
Commit
72e4f72a
authored
Feb 15, 2014
by
Chechli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update hough_circles.cpp
parent
3542da71
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
1 deletion
+16
-1
hough_circles.cpp
modules/cudaimgproc/src/hough_circles.cpp
+16
-1
No files found.
modules/cudaimgproc/src/hough_circles.cpp
View file @
72e4f72a
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
//M*/
//M*/
#include "precomp.hpp"
#include "precomp.hpp"
#include <algorithm>
using
namespace
cv
;
using
namespace
cv
;
using
namespace
cv
::
cuda
;
using
namespace
cv
::
cuda
;
...
@@ -139,6 +140,8 @@ namespace
...
@@ -139,6 +140,8 @@ namespace
Ptr
<
cuda
::
Filter
>
filterDy_
;
Ptr
<
cuda
::
Filter
>
filterDy_
;
Ptr
<
cuda
::
CannyEdgeDetector
>
canny_
;
Ptr
<
cuda
::
CannyEdgeDetector
>
canny_
;
};
};
bool
centersCompare
(
Vec3f
a
,
Vec3f
b
)
{
return
(
a
[
2
]
>
b
[
2
]);}
HoughCirclesDetectorImpl
::
HoughCirclesDetectorImpl
(
float
dp
,
float
minDist
,
int
cannyThreshold
,
int
votesThreshold
,
HoughCirclesDetectorImpl
::
HoughCirclesDetectorImpl
(
float
dp
,
float
minDist
,
int
cannyThreshold
,
int
votesThreshold
,
int
minRadius
,
int
maxRadius
,
int
maxCircles
)
:
int
minRadius
,
int
maxRadius
,
int
maxCircles
)
:
...
@@ -219,9 +222,21 @@ namespace
...
@@ -219,9 +222,21 @@ namespace
const
float
minDist2
=
minDist_
*
minDist_
;
const
float
minDist2
=
minDist_
*
minDist_
;
vector
<
Vec3f
>
sortBuf
;
for
(
int
i
=
0
;
i
<
centersCount
;
i
++
){
Vec3f
temp
;
temp
[
0
]
=
oldBuf
[
i
].
x
;
temp
[
1
]
=
oldBuf
[
i
].
y
;
temp
[
2
]
=
tt
.
at
<
int
>
(
temp
[
1
]
+
1
,
temp
[
0
]
+
1
);
sortBuf
.
push_back
(
temp
);
}
std
::
sort
(
sortBuf
.
begin
(),
sortBuf
.
end
(),
centersCompare
);
for
(
int
i
=
0
;
i
<
centersCount
;
++
i
)
for
(
int
i
=
0
;
i
<
centersCount
;
++
i
)
{
{
ushort2
p
=
oldBuf
[
i
];
ushort2
p
;
p
.
x
=
sortBuf
[
i
][
0
];
p
.
y
=
sortBuf
[
i
][
1
];
bool
good
=
true
;
bool
good
=
true
;
...
...
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