Merge pull request #1661 from pierotofy/imgfixes

Fix uint16 3-channel image inputs
OpenDroneMap · May 26, 2023 · 54b0ac9 · 54b0ac9
2 parents bebea18 + 12b8f43
commit 54b0ac9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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}

diff --git 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-------------

diff --git 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: