mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

restore support of vector<float> as possible output descriptor container in SURF::operator().

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-04-04 10:36:49 +00:00
parent e479a9f619
commit 9576133e06
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/nonfree/src/surf.cpp
View File

@ -877,16 +877,29 @@ void SURF::operator()(InputArray _img, InputArray _mask,
if( N > 0 ) if( N > 0 )
{ {
Mat descriptors; Mat descriptors;
bool _1d = false;
int dcols = extended ? 128 : 64;
size_t dsize = dcols*sizeof(float);
if( doDescriptors ) if( doDescriptors )
{ {
_descriptors.create((int)keypoints.size(), (extended ? 128 : 64), CV_32F); _1d = _descriptors.kind() == _InputArray::STD_VECTOR && _descriptors.type() == CV_32F;
descriptors = _descriptors.getMat(); if( _1d )
{
_descriptors.create(N*dcols, 1, CV_32F);
descriptors = _descriptors.getMat().reshape(1, N);
}
else
{
_descriptors.create(N, dcols, CV_32F);
descriptors = _descriptors.getMat();
}
} }
// we call SURFInvoker in any case, even if we do not need descriptors,
// since it computes orientation of each feature.
parallel_for(BlockedRange(0, N), SURFInvoker(img, sum, keypoints, descriptors, extended, upright) ); parallel_for(BlockedRange(0, N), SURFInvoker(img, sum, keypoints, descriptors, extended, upright) );
size_t dsize = descriptors.cols*descriptors.elemSize();
// remove keypoints that were marked for deletion // remove keypoints that were marked for deletion
for( i = j = 0; i < N; i++ ) for( i = j = 0; i < N; i++ )
{ {
@ -908,6 +921,8 @@ void SURF::operator()(InputArray _img, InputArray _mask,
if( doDescriptors ) if( doDescriptors )
{ {
Mat d = descriptors.rowRange(0, N); Mat d = descriptors.rowRange(0, N);
if( _1d )
d = d.reshape(1, N*dcols);
d.copyTo(_descriptors); d.copyTo(_descriptors);
} }
} }