From a2e63508c22a7820c8aee8eb77116c68663c1366 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Fri, 26 May 2023 01:26:25 -0400 Subject: [PATCH 1/3] Check for den attribute while extracting float values from EXIFs --- opendm/photo.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/opendm/photo.py b/opendm/photo.py index b0af5170e..3e75a2501 100644 --- a/opendm/photo.py +++ b/opendm/photo.py @@ -617,9 +617,11 @@ def float_values(self, tag): else: result.append(None) return result - else: + elif hasattr(tag.values, 'den'): return [float(tag.values.num) / float(tag.values.den) if tag.values.den != 0 else None] - + else: + return [None] + def float_value(self, tag): v = self.float_values(tag) if len(v) > 0: From ad091fd9af596fb11c764bd3a576f63664f25b4c Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Fri, 26 May 2023 13:29:17 -0400 Subject: [PATCH 2/3] Fix uint16 3-channel orthophoto generation --- SuperBuild/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 75cc41600..6669f4b0a 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -243,7 +243,7 @@ externalproject_add(dem2points externalproject_add(odm_orthophoto DEPENDS opencv GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git - GIT_TAG 315 + GIT_TAG 317 PREFIX ${SB_BINARY_DIR}/odm_orthophoto SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR} From 12b8f4391271b0650a7c435b0accb976495f3f02 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Fri, 26 May 2023 14:03:09 -0400 Subject: [PATCH 3/3] Update OpenMVS --- SuperBuild/cmake/External-OpenMVS.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild/cmake/External-OpenMVS.cmake b/SuperBuild/cmake/External-OpenMVS.cmake index 122c4266c..554778774 100644 --- a/SuperBuild/cmake/External-OpenMVS.cmake +++ b/SuperBuild/cmake/External-OpenMVS.cmake @@ -53,7 +53,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/openMVS - GIT_TAG 301 + GIT_TAG 317 #--Update/Patch step---------- UPDATE_COMMAND "" #--Configure step-------------