mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed memory leak in SIFT wrapper (#1288)

Browse Source
This commit is contained in:
Maria Dimashova 2011-08-10 07:02:50 +00:00
parent ff1fb9f7cc
commit 999481273e
1 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
modules/features2d/src/sift.cpp
View File

@ -1673,6 +1673,48 @@ void SIFT::operator()(const Mat& image, const Mat& mask,
} }
} }
void release_features_data( CvSeq* featuresSeq )
{
for( int i = 0; i < featuresSeq->total; i++ )
{
feature * ft = CV_GET_SEQ_ELEM( feature, featuresSeq, i );
free( ft->feature_data );
}
}
// Calculate orientation of features.
// Note: calc_feature_oris() duplicates the points with several dominant orientations.
// So if keypoints was detected by Sift feature detector then some points will be
// duplicated twice.
void recalculateAngles( vector<KeyPoint>& keypoints, IplImage*** gauss_pyr,
int nOctaves, int nOctaveLayers )
{
CvMemStorage* storage = cvCreateMemStorage( 0 );
CvSeq* featuresSeq = cvCreateSeq( 0, sizeof(CvSeq), sizeof(struct feature), storage );
for( size_t i = 0; i < keypoints.size(); i++ )
{
feature ft;
keyPointToFeature( keypoints[i], ft, SiftParams( nOctaves, nOctaveLayers ) );
cvSeqPush( featuresSeq, &ft );
}
calc_feature_oris( featuresSeq, gauss_pyr );
keypoints.resize( featuresSeq->total );
for( int i = 0; i < featuresSeq->total; i++ )
{
feature * ft = CV_GET_SEQ_ELEM( feature, featuresSeq, i );
keypoints[i] = featureToKeyPoint( *ft );
}
// Remove duplicated keypoints.
KeyPointsFilter::removeDuplicated( keypoints );
release_features_data( featuresSeq );
cvReleaseMemStorage( &storage );
}
// descriptors // descriptors
void SIFT::operator()(const Mat& image, const Mat& mask, void SIFT::operator()(const Mat& image, const Mat& mask,
vector<KeyPoint>& keypoints, vector<KeyPoint>& keypoints,
@ -1696,43 +1738,17 @@ void SIFT::operator()(const Mat& image, const Mat& mask,
IplImage img = fimg; IplImage img = fimg;
ImagePyrData pyrImages( &img, commParams.nOctaves, commParams.nOctaveLayers, SIFT_SIGMA, SIFT_IMG_DBL ); ImagePyrData pyrImages( &img, commParams.nOctaves, commParams.nOctaveLayers, SIFT_SIGMA, SIFT_IMG_DBL );
// Calculate orientation of features. if( descriptorParams.recalculateAngles )
// Note: calc_feature_oris() duplicates the points with several dominant orientations. recalculateAngles( keypoints, pyrImages.gauss_pyr, commParams.nOctaves, commParams.nOctaveLayers );
// So if keypoints was detected by Sift feature detector then some points will be
// duplicated twice.
CvMemStorage* storage = cvCreateMemStorage( 0 ); CvMemStorage* storage = cvCreateMemStorage( 0 );
CvSeq* featuresSeq = cvCreateSeq( 0, sizeof(CvSeq), sizeof(struct feature), storage ); CvSeq* featuresSeq = cvCreateSeq( 0, sizeof(CvSeq), sizeof(struct feature), storage );
if( descriptorParams.recalculateAngles )
{
for( size_t i = 0; i < keypoints.size(); i++ )
{
feature* ft = (feature*) calloc( 1, sizeof( struct feature ) );
keyPointToFeature( keypoints[i], *ft, SiftParams( commParams.nOctaves, commParams.nOctaveLayers ) );
cvSeqPush( featuresSeq, ft );
}
calc_feature_oris( featuresSeq, pyrImages.gauss_pyr );
keypoints.resize( featuresSeq->total );
for( int i = 0; i < featuresSeq->total; i++ )
{
feature * ft = CV_GET_SEQ_ELEM( feature, featuresSeq, i );
keypoints[i] = featureToKeyPoint( *ft );
}
// Remove duplicated keypoints.
KeyPointsFilter::removeDuplicated( keypoints );
// Compute descriptors.
if( featuresSeq->total > 0 )
cvSeqRemoveSlice( featuresSeq, cvSlice(0, featuresSeq->total) );
}
for( size_t i = 0; i < keypoints.size(); i++ ) for( size_t i = 0; i < keypoints.size(); i++ )
{ {
feature* ft = (feature*) calloc( 1, sizeof( struct feature ) ); feature ft;
keyPointToFeature( keypoints[i], *ft, SiftParams( commParams.nOctaves, commParams.nOctaveLayers ) ); keyPointToFeature( keypoints[i], ft, SiftParams( commParams.nOctaves, commParams.nOctaveLayers ) );
cvSeqPush( featuresSeq, ft ); cvSeqPush( featuresSeq, &ft );
} }
compute_descriptors( featuresSeq, pyrImages.gauss_pyr, SIFT_DESCR_WIDTH, SIFT_DESCR_HIST_BINS ); compute_descriptors( featuresSeq, pyrImages.gauss_pyr, SIFT_DESCR_WIDTH, SIFT_DESCR_HIST_BINS );
CV_DbgAssert( (int)keypoints.size() == featuresSeq->total ); CV_DbgAssert( (int)keypoints.size() == featuresSeq->total );
@ -1751,5 +1767,6 @@ void SIFT::operator()(const Mat& image, const Mat& mask,
} }
} }
release_features_data( featuresSeq );
cvReleaseMemStorage( &storage ); cvReleaseMemStorage( &storage );
} }