Merge branch 'master' of https://github.com/micmacIGN/micmac

micmacIGN · Apr 23, 2019 · fec03b2 · fec03b2
2 parents c82bcf2 + ec9df61
commit fec03b2
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 144 deletions.
diff --git a/src/CBinaires/mm3d.cpp b/src/CBinaires/mm3d.cpp
@@ -854,6 +854,7 @@ extern int GenerateTP_main(int argc, char ** argv);
 extern int SimuRolShut_main(int argc, char ** argv);
 extern int GenerateOrient_main(int argc, char ** argv);
 extern int ReechRolShut_main(int argc, char ** argv);
+extern int ReechRolShutV1_main(int argc, char ** argv);
 extern int CompMAF_main(int argc, char ** argv);
 extern int GenerateOriGPS_main(int argc, char ** argv);
 extern int GenerateMAF_main(int argc, char ** argv);
@@ -1161,7 +1162,8 @@ const std::vector<cMMCom> & TestLibAvailableCommands()
         aRes.push_back(cMMCom("GenerateTP",GenerateTP_main ,"Generate simulated tie points"));
         aRes.push_back(cMMCom("SimuRolShut",SimuRolShut_main ,"Generate simulated tie points"));
         aRes.push_back(cMMCom("GenerateOrient",GenerateOrient_main,"Generate modification of orientation"));
-        aRes.push_back(cMMCom("ReechRolShut",ReechRolShut_main ,"Resampling for rolling shutter effect correction"));
+        aRes.push_back(cMMCom("ReechRolShut",ReechRolShut_main ,"Resampling for rolling shutter effect correction, V2, reproj on new cam orientation"));
+        aRes.push_back(cMMCom("ReechRolShutV1",ReechRolShutV1_main ,"Resampling for rolling shutter effect correction, V1, linear compression/dilatation"));
         aRes.push_back(cMMCom("CompMAF",CompMAF_main ,"Compare MAF files"));
         aRes.push_back(cMMCom("GenerateOriGPS",GenerateOriGPS_main ,"Compare MAF files"));
         aRes.push_back(cMMCom("GenerateMAF",GenerateMAF_main ,"Generate simulated MAF"));