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

Update indentation to match rest of file

Browse Source 
Very cosmetic, but was analyzing code and just wanted to make it
consistent.
This commit is contained in:
Patrick Snape 2016-01-23 15:57:46 +00:00
parent 1cd3c6f364
commit 2f5ea3437e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -517,30 +517,32 @@ DescriptorMatcher::~DescriptorMatcher()
void DescriptorMatcher::add( InputArrayOfArrays _descriptors ) void DescriptorMatcher::add( InputArrayOfArrays _descriptors )
{ {
if(_descriptors.isUMatVector()) if( _descriptors.isUMatVector() )
{ {
std::vector<UMat> descriptors; std::vector<UMat> descriptors;
_descriptors.getUMatVector(descriptors); _descriptors.getUMatVector( descriptors );
utrainDescCollection.insert( utrainDescCollection.end(), descriptors.begin(), descriptors.end() ); utrainDescCollection.insert( utrainDescCollection.end(), descriptors.begin(), descriptors.end() );
} }
else if(_descriptors.isUMat()) else if( _descriptors.isUMat() )
{ {
std::vector<UMat> descriptors = std::vector<UMat>(1, _descriptors.getUMat()); std::vector<UMat> descriptors = std::vector<UMat>(1, _descriptors.getUMat());
utrainDescCollection.insert( utrainDescCollection.end(), descriptors.begin(), descriptors.end() ); utrainDescCollection.insert( utrainDescCollection.end(), descriptors.begin(), descriptors.end() );
} }
else if(_descriptors.isMatVector()) else if( _descriptors.isMatVector() )
{ {
std::vector<Mat> descriptors; std::vector<Mat> descriptors;
_descriptors.getMatVector(descriptors); _descriptors.getMatVector(descriptors);
trainDescCollection.insert( trainDescCollection.end(), descriptors.begin(), descriptors.end() ); trainDescCollection.insert( trainDescCollection.end(), descriptors.begin(), descriptors.end() );
} }
else if(_descriptors.isMat()) else if( _descriptors.isMat() )
{ {
std::vector<Mat> descriptors = std::vector<Mat>(1, _descriptors.getMat()); std::vector<Mat> descriptors = std::vector<Mat>(1, _descriptors.getMat());
trainDescCollection.insert( trainDescCollection.end(), descriptors.begin(), descriptors.end() ); trainDescCollection.insert( trainDescCollection.end(), descriptors.begin(), descriptors.end() );
} }
else else
{
CV_Assert( _descriptors.isUMat() || _descriptors.isUMatVector() || _descriptors.isMat() || _descriptors.isMatVector() ); CV_Assert( _descriptors.isUMat() || _descriptors.isUMatVector() || _descriptors.isMat() || _descriptors.isMatVector() );
}
} }
const std::vector<Mat>& DescriptorMatcher::getTrainDescriptors() const const std::vector<Mat>& DescriptorMatcher::getTrainDescriptors() const