kopia lustrzana https://github.com/OpenDroneMap/ODM
Merge pull request #1661 from pierotofy/imgfixes
Fix uint16 3-channel image inputspull/1662/head v3.1.7
commit
54b0ac9bb0
|
@ -243,7 +243,7 @@ externalproject_add(dem2points
|
||||||
externalproject_add(odm_orthophoto
|
externalproject_add(odm_orthophoto
|
||||||
DEPENDS opencv
|
DEPENDS opencv
|
||||||
GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git
|
GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git
|
||||||
GIT_TAG 315
|
GIT_TAG 317
|
||||||
PREFIX ${SB_BINARY_DIR}/odm_orthophoto
|
PREFIX ${SB_BINARY_DIR}/odm_orthophoto
|
||||||
SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto
|
SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto
|
||||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||||
|
|
|
@ -53,7 +53,7 @@ ExternalProject_Add(${_proj_name}
|
||||||
#--Download step--------------
|
#--Download step--------------
|
||||||
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
||||||
GIT_REPOSITORY https://github.com/OpenDroneMap/openMVS
|
GIT_REPOSITORY https://github.com/OpenDroneMap/openMVS
|
||||||
GIT_TAG 301
|
GIT_TAG 317
|
||||||
#--Update/Patch step----------
|
#--Update/Patch step----------
|
||||||
UPDATE_COMMAND ""
|
UPDATE_COMMAND ""
|
||||||
#--Configure step-------------
|
#--Configure step-------------
|
||||||
|
|
|
@ -617,9 +617,11 @@ class ODM_Photo:
|
||||||
else:
|
else:
|
||||||
result.append(None)
|
result.append(None)
|
||||||
return result
|
return result
|
||||||
else:
|
elif hasattr(tag.values, 'den'):
|
||||||
return [float(tag.values.num) / float(tag.values.den) if tag.values.den != 0 else None]
|
return [float(tag.values.num) / float(tag.values.den) if tag.values.den != 0 else None]
|
||||||
|
else:
|
||||||
|
return [None]
|
||||||
|
|
||||||
def float_value(self, tag):
|
def float_value(self, tag):
|
||||||
v = self.float_values(tag)
|
v = self.float_values(tag)
|
||||||
if len(v) > 0:
|
if len(v) > 0:
|
||||||
|
|
Ładowanie…
Reference in New Issue