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

Fixed compile errors under Windows

Browse Source
This commit is contained in:
Ilya Lysenkov 2010-12-21 11:39:12 +00:00
parent 998fab0ef5
commit 351f6eeb97
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ void BlobDetector::findBlobs(const cv::Mat &image, const cv::Mat &binaryImage, v
{ {
double area = moms.m00; double area = moms.m00;
double perimeter = arcLength(Mat(contours[contourIdx]), true); double perimeter = arcLength(Mat(contours[contourIdx]), true);
double ratio = 4 * M_PI * area / (perimeter * perimeter); double ratio = 4 * CV_PI * area / (perimeter * perimeter);
if (ratio < params.minCircularity) if (ratio < params.minCircularity)
continue; continue;
} }

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

@ -106,7 +106,7 @@ void Graph::floydWarshall(cv::Mat &distanceMatrix, int infinity) const
for (Vertices::const_iterator it1 = vertices.begin(); it1 != vertices.end(); it1++) for (Vertices::const_iterator it1 = vertices.begin(); it1 != vertices.end(); it1++)
{ {
distanceMatrix.at<int> (it1->first, it1->first) = 0; distanceMatrix.at<int> (it1->first, it1->first) = 0;
for (Neighbors::iterator it2 = it1->second.neighbors.begin(); it2 != it1->second.neighbors.end(); it2++) for (Neighbors::const_iterator it2 = it1->second.neighbors.begin(); it2 != it1->second.neighbors.end(); it2++)
{ {
assert( it1->first != *it2 ); assert( it1->first != *it2 );
distanceMatrix.at<int> (it1->first, *it2) = edgeWeight; distanceMatrix.at<int> (it1->first, *it2) = edgeWeight;

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

@ -100,7 +100,7 @@ struct CirclesGridFinderParameters
int minGraphConfidence; int minGraphConfidence;
float vertexGain; float vertexGain;
float vertexPenalty; float vertexPenalty;
float existingVertexGain; int existingVertexGain;
float edgeGain; float edgeGain;
float edgePenalty; float edgePenalty;
float convexHullFactor; float convexHullFactor;