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

Update hough_circles.cpp

Browse Source
This commit is contained in:
Chechli 2014-02-15 17:31:14 +01:00
parent 3542da7167
commit 72e4f72a75
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/cudaimgproc/src/hough_circles.cpp
View File

@ -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;
@ -140,6 +141,8 @@ namespace
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) :
dp_(dp), minDist_(minDist), cannyThreshold_(cannyThreshold), votesThreshold_(votesThreshold), dp_(dp), minDist_(minDist), cannyThreshold_(cannyThreshold), votesThreshold_(votesThreshold),
@ -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;