Merge branch 'edgarriba-cmake' of https://github.com/Fi156/OpenDroneMap into Fi1560-edgarriba-cmake

Conflicts:
	scripts/resize.py
pull/297/head
Dakota Benjamin 2016-04-20 12:49:57 +00:00
commit 45fd6040a1
1 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -78,8 +78,8 @@ class ODMResizeCell(ecto.Cell):
# copy metadata
old_meta.copy(new_meta)
# update metadata size
new_meta['Exif.Photo.PixelXDimension'].value = img_r.shape[0]
new_meta['Exif.Photo.PixelYDimension'].value = img_r.shape[1]
new_meta['Exif.Photo.PixelXDimension'] = img_r.shape[0]
new_meta['Exif.Photo.PixelYDimension'] = img_r.shape[1]
new_meta.write()
# update photos array with new values
photo.path_file = new_path_file
@ -105,3 +105,4 @@ class ODMResizeCell(ecto.Cell):
log.ODM_INFO('Running ODM Resize Cell - Finished')
return ecto.OK if args.end_with != 'resize' else ecto.QUIT