Last commit was done too fast.

vetional · May 9, 2015 · 7b8ddd4 · 7b8ddd4
1 parent 5c6fd9c
commit 7b8ddd4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/openMVG/matching_image_collection/Matcher_Regions_AllInMemory.cpp b/src/openMVG/matching_image_collection/Matcher_Regions_AllInMemory.cpp
@@ -146,13 +146,15 @@ void Template_Matcher(
       IndMatchDecorator<float> matchDeduplicator(vec_FilteredMatches, pointFeaturesI, pointFeaturesJ);
       matchDeduplicator.getDeduplicated(vec_FilteredMatches);
 
-      if (!vec_FilteredMatches.empty())
 #ifdef OPENMVG_USE_OPENMP
 #pragma omp critical
 #endif
       {
-        map_PutativesMatches.insert( make_pair( make_pair(I,J), vec_FilteredMatches ));
         ++my_progress_bar;
+        if (!vec_FilteredMatches.empty())
+        {
+          map_PutativesMatches.insert( make_pair( make_pair(I,J), vec_FilteredMatches ));
+        }
       }
     }
   }

diff --git a/src/openMVG/sfm/pipelines/global/GlobalSfM_translation_averaging.cpp b/src/openMVG/sfm/pipelines/global/GlobalSfM_translation_averaging.cpp
@@ -365,8 +365,7 @@ void GlobalSfM_Translation_AveragingSolver::ComputePutativeTranslation_EdgesCove
   C_Progress_display my_progress_bar(
     vec_edges.size(),
     std::cout,
-    "\n", " " ,
-    "Computation of the relative translations over the graph with an edge coverage algorithm\n" );
+    "\nComputation of the relative translations over the graph with an edge coverage algorithm\n");
 
   bool bVerbose = false;
 

diff --git a/src/openMVG/sfm/pipelines/global/sfm_global_engine_relative_motions.cpp b/src/openMVG/sfm/pipelines/global/sfm_global_engine_relative_motions.cpp
@@ -437,7 +437,7 @@ void GlobalSfMReconstructionEngine_RelativeMotions::Compute_Relative_Rotations(R
   const Pair_Set & pair_set = _matches_provider->getPairs();
   // copy to a vector for use with threading
   const Pair_Vec pair_vec(pair_set.begin(), pair_set.end());
-  C_Progress_display my_progress_bar( pair_vec.size(), std::cout, "\n", " " , "Compute_Relative_Rotations\n" );
+  C_Progress_display my_progress_bar( pair_vec.size(), std::cout, "\nCompute_Relative_Rotations\n" );
 #ifdef OPENMVG_USE_OPENMP
   #pragma omp parallel for schedule(dynamic)
 #endif