Merge pull request #7030 from jpaveggio:patch-1

pull/7040/head
Alexander Alekhin 9 years ago
commit 6a69852df1
  1. 6
      modules/features2d/src/bagofwords.cpp

@ -91,11 +91,7 @@ Mat BOWKMeansTrainer::cluster() const
{ {
CV_Assert( !descriptors.empty() ); CV_Assert( !descriptors.empty() );
int descCount = 0; Mat mergedDescriptors( descriptorsCount(), descriptors[0].cols, descriptors[0].type() );
for( size_t i = 0; i < descriptors.size(); i++ )
descCount += descriptors[i].rows;
Mat mergedDescriptors( descCount, descriptors[0].cols, descriptors[0].type() );
for( size_t i = 0, start = 0; i < descriptors.size(); i++ ) for( size_t i = 0, start = 0; i < descriptors.size(); i++ )
{ {
Mat submut = mergedDescriptors.rowRange((int)start, (int)(start + descriptors[i].rows)); Mat submut = mergedDescriptors.rowRange((int)start, (int)(start + descriptors[i].rows));

Loading…
Cancel
Save