Merged with HEAD and removed C interface to rotatedRectangleIntersection

This commit is contained in:
Nghia Ho
2013-09-04 20:45:10 +10:00
899 changed files with 11911 additions and 11198 deletions

View File

@@ -250,19 +250,3 @@ int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& r
}
} // end namespace
int cvRotatedRectangleIntersection( const CvBox2D* rect1, const CvBox2D* rect2, CvPoint2D32f intersectingRegion[8], int* pointCount )
{
std::vector <cv::Point2f> pts;
int ret = cv::rotatedRectangleIntersection( *rect1, *rect2, pts );
for( size_t i=0; i < pts.size(); i++ )
{
intersectingRegion[i] = pts[i];
}
*pointCount = (int)pts.size();
return ret;
}