From db85928e7f984a1287ac2b06e91918aaea04f482 Mon Sep 17 00:00:00 2001 From: Alexander Shishkov Date: Wed, 15 Jun 2011 13:26:46 +0000 Subject: [PATCH] fixed compilation error on MCVS in descriptors.cpp --- modules/features2d/src/descriptors.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/features2d/src/descriptors.cpp b/modules/features2d/src/descriptors.cpp index 4d35983738..4ff71662a4 100644 --- a/modules/features2d/src/descriptors.cpp +++ b/modules/features2d/src/descriptors.cpp @@ -394,7 +394,10 @@ void OpponentColorDescriptorExtractor::computeImpl( const Mat& bgrImage, vector< Mat mergedDescriptors( (int)keypoints.size(), 3*descriptorSize, descriptorExtractor->descriptorType() ); int mergedCount = 0; // cp - current channel position - for( size_t cp[] = {0, 0, 0}; cp[0] < channelKeypoints[0].size() && cp[1] < channelKeypoints[1].size() && cp[2] < channelKeypoints[2].size(); ) + size_t cp[] = {0, 0, 0}; + while( cp[0] < channelKeypoints[0].size() && + cp[1] < channelKeypoints[1].size() && + cp[2] < channelKeypoints[2].size() ) { const int maxInitIdx = std::max( channelKeypoints[0][idxs[0][cp[0]]].class_id, std::max( channelKeypoints[1][idxs[1][cp[1]]].class_id,