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

Merge pull request #3936 from dhood:fitEllipse-bug

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-04-22 11:22:35 +00:00
parent bac4999ae4 37f77e7397
commit 415a212d09
2 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,10 +446,9 @@ cv::RotatedRect cv::fitEllipse( InputArray _points )
// store angle and radii
rp[4] = -0.5 * atan2(gfp[2], gfp[1] - gfp[0]); // convert from APP angle usage
t = sin(-2.0 * rp[4]);
if( fabs(t) > fabs(gfp[2])*min_eps )
t = gfp[2]/t;
else
if( fabs(gfp[2]) > min_eps )
t = gfp[2]/sin(-2.0 * rp[4]);
else // ellipse is rotated by an integer multiple of pi/2
t = gfp[1] - gfp[0];
rp[2] = fabs(gfp[0] + gfp[1] - t);
if( rp[2] > min_eps )

62
modules/imgproc/test/test_convhull.cpp
View File

@@ -1239,7 +1239,6 @@ void CV_FitEllipseTest::run_func()
box = (CvBox2D)cv::fitEllipse(cv::cvarrToMat(points));
}
int CV_FitEllipseTest::validate_test_results( int test_case_idx )
{
int code = CV_BaseShapeDescrTest::validate_test_results( test_case_idx );
@@ -1354,6 +1353,64 @@ protected:
}
};
// Regression test for incorrect fitEllipse result reported in Bug #3989
// Check edge cases for rotation angles of ellipse ([-180, 90, 0, 90, 180] degrees)
class CV_FitEllipseParallelTest : public CV_FitEllipseTest
{
public:
CV_FitEllipseParallelTest();
~CV_FitEllipseParallelTest();
protected:
void generate_point_set( void* points );
void run_func(void);
Mat pointsMat;
};
CV_FitEllipseParallelTest::CV_FitEllipseParallelTest()
{
min_ellipse_size = 5;
}
void CV_FitEllipseParallelTest::generate_point_set( void* )
{
RNG& rng = ts->get_rng();
int height = (int)(MAX(high.val[0] - low.val[0], min_ellipse_size));
int width = (int)(MAX(high.val[1] - low.val[1], min_ellipse_size));
const int angle = ( (cvtest::randInt(rng) % 5) - 2 ) * 90;
const int dim = max(height, width);
const Point center = Point(dim*2, dim*2);
if( width > height )
{
int t;
CV_SWAP( width, height, t );
}
Mat image = Mat::zeros(dim*4, dim*4, CV_8UC1);
ellipse(image, center, Size(height, width), angle,
0, 360, Scalar(255, 0, 0), 1, 8);
box0.center.x = (float)center.x;
box0.center.y = (float)center.y;
box0.size.width = (float)width*2;
box0.size.height = (float)height*2;
box0.angle = (float)angle;
vector<vector<Point> > contours;
findContours(image, contours, RETR_EXTERNAL, CHAIN_APPROX_NONE);
Mat(contours[0]).convertTo(pointsMat, CV_32F);
}
void CV_FitEllipseParallelTest::run_func()
{
box = (CvBox2D)cv::fitEllipse(pointsMat);
}
CV_FitEllipseParallelTest::~CV_FitEllipseParallelTest(){
pointsMat.release();
}
/****************************************************************************************\
* FitLine Test *
\****************************************************************************************/
@@ -1377,7 +1434,7 @@ protected:
CV_FitLineTest::CV_FitLineTest()
{
min_log_size = 5; // for robust ellipse fitting a dozen of points is needed at least
min_log_size = 5; // for robust line fitting a dozen of points is needed at least
max_log_size = 10;
max_noise = 0.05;
}
@@ -1866,6 +1923,7 @@ TEST(Imgproc_MinTriangle, accuracy) { CV_MinTriangleTest test; test.safe_run();
TEST(Imgproc_MinCircle, accuracy) { CV_MinCircleTest test; test.safe_run(); }
TEST(Imgproc_ContourPerimeter, accuracy) { CV_PerimeterTest test; test.safe_run(); }
TEST(Imgproc_FitEllipse, accuracy) { CV_FitEllipseTest test; test.safe_run(); }
TEST(Imgproc_FitEllipse, parallel) { CV_FitEllipseParallelTest test; test.safe_run(); }
TEST(Imgproc_FitLine, accuracy) { CV_FitLineTest test; test.safe_run(); }
TEST(Imgproc_ContourMoments, accuracy) { CV_ContourMomentsTest test; test.safe_run(); }
TEST(Imgproc_ContourPerimeterSlice, accuracy) { CV_PerimeterAreaSliceTest test; test.safe_run(); }