Pin OpenMVS at v1.1.1, misc fixes

Dockerfile

@@ -29,7 +29,8 @@ RUN rm -rf \
   /code/SuperBuild/src/pcl \
   /code/SuperBuild/src/pdal \
   /code/SuperBuild/src/openmvs \
-  /code/SuperBuild/build/openmvs
+  /code/SuperBuild/build/openmvs \
+  /code/SuperBuild/src/vcg
 
 # Entry point
 ENTRYPOINT ["python3", "/code/run.py"]

SuperBuild/cmake/External-OpenMVS.cmake

@@ -20,7 +20,7 @@ ExternalProject_Add(${_proj_name}
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
   GIT_REPOSITORY    https://github.com/cdcseacave/openMVS
-  GIT_TAG           0af021346007f1ab15af160814977a91a8166f55
+  GIT_TAG           v1.1.1
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------

portable.Dockerfile

@@ -29,7 +29,8 @@ RUN rm -rf \
   /code/SuperBuild/src/pcl \
   /code/SuperBuild/src/pdal \
   /code/SuperBuild/src/openmvs \
-  /code/SuperBuild/build/openmvs
+  /code/SuperBuild/build/openmvs \
+  /code/SuperBuild/src/vcg
 
 # Entry point
 ENTRYPOINT ["python3", "/code/run.py"]

stages/openmvs.py

@@ -40,7 +40,10 @@ class ODMOpenMVSStage(types.ODM_Stage):
             if not io.dir_exists(depthmaps_dir):
                 os.mkdir(depthmaps_dir)
 
-            resolution_level = int(float(outputs['undist_image_max_size']) / (2*args.depthmap_resolution))
+            if outputs["undist_image_max_size"] <= args.depthmap_resolution:
+                resolution_level = 0
+            else:
+                resolution_level = math.floor(math.log(outputs['undist_image_max_size'] / float(args.depthmap_resolution)) / math.log(2))
 
             config = [
                 " --resolution-level %s" % resolution_level,