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

try to fix : enclosing circle always larger than 1.0

Browse Source 
issue #5745
This commit is contained in:
songyuncen 2015-12-05 10:57:29 +08:00
parent b5d6d7016c
commit b81598bc03
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,14 +98,15 @@ static int findEnslosingCicle4pts_32f( Point2f* pts, Point2f& _center, float& _r
int idxs[4] = { 0, 1, 2, 3 }; int idxs[4] = { 0, 1, 2, 3 };
int i, j, k = 1, mi = 0; int i, j, k = 1, mi = 0;
float max_dist = 0; float max_dist = 0.0f;
Point2f center; Point2f center = pts[0];
Point2f min_center; Point2f min_center;
float radius, min_radius = FLT_MAX; float radius, min_radius = FLT_MAX;
Point2f res_pts[4]; Point2f res_pts[4];
const float eps = FLT_EPSILON;
center = min_center = pts[0]; center = min_center = pts[0];
radius = 1.f; radius = 0.f;
for( i = 0; i < 4; i++ ) for( i = 0; i < 4; i++ )
for( j = i + 1; j < 4; j++ ) for( j = i + 1; j < 4; j++ )
@ -120,7 +121,7 @@ static int findEnslosingCicle4pts_32f( Point2f* pts, Point2f& _center, float& _r
} }
} }
if( max_dist > 0 ) if( max_dist > 0.0f )
{ {
k = 2; k = 2;
for( i = 0; i < 4; i++ ) for( i = 0; i < 4; i++ )
@ -134,12 +135,10 @@ static int findEnslosingCicle4pts_32f( Point2f* pts, Point2f& _center, float& _r
center = Point2f( (pts[idxs[0]].x + pts[idxs[1]].x)*0.5f, center = Point2f( (pts[idxs[0]].x + pts[idxs[1]].x)*0.5f,
(pts[idxs[0]].y + pts[idxs[1]].y)*0.5f ); (pts[idxs[0]].y + pts[idxs[1]].y)*0.5f );
radius = (float)(norm(pts[idxs[0]] - center)*1.03); radius = (float)(norm(pts[idxs[0]] - center)) + eps;
if( radius < 1.f )
radius = 1.f;
if( pointInCircle( pts[idxs[2]], center, radius ) >= 0 && if( pointInCircle( pts[idxs[2]], center, radius ) >= 0.0 &&
pointInCircle( pts[idxs[3]], center, radius ) >= 0 ) pointInCircle( pts[idxs[3]], center, radius ) >= 0.0 )
{ {
k = 2; //rand()%2+2; k = 2; //rand()%2+2;
} }
@ -151,11 +150,8 @@ static int findEnslosingCicle4pts_32f( Point2f* pts, Point2f& _center, float& _r
if( findCircle( pts[shuffles[i][0]], pts[shuffles[i][1]], if( findCircle( pts[shuffles[i][0]], pts[shuffles[i][1]],
pts[shuffles[i][2]], &center, &radius ) ) pts[shuffles[i][2]], &center, &radius ) )
{ {
radius *= 1.03f; radius += eps;
if( radius < 2.f ) if( pointInCircle( pts[shuffles[i][3]], center, radius ) >= 0.0 &&
radius = 2.f;
if( pointInCircle( pts[shuffles[i][3]], center, radius ) >= 0 &&
min_radius > radius ) min_radius > radius )
{ {
min_radius = radius; min_radius = radius;