Update master to become default branch (#302)

* Remove info about ccd_defs.

* Add example files

* fix url

* Make install cross compatible with Xenial and Trusty (#299)


Former-commit-id: c3c46d6960

README.md

@@ -79,7 +79,7 @@ Example data can be found at https://github.com/OpenDroneMap/odm_data
 
 ---
 
-Long term, the aim is for the toolchain to also be able to optionally push to a variety of online data repositories, pushing hi-resolution aerials to [OpenAerialMap](http://opentopography.org/), point clouds to [OpenTopography](http://opentopography.org/), and pushing digital elevation models to an emerging global repository (yet to be named...). That leaves only digital surface model meshes and UV textured meshes with no global repository home.
+Long term, the aim is for the toolchain to also be able to optionally push to a variety of online data repositories, pushing hi-resolution aerials to [OpenAerialMap](https://openaerialmap.org/), point clouds to [OpenTopography](http://opentopography.org/), and pushing digital elevation models to an emerging global repository (yet to be named...). That leaves only digital surface model meshes and UV textured meshes with no global repository home.
 
 ---
 
@@ -132,18 +132,20 @@ Died at ../../OpenDroneMap/./run.pl line 364.
 
 ```
 
-This means that your camera is not in the database, https://github.com/OpenDroneMap/OpenDroneMap/blob/gh-pages/ccd_defs.json
+~~This means that your camera is not in the database, https://github.com/OpenDroneMap/OpenDroneMap/blob/gh-pages/ccd_defs.json~~
 
-This problem is easily remedied. We need to know CCD size in the camera. We'll get these for our Sony Cyber-shot DSC-HX5 from dpreview: http://www.dpreview.com/products/sony/compacts/sony_dschx5/specifications
+~~This problem is easily remedied. We need to know CCD size in the camera. We'll get these for our Sony Cyber-shot DSC-HX5 from dpreview: http://www.dpreview.com/products/sony/compacts/sony_dschx5/specifications~~
 
-So, we'll add the following line to our ccd_defs.json:
+~~So, we'll add the following line to our ccd_defs.json:~~
 
-     "SONY DSC-HX5V": 6.104,
+     ~~"SONY DSC-HX5V": 6.104,~~
 
-To check that ccd_defs.json compiles, run `ccd_defs_check.py`
-If it prints the message 'CCD_DEFS compiles OK', then you can commit your changes.
+~~To check that ccd_defs.json compiles, run `ccd_defs_check.py`~~
+~~If it prints the message 'CCD_DEFS compiles OK', then you can commit your changes.~~
 
-And so others can use it, we'll do a pull request to add it to our array for everyone else.
+~~And so others can use it, we'll do a pull request to add it to our array for everyone else.~~
+
+See issue [#237](https://github.com/OpenDroneMap/OpenDroneMap/issues/237). OpenSfM uses its own sensor reference file, which you can find in the OpenSfM directory under `opensfm/data/`. 
 
 ---
 

img/sm_seneca_orthophoto.png.REMOVED.git-id

@@ -0,0 +1 @@
+2d1bc1543ef974c0c6a41db46c8c813c6a3b5692

img/sm_tol_odm_orthophoto.png.REMOVED.git-id

@@ -0,0 +1 @@
+fd7c406148027f41dc619fd833b9f55f9973a202

img/tol_ptcloud.png.REMOVED.git-id

@@ -0,0 +1 @@
+911fe91791a8506d3c641e51451a2f0a9121690f

img/tol_text.png.REMOVED.git-id

@@ -0,0 +1 @@
+715b5748537e5b44e0631d83da797e764531df8c

install.sh

@@ -115,7 +115,7 @@ echo "    - installing"
 if [[ `lsb_release -rs` == "12.04" ]];
 then
 sudo apt-get install --assume-yes --install-recommends \
-  build-essential cmake g++ gcc gFortran perl git autoconf \
+  build-essential cmake g++ gcc gfortran perl git autoconf \
   curl wget \
   unzip \
   imagemagick jhead proj-bin libproj-dev\
@@ -130,7 +130,7 @@ sudo apt-get install --assume-yes --install-recommends \
   > "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1
 else
 sudo apt-get install --assume-yes --install-recommends \
-  build-essential cmake g++ gcc gFortran perl git autoconf \
+  build-essential cmake g++ gcc gfortran perl git autoconf \
   curl wget \
   unzip \
   imagemagick jhead proj-bin libproj-dev\

odm_extract_utm/CMakeLists.txt

@@ -2,7 +2,8 @@ project(odm_extract_utm)
 cmake_minimum_required(VERSION 2.8)
 
 set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
-set(PROJ4_LIBRARY "/usr/lib/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
+
+find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
 
 # Add compiler options.
 add_definitions(-Wall -Wextra)

odm_georef/CMakeLists.txt

@@ -5,7 +5,8 @@ cmake_minimum_required(VERSION 2.8)
 set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
 set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the opencv installation directory")
 set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
-set(PROJ4_LIBRARY "/usr/lib/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
+find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
+#set(PROJ4_LIBRARY "/usr/lib/x86_64-linux-gnu/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
 
 # Add compiler options.
 add_definitions(-Wall -Wextra -Wconversion -pedantic)