OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27914 from MaximSmolskiy:refactor_minEnclosingCircle

Browse Source 
Refactor minEnclosingCircle
This commit is contained in:
Alexander Smorkalov 2025-10-20 08:40:28 +03:00 committed by GitHub
commit 70d69d07c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
modules/imgproc/src/shapedescr.cpp
View File

@ -98,13 +98,7 @@ static void findThirdPoint(const PT *pts, int i, int j, Point2f &center, float &
ptsf[0] = (Point2f)pts[i]; ptsf[0] = (Point2f)pts[i];
ptsf[1] = (Point2f)pts[j]; ptsf[1] = (Point2f)pts[j];
ptsf[2] = (Point2f)pts[k]; ptsf[2] = (Point2f)pts[k];
Point2f new_center; float new_radius = 0; findCircle3pts(ptsf, center, radius);
findCircle3pts(ptsf, new_center, new_radius);
if (new_radius > 0)
{
radius = new_radius;
center = new_center;
}
} }
} }
} }
@ -129,13 +123,7 @@ void findSecondPoint(const PT *pts, int i, Point2f &center, float &radius)
} }
else else
{ {
Point2f new_center; float new_radius = 0; findThirdPoint(pts, i, j, center, radius);
findThirdPoint(pts, i, j, new_center, new_radius);
if (new_radius > 0)
{
radius = new_radius;
center = new_center;
}
} }
} }
} }
@ -161,13 +149,7 @@ static void findMinEnclosingCircle(const PT *pts, int count, Point2f &center, fl
} }
else else
{ {
Point2f new_center; float new_radius = 0; findSecondPoint(pts, i, center, radius);
findSecondPoint(pts, i, new_center, new_radius);
if (new_radius > 0)
{
radius = new_radius;
center = new_center;
}
} }
} }
} }
@ -193,61 +175,42 @@ void cv::minEnclosingCircle( InputArray _points, Point2f& _center, float& _radiu
const Point* ptsi = points.ptr<Point>(); const Point* ptsi = points.ptr<Point>();
const Point2f* ptsf = points.ptr<Point2f>(); const Point2f* ptsf = points.ptr<Point2f>();
switch (count) if( count == 1 )
{ {
case 1: _center = (is_float) ? ptsf[0] : Point2f((float)ptsi[0].x, (float)ptsi[0].y);
{ _radius = EPS;
_center = (is_float) ? ptsf[0] : Point2f((float)ptsi[0].x, (float)ptsi[0].y); return;
_radius = EPS; }
break;
} if (is_float)
case 2: {
{ findMinEnclosingCircle<Point2f>(ptsf, count, _center, _radius);
Point2f p1 = (is_float) ? ptsf[0] : Point2f((float)ptsi[0].x, (float)ptsi[0].y); #if 0
Point2f p2 = (is_float) ? ptsf[1] : Point2f((float)ptsi[1].x, (float)ptsi[1].y); for (int m = 0; m < count; ++m)
_center.x = (p1.x + p2.x) / 2.0f;
_center.y = (p1.y + p2.y) / 2.0f;
_radius = (float)(norm(p1 - p2) / 2.0) + EPS;
break;
}
default:
{
Point2f center;
float radius = 0.f;
if (is_float)
{ {
findMinEnclosingCircle<Point2f>(ptsf, count, center, radius); float d = (float)norm(ptsf[m] - _center);
#if 0 if (d > _radius)
for (size_t m = 0; m < count; ++m) {
{ printf("error!\n");
float d = (float)norm(ptsf[m] - center); }
if (d > radius)
{
printf("error!\n");
}
}
#endif
} }
else #endif
}
else
{
findMinEnclosingCircle<Point>(ptsi, count, _center, _radius);
#if 0
for (int m = 0; m < count; ++m)
{ {
findMinEnclosingCircle<Point>(ptsi, count, center, radius); double dx = ptsi[m].x - _center.x;
#if 0 double dy = ptsi[m].y - _center.y;
for (size_t m = 0; m < count; ++m) double d = std::sqrt(dx * dx + dy * dy);
{ if (d > _radius)
double dx = ptsi[m].x - center.x; {
double dy = ptsi[m].y - center.y; printf("error!\n");
double d = std::sqrt(dx * dx + dy * dy); }
if (d > radius)
{
printf("error!\n");
}
}
#endif
} }
_center = center; #endif
_radius = radius;
break;
}
} }
} }