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

Moved BlobDetector to features2d

Browse Source
This commit is contained in:
Ilya Lysenkov
2010-12-27 09:15:08 +00:00
parent 1ecb6cf775
commit 2d5a984c28
7 changed files with 67 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/calib3d/src/calibinit.cpp
View File

@@ -61,7 +61,6 @@
#include "precomp.hpp"
#include "circlesgrid.hpp"
#include "blobdetector.hpp"
#include <stdarg.h>
//#define ENABLE_TRIM_COL_ROW
@@ -1938,10 +1937,15 @@ void drawChessboardCorners( Mat& image, Size patternSize,
bool findCirclesGrid( const Mat& image, Size patternSize,
vector<Point2f>& centers, int )
{
Ptr<BlobDetector> detector = new BlobDetector();
Ptr<SimpleBlobDetector> detector = new SimpleBlobDetector();
//Ptr<FeatureDetector> detector = new MserFeatureDetector();
vector<Point2f> keypoints;
vector<KeyPoint> keypoints;
detector->detect(image, keypoints);
vector<Point2f> points;
for (size_t i = 0; i < keypoints.size(); i++)
{
points.push_back (keypoints[i].pt);
}
CirclesGridFinderParameters parameters;
parameters.vertexPenalty = -0.6f;
@@ -1956,7 +1960,7 @@ bool findCirclesGrid( const Mat& image, Size patternSize,
for (int i = 0; i < attempts; i++)
{
centers.clear();
CirclesGridFinder boxFinder(patternSize, keypoints, parameters);
CirclesGridFinder boxFinder(patternSize, points, parameters);
bool isFound = false;
try
{
@@ -1984,7 +1988,7 @@ bool findCirclesGrid( const Mat& image, Size patternSize,
{
if (centers.size() < minHomographyPoints)
break;
H = CirclesGridFinder::rectifyGrid(boxFinder.getDetectedGridSize(), centers, keypoints, keypoints);
H = CirclesGridFinder::rectifyGrid(boxFinder.getDetectedGridSize(), centers, points, points);
}
}