From 04037ff6fd39163f249be7e96580fd67a0f94c71 Mon Sep 17 00:00:00 2001 From: Stephen Mather Date: Tue, 20 Oct 2020 12:12:19 -0400 Subject: [PATCH 1/3] Update reference image --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e4993064..a60a91f2 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ An open source command line toolkit for processing aerial drone imagery. ODM tur * Georeferenced Orthorectified Imagery * Georeferenced Digital Elevation Models -![images-diag](https://user-images.githubusercontent.com/1951843/79700615-f7906f80-8264-11ea-956a-cdc37cdeb263.png) +![images-diag](https://user-images.githubusercontent.com/1174901/96613039-7de94500-12cc-11eb-9975-ca67b188b0d3.png) -The application is available for Windows, Mac and Linux and it works from the command line, making it ideal for power users, scripts and for integration with other software. +The application is available for Windows, Mac and Linux and it works from the command line, making it ideal for power users, scripts and for integration with other software. If you would rather not type commands in a shell and are looking for a friendly user interface, check out [WebODM](https://github.com/OpenDroneMap/WebODM). @@ -55,12 +55,12 @@ When the process finishes, the results will be organized as follows: |-- odm_georeferenced_model.laz # LAZ format point cloud |-- odm_orthophoto/ |-- odm_orthophoto.tif # Orthophoto GeoTiff - + You can use the following free and open source software to open the files generated in ODM: * .tif (GeoTIFF): [QGIS](http://www.qgis.org/) * .laz (Compressed LAS): [CloudCompare](https://www.cloudcompare.org/) * .obj (Wavefront OBJ), .ply (Stanford Triangle Format): [MeshLab](http://www.meshlab.net/) - + **Note!** Opening the .tif files generated by ODM in programs such as Photoshop or GIMP might not work (they are GeoTIFFs, not plain TIFFs). Use [QGIS](http://www.qgis.org/) instead. ## API @@ -90,7 +90,7 @@ When updating to a newer version of ODM, it is recommended that you run bash configure.sh reinstall -to ensure all the dependent packages and modules get updated. +to ensure all the dependent packages and modules get updated. ### Build From Source @@ -119,7 +119,7 @@ After this, you must restart docker. ## Developers -Help improve our software! We welcome contributions from everyone, whether to add new features, improve speed, fix existing bugs or add support for more cameras. Check our [code of conduct](https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md), the [contributing guidelines](https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md) and [how decisions are made](https://github.com/OpenDroneMap/documents/blob/master/GOVERNANCE.md#how-decisions-are-made). +Help improve our software! We welcome contributions from everyone, whether to add new features, improve speed, fix existing bugs or add support for more cameras. Check our [code of conduct](https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md), the [contributing guidelines](https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md) and [how decisions are made](https://github.com/OpenDroneMap/documents/blob/master/GOVERNANCE.md#how-decisions-are-made). For Linux users, the easiest way to modify the software is to make sure docker is installed, clone the repository and then run from a shell: From f1a9c18045a9913f87ec056edd3eef88a31040b0 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Tue, 20 Oct 2020 17:13:45 -0400 Subject: [PATCH 2/3] Update example image to improved Stone Town --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a60a91f2..8200e8b3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ An open source command line toolkit for processing aerial drone imagery. ODM tur * Georeferenced Orthorectified Imagery * Georeferenced Digital Elevation Models -![images-diag](https://user-images.githubusercontent.com/1174901/96613039-7de94500-12cc-11eb-9975-ca67b188b0d3.png) +![images-diag](https://user-images.githubusercontent.com/1174901/96644651-5b205600-12f7-11eb-827b-8f4a3a6f3b21.png) The application is available for Windows, Mac and Linux and it works from the command line, making it ideal for power users, scripts and for integration with other software. From 9abf1ee695f16b9f16ee126d8593d10d21570019 Mon Sep 17 00:00:00 2001 From: Daniel Llewellyn Date: Mon, 26 Oct 2020 15:56:10 +0000 Subject: [PATCH 3/3] Update GCC Wrapper scripts for portable build The wrapper scripts incorrectly unwrapped arguments with spaces making them appear to be multiple individual arguments instead of one quoted argument. ref: https://github.com/OpenDroneMap/ODM/pull/1170#issuecomment-716607868 Signed-off-by: Daniel Llewellyn --- docker/g++ | 8 ++++---- docker/gcc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/g++ b/docker/g++ index ffdb9a14..7a4a0a4a 100755 --- a/docker/g++ +++ b/docker/g++ @@ -1,12 +1,12 @@ #!/bin/bash -args="" +declare -a args for i in "$@" do - if [[ $i != -march* ]]; then - args="$args $i" + if [[ "$i" != -march* ]]; then + args+=("$i") fi done -/usr/bin/g++_real -march=nehalem $args +/usr/bin/g++_real -march=nehalem "${args[@]}" diff --git a/docker/gcc b/docker/gcc index c2d09701..70fb53d5 100755 --- a/docker/gcc +++ b/docker/gcc @@ -1,12 +1,12 @@ #!/bin/bash -args="" +declare -a args for i in "$@" do - if [[ $i != -march* ]]; then - args="$args $i" + if [[ "$i" != -march* ]]; then + args+=("$i") fi done -/usr/bin/gcc_real -march=nehalem $args +/usr/bin/gcc_real -march=nehalem "${args[@]}"