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

fixed recent failures in shape-convhull & shape-minarearect

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-30 00:17:43 +00:00
parent b1722352b8
commit 8af2d0acb4
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/src/contours.cpp
View File

@ -1728,7 +1728,7 @@ void cv::convexHull( const Mat& points,
void cv::convexHull( const Mat& points, void cv::convexHull( const Mat& points,
vector<Point2f>& hull, bool clockwise ) vector<Point2f>& hull, bool clockwise )
{ {
int nelems = points.checkVector(2, CV_32S); int nelems = points.checkVector(2, CV_32F);
CV_Assert(nelems >= 0); CV_Assert(nelems >= 0);
hull.resize(nelems); hull.resize(nelems);
CvMat _points = Mat(points), _hull=Mat(hull); CvMat _points = Mat(points), _hull=Mat(hull);

14
modules/imgproc/src/geometry.cpp
View File

@ -86,21 +86,9 @@ cvMaxRect( const CvRect* rect1, const CvRect* rect2 )
CV_IMPL void CV_IMPL void
cvBoxPoints( CvBox2D box, CvPoint2D32f pt[4] ) cvBoxPoints( CvBox2D box, CvPoint2D32f pt[4] )
{ {
double angle = box.angle*CV_PI/180.;
float a = (float)cos(angle)*0.5f;
float b = (float)sin(angle)*0.5f;
if( !pt ) if( !pt )
CV_Error( CV_StsNullPtr, "NULL vertex array pointer" ); CV_Error( CV_StsNullPtr, "NULL vertex array pointer" );
cv::RotatedRect(box).points((cv::Point2f*)pt);
pt[0].x = box.center.x - a*box.size.height - b*box.size.width;
pt[0].y = box.center.y + b*box.size.height - a*box.size.width;
pt[1].x = box.center.x + a*box.size.height - b*box.size.width;
pt[1].y = box.center.y - b*box.size.height - a*box.size.width;
pt[2].x = 2*box.center.x - pt[0].x;
pt[2].y = 2*box.center.y - pt[0].y;
pt[3].x = 2*box.center.x - pt[1].x;
pt[3].y = 2*box.center.y - pt[1].y;
} }