From 88e38ed1ada5fbdacbc2b857466a59dbc84b56ed Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 13 Apr 2021 10:25:27 -0400 Subject: [PATCH] Add support for EXIFs from agremo camera (#1264) --- SuperBuild/cmake/External-OpenSfM.cmake | 2 +- opendm/photo.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SuperBuild/cmake/External-OpenSfM.cmake b/SuperBuild/cmake/External-OpenSfM.cmake index 548ec764..70557f53 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 246 + GIT_TAG 248 #--Update/Patch step---------- UPDATE_COMMAND git submodule update --init --recursive #--Configure step------------- diff --git a/opendm/photo.py b/opendm/photo.py index 23137d27..9fecba1c 100644 --- a/opendm/photo.py +++ b/opendm/photo.py @@ -342,7 +342,15 @@ class ODM_Photo: def float_values(self, tag): if isinstance(tag.values, list): - return [float(v.num) / float(v.den) if v.den != 0 else None for v in tag.values] + result = [] + for v in tag.values: + if isinstance(v, int): + result.append(float(v)) + elif v.den != 0: + result.append(float(v.num) / float(v.den)) + else: + result.append(None) + return result else: return [float(tag.values.num) / float(tag.values.den) if tag.values.den != 0 else None]