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

Fixed some warnings under Windows

Browse Source
This commit is contained in:
Ilya Lysenkov 2010-12-21 12:11:28 +00:00
parent 351f6eeb97
commit 0bc1349335
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calib3d/src/blobdetector.cpp
View File

@ -64,14 +64,14 @@ BlobDetectorParameters::BlobDetectorParameters()
filterByInertia = true;
//minInertiaRatio = 0.6;
minInertiaRatio = 0.1;
minInertiaRatio = 0.1f;
filterByConvexity = true;
//minConvexity = 0.8;
minConvexity = 0.95;
minConvexity = 0.95f;
filterByCircularity = false;
minCircularity = 0.8;
minCircularity = 0.8f;
}
BlobDetector::BlobDetector(const BlobDetectorParameters &parameters) :
@ -195,7 +195,7 @@ void BlobDetector::findBlobs(const cv::Mat &image, const cv::Mat &binaryImage, v
if (params.filterByColor)
{
if (binaryImage.at<uchar> (center.location.y, center.location.x) == 255)
if (binaryImage.at<uchar> (cvRound(center.location.y), cvRound(center.location.x)) == 255)
continue;
}

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

@ -1936,7 +1936,7 @@ void drawChessboardCorners( Mat& image, Size patternSize,
}
bool findCirclesGrid( const Mat& image, Size patternSize,
vector<Point2f>& centers, int flags )
vector<Point2f>& centers, int )
{
Ptr<BlobDetector> detector = new BlobDetector();
//Ptr<FeatureDetector> detector = new MserFeatureDetector();
@ -1944,11 +1944,11 @@ bool findCirclesGrid( const Mat& image, Size patternSize,
detector->detect(image, keypoints);
CirclesGridFinderParameters parameters;
parameters.vertexPenalty = -0.6;
parameters.vertexPenalty = -0.6f;
parameters.vertexGain = 1;
parameters.existingVertexGain = 10000;
parameters.edgeGain = 1;
parameters.edgePenalty = -0.6;
parameters.edgePenalty = -0.6f;
const int attempts = 2;
const int minHomographyPoints = 4;
@ -1962,7 +1962,7 @@ bool findCirclesGrid( const Mat& image, Size patternSize,
{
isFound = boxFinder.findHoles();
}
catch (cv::Exception &e)
catch (cv::Exception)
{
}

15
modules/calib3d/src/circlesgrid.cpp
View File

@ -142,7 +142,7 @@ CirclesGridFinderParameters::CirclesGridFinderParameters()
densityNeighborhoodSize = Size2f(16, 16);
minDistanceToAddKeypoint = 20;
kmeansAttempts = 100;
convexHullFactor = 1.1;
convexHullFactor = 1.1f;
keypointScale = 1;
minGraphConfidence = 9;
@ -258,7 +258,6 @@ Mat CirclesGridFinder::rectifyGrid(Size detectedGridSize, const vector<Point2f>&
assert( !centers.empty() );
const float edgeLength = 30;
const Point2f offset(150, 150);
const int keypointScale = 1;
vector<Point2f> dstPoints;
for (int i = 0; i < detectedGridSize.height; i++)
@ -296,10 +295,10 @@ Mat CirclesGridFinder::rectifyGrid(Size detectedGridSize, const vector<Point2f>&
int CirclesGridFinder::findNearestKeypoint(Point2f pt) const
{
int bestIdx = -1;
float minDist = std::numeric_limits<float>::max();
double minDist = std::numeric_limits<double>::max();
for (size_t i = 0; i < keypoints.size(); i++)
{
float dist = norm(pt - keypoints[i]);
double dist = norm(pt - keypoints[i]);
if (dist < minDist)
{
minDist = dist;
@ -621,7 +620,7 @@ void CirclesGridFinder::computeEdgeVectorsOfRNG(vector<Point2f> &vectors, Mat *d
continue;
Point2f vec = keypoints[i] - keypoints[j];
float dist = norm(vec);
double dist = norm(vec);
bool isNeighbors = true;
for (size_t k = 0; k < keypoints.size(); k++)
@ -629,8 +628,8 @@ void CirclesGridFinder::computeEdgeVectorsOfRNG(vector<Point2f> &vectors, Mat *d
if (k == i || k == j)
continue;
float dist1 = norm(keypoints[i] - keypoints[k]);
float dist2 = norm(keypoints[j] - keypoints[k]);
double dist1 = norm(keypoints[i] - keypoints[k]);
double dist2 = norm(keypoints[j] - keypoints[k]);
if (dist1 < dist && dist2 < dist)
{
isNeighbors = false;
@ -714,7 +713,7 @@ size_t CirclesGridFinder::findLongestPath(vector<Graph> &basisGraphs, Path &best
}
if (longestPaths.empty() || (maxVal == longestPaths[0].length && graphIdx == bestGraphIdx))
{
Path path = Path(maxLoc.x, maxLoc.y, maxVal);
Path path = Path(maxLoc.x, maxLoc.y, cvRound(maxVal));
computeShortestPath(predecessorMatrix, maxLoc.x, maxLoc.y, path.vertices);
longestPaths.push_back(path);

4
modules/calib3d/src/circlesgrid.hpp
View File

@ -97,10 +97,10 @@ struct CirclesGridFinderParameters
int kmeansAttempts;
int minDistanceToAddKeypoint;
int keypointScale;
int minGraphConfidence;
float minGraphConfidence;
float vertexGain;
float vertexPenalty;
int existingVertexGain;
float existingVertexGain;
float edgeGain;
float edgePenalty;
float convexHullFactor;