Merge branch 'rperrot-fixclang' into develop

mwoytowich · Apr 20, 2016 · d9b8d2b · d9b8d2b
2 parents 395ab2b + d0a4505
commit d9b8d2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/openMVG/matching_image_collection/Cascade_Hashing_Matcher_Regions_AllInMemory.cpp b/src/openMVG/matching_image_collection/Cascade_Hashing_Matcher_Regions_AllInMemory.cpp
@@ -109,7 +109,7 @@ void Match
     const size_t dimension = regionsI.DescriptorLength();
 
     Eigen::Map<BaseMat> mat_I( (ScalarT*)tabI, regionsI.RegionCount(), dimension);
-    const HashedDescriptions hashed_description = cascade_hasher.CreateHashedDescriptions(mat_I,
+    HashedDescriptions hashed_description = cascade_hasher.CreateHashedDescriptions(mat_I,
       zero_mean_descriptor);
 #ifdef OPENMVG_USE_OPENMP
     #pragma omp critical
@@ -144,7 +144,7 @@ void Match
 #endif
     for (int j = 0; j < (int)indexToCompare.size(); ++j)
     {
-      const size_t J = indexToCompare[j];
+      size_t J = indexToCompare[j];
       const features::Regions &regionsJ = *regions_provider.regions_per_view.at(J).get();
 
       if (regions_provider.regions_per_view.count(J) == 0

diff --git a/src/openMVG/matching_image_collection/GeometricFilter.hpp b/src/openMVG/matching_image_collection/GeometricFilter.hpp
@@ -70,7 +70,7 @@ void ImageCollectionGeometricFilter::Robust_model_estimation
     auto iter = putative_matches.begin();
     advance(iter,i);
 
-    const Pair current_pair = iter->first;
+    Pair current_pair = iter->first;
     const std::vector<IndMatch> & vec_PutativeMatches = iter->second;
 
     //-- Apply the geometric filter (robust model estimation)