diff --git a/SuperBuild/cmake/External-OpenSfM.cmake b/SuperBuild/cmake/External-OpenSfM.cmake index 9de81a1d..72ec1b20 100644 --- a/SuperBuild/cmake/External-OpenSfM.cmake +++ b/SuperBuild/cmake/External-OpenSfM.cmake @@ -25,7 +25,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/OpenSfM/ - GIT_TAG 316 + GIT_TAG 319 #--Update/Patch step---------- UPDATE_COMMAND git submodule update --init --recursive #--Configure step------------- diff --git a/VERSION b/VERSION index c848fb9c..7148b0a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.8 +3.1.9 diff --git a/opendm/config.py b/opendm/config.py index 5db0b2b3..91c89c2a 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -159,7 +159,7 @@ def config(argv=None, parser=None): action=StoreValue, default=0, type=int, - help='Perform image matching with the nearest N images based on image filename order. Can speed up processing of sequential images, such as those extracted from video. Set to 0 to disable. Default: %(default)s') + help='Perform image matching with the nearest N images based on image filename order. Can speed up processing of sequential images, such as those extracted from video. It is applied only on non-georeferenced datasets. Set to 0 to disable. Default: %(default)s') parser.add_argument('--use-fixed-camera-params', action=StoreTrue, diff --git a/opendm/osfm.py b/opendm/osfm.py index 226be84c..78a41db9 100644 --- a/opendm/osfm.py +++ b/opendm/osfm.py @@ -248,7 +248,10 @@ class OSFMContext: ] if args.matcher_order > 0: - config.append("matching_order_neighbors: %s" % args.matcher_order) + if not reconstruction.is_georeferenced(): + config.append("matching_order_neighbors: %s" % args.matcher_order) + else: + log.ODM_WARNING("Georeferenced reconstruction, ignoring --matcher-order") if args.camera_lens != 'auto': config.append("camera_projection_type: %s" % args.camera_lens.upper()) diff --git a/start-dev-env.sh b/start-dev-env.sh index 75c7ccbf..592f41d0 100755 --- a/start-dev-env.sh +++ b/start-dev-env.sh @@ -67,14 +67,14 @@ platform="Linux" # Assumed uname=$(uname) case $uname in "Darwin") - platform="MacOS / OSX" + platform="MacOS" ;; MINGW*) platform="Windows" ;; esac -if [[ $platform != "Linux" ]]; then +if [[ $platform != "Linux" && $platform != "MacOS" ]]; then echo "This script only works on Linux." exit 1 fi