From ad94452b20e82cb36fa894a32c847a0278e39824 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 18 May 2021 15:44:06 -0400 Subject: [PATCH 1/2] Fix photometric exposure method --- opendm/photo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendm/photo.py b/opendm/photo.py index 9fecba1c..3f6fc2b0 100644 --- a/opendm/photo.py +++ b/opendm/photo.py @@ -425,7 +425,7 @@ class ODM_Photo: def get_photometric_exposure(self): # H ~= (exposure_time) / (f_number^2) - if self.fnumber is not None and self.exposure_time > 0: + if self.fnumber is not None and self.exposure_time is not None and self.exposure_time > 0 and self.fnumber > 0: return self.exposure_time / (self.fnumber * self.fnumber) def get_horizontal_irradiance(self): From e9d598e020236e92e7887641dafa1c2a3fb38794 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 18 May 2021 16:22:35 -0400 Subject: [PATCH 2/2] Improved feature detection for non-8bit images --- SuperBuild/cmake/External-OpenSfM.cmake | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/cmake/External-OpenSfM.cmake b/SuperBuild/cmake/External-OpenSfM.cmake index 344b6a21..c69afac6 100644 --- a/SuperBuild/cmake/External-OpenSfM.cmake +++ b/SuperBuild/cmake/External-OpenSfM.cmake @@ -9,7 +9,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/OpenSfM/ - GIT_TAG 2410 + GIT_TAG 2414 #--Update/Patch step---------- UPDATE_COMMAND git submodule update --init --recursive #--Configure step------------- diff --git a/VERSION b/VERSION index b40e9247..e5f31291 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.13 +2.4.14