Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep only best SIFT features and other fixes #1664

Merged
merged 2 commits into from
Jun 12, 2023
Merged

Keep only best SIFT features and other fixes #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a4b98a
Keep only best SIFT features and other fixes
pierotofy Jun 12, 2023
0b8c75c
Fix message
pierotofy Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SuperBuild/cmake/External-OpenSfM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-------------
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.8
3.1.9
2 changes: 1 addition & 1 deletion opendm/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 4 additions & 1 deletion opendm/osfm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,10 @@ def setup(self, args, images_path, reconstruction, append_config = [], rerun=Fal
]

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())
Expand Down
6 changes: 3 additions & 3 deletions start-dev-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ platform="Linux" # Assumed
uname=$(uname)
case $uname in
"Darwin")
platform="MacOS / OSX"
platform="MacOS"
;;
MINGW*)
platform="Windows"
;;
esac

if [[ $platform != "Linux" ]]; then
echo "This script only works on Linux."
if [[ $platform != "Linux" && $platform != "MacOS" ]]; then
echo "This script only works on Linux and MacOS."
exit 1
fi

Expand Down