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

- replace the linear search in a sorted list by the appropriate algorithm

Browse Source
This commit is contained in:
Vincent Rabaud 2011-03-13 00:31:17 +00:00
parent c3e813517d
commit 28c2d3b89f
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/features2d/src/matchers.cpp
View File

@ -159,18 +159,11 @@ const Mat DescriptorMatcher::DescriptorCollection::getDescriptor( int globalDesc
void DescriptorMatcher::DescriptorCollection::getLocalIdx( int globalDescIdx, int& imgIdx, int& localDescIdx ) const void DescriptorMatcher::DescriptorCollection::getLocalIdx( int globalDescIdx, int& imgIdx, int& localDescIdx ) const
{ {
imgIdx = -1; CV_Assert( (globalDescIdx>=0) && (globalDescIdx < size()) );
CV_Assert( globalDescIdx < size() ); std::vector<int>::const_iterator img_it = std::upper_bound(startIdxs.begin(), startIdxs.end(), globalDescIdx);
for( size_t i = 1; i < startIdxs.size(); i++ ) --img_it;
{ imgIdx = img_it - startIdxs.begin();
if( globalDescIdx < startIdxs[i] ) localDescIdx = globalDescIdx - (*img_it);
{
imgIdx = (int)(i - 1);
break;
}
}
imgIdx = imgIdx == -1 ? (int)(startIdxs.size() - 1) : imgIdx;
localDescIdx = globalDescIdx - startIdxs[imgIdx];
} }
int DescriptorMatcher::DescriptorCollection::size() const int DescriptorMatcher::DescriptorCollection::size() const