diff --git a/Dockerfile b/Dockerfile index 888ed001..a1cfe396 100644 --- a/Dockerfile +++ b/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"] \ No newline at end of file diff --git a/SuperBuild/cmake/External-OpenMVS.cmake b/SuperBuild/cmake/External-OpenMVS.cmake index 457dab5b..29ad60f9 100644 --- a/SuperBuild/cmake/External-OpenMVS.cmake +++ b/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------------- diff --git a/portable.Dockerfile b/portable.Dockerfile index 01e49167..de7f69a3 100644 --- a/portable.Dockerfile +++ b/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"] diff --git a/stages/openmvs.py b/stages/openmvs.py index 5f1b5ce7..1f6beb30 100644 --- a/stages/openmvs.py +++ b/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,