Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-01-25 16:30:36 +04:00
105 changed files with 4821 additions and 2883 deletions

View File

@@ -56,11 +56,12 @@ static void detect_and_draw_objects( IplImage* image, CvLatentSvmDetector* detec
for( i = 0; i < detections->total; i++ )
{
CvObjectDetection detection = *(CvObjectDetection*)cvGetSeqElem( detections, i );
float score = detection.score;
CvRect bounding_box = detection.rect;
cvRectangle( image, cvPoint(bounding_box.x, bounding_box.y),
cvPoint(bounding_box.x + bounding_box.width,
bounding_box.y + bounding_box.height),
CV_RGB(255,0,0), 3 );
CV_RGB(cvRound(255.0f*score),0,0), 3 );
}
cvReleaseMemStorage( &storage );
}