[softwares/SfM] Invalid -f input for SfM binaries -> Ceres local_para…

…meterization check failed #727
openMVG · Jan 18, 2017 · 361f942 · 361f942
1 parent b238570
commit 361f942
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/openMVG/cameras/Cameras_Common_command_line_helper.hpp b/src/openMVG/cameras/Cameras_Common_command_line_helper.hpp
@@ -60,6 +60,8 @@ StringTo_Intrinsic_Parameter_Type
     else
     {
       std::cerr << "WARNING: Unknow KEY: " << item << std::endl;
+      intrinsics_opt = static_cast<cameras::Intrinsic_Parameter_Type>(0);
+      break;
     }
   }
 

diff --git a/src/software/SfM/main_GlobalSfM.cpp b/src/software/SfM/main_GlobalSfM.cpp
@@ -96,6 +96,11 @@ int main(int argc, char **argv)
 
   const cameras::Intrinsic_Parameter_Type intrinsic_refinement_options =
     cameras::StringTo_Intrinsic_Parameter_Type(sIntrinsic_refinement_options);
+  if (intrinsic_refinement_options == static_cast<cameras::Intrinsic_Parameter_Type>(0) )
+  {
+    std::cerr << "Invalid input for Bundle Adjusment Intrinsic parameter refinement option" << std::endl;
+    return EXIT_FAILURE;
+  }
 
   if (iTranslationAveragingMethod < TRANSLATION_AVERAGING_L1 ||
       iTranslationAveragingMethod > TRANSLATION_AVERAGING_SOFTL1 )  {

diff --git a/src/software/SfM/main_IncrementalSfM.cpp b/src/software/SfM/main_IncrementalSfM.cpp
@@ -125,6 +125,11 @@ int main(int argc, char **argv)
 
   const cameras::Intrinsic_Parameter_Type intrinsic_refinement_options =
     cameras::StringTo_Intrinsic_Parameter_Type(sIntrinsic_refinement_options);
+  if (intrinsic_refinement_options == static_cast<cameras::Intrinsic_Parameter_Type>(0) )
+  {
+    std::cerr << "Invalid input for Bundle Adjusment Intrinsic parameter refinement option" << std::endl;
+    return EXIT_FAILURE;
+  }
 
   // Load input SfM_Data scene
   SfM_Data sfm_data;