merge develop

.gitignore

@@ -9,3 +9,6 @@
 *~
 *.pyc
 *.db
+build*
+*.out
+docs/openmvg.pdf

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "src/dependencies/osi_clp"]
 	path = src/dependencies/osi_clp
 	url = https://github.com/openMVG-thirdparty/osi_clp.git
+[submodule "src/dependencies/cereal"]
+	path = src/dependencies/cereal
+	url = https://github.com/openMVG-thirdparty/cereal.git

.travis.yml

@@ -6,28 +6,34 @@ language: cpp
 
 compiler:
   - gcc
-  - clang
+  #- clang: #Consider clang later, since cereal does not build fine with clang
+  #  - "3.3"
 
 before_install:
+ - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
  - sudo apt-get update -qq
  - export NUM_CPU="`grep processor /proc/cpuinfo | wc -l`"; echo $NUM_CPU
  - sudo apt-get install lcov
  - gem install coveralls-lcov
 
-install: sudo apt-get install cmake libpng-dev libjpeg8-dev libxxf86vm1 libxxf86vm1 libxxf86vm-dev x11proto-xf86vidmode-dev libxrandr-dev
+install: 
+- sudo apt-get install cmake libpng-dev libjpeg8-dev libtiff-dev
+- sudo apt-get install libxxf86vm1 libxxf86vm1 libxxf86vm-dev x11proto-xf86vidmode-dev libxrandr-dev
+- sudo apt-get install -qq g++-4.8
+- export CXX="g++-4.8"
 
 before_script:
   - cd ..
   - mkdir build
   - cd build
   # Classic release build
-  #- cmake -DCMAKE_BUILD_TYPE=release -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON . ../openMVG/src
+  - cmake -DCMAKE_BUILD_TYPE=release -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON . ../openMVG/src
   # Build for code coverage evaluation
-  - cmake -DOpenMVG_BUILD_COVERAGE=ON -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON . ../openMVG/src
+  #- cmake -DOpenMVG_BUILD_COVERAGE=ON -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON . ../openMVG/src
 
 script:
 # limit GCC builds to a reduced number of thread for the virtual machine
-  - if [ "$CC" = "gcc" ]; then make -j 2; else make -j 4; fi
+  - if [ "$CC" = "gcc" ]; then make; else make -j 2; fi
 # Perform unit tests only on GCC builds
   - if [ "$CC" = "gcc" ]; then make test; fi
 
@@ -36,15 +42,15 @@ branches:
     - develop
 
 after_success:
-  - cd ../openMVG
+  #- cd ../openMVG
   # If GCC: compute code coverage and export it to coveralls
-  - if [ "$CC" = "gcc" ];
-    then
-      lcov --directory ../build/openMVG --base-directory=./src --capture --output-file=coverage.info;
-      lcov --remove coverage.info '/usr*' -o coverage.info;
-      lcov --remove coverage.info '*_test.cpp*' -o coverage.info;
-      lcov --remove coverage.info '*/third_party/*' -o coverage.info;
-      lcov --remove coverage.info '*/src/dependencies/*' -o coverage.info;
-      coveralls-lcov coverage.info;
-    fi
+  #- if [ "$CC" = "gcc" ];
+  #  then
+  #    lcov --directory ../build/openMVG --base-directory=./src --capture --output-file=coverage.info;
+  #    lcov --remove coverage.info '/usr*' -o coverage.info;
+  #    lcov --remove coverage.info '*_test.cpp*' -o coverage.info;
+  #    lcov --remove coverage.info '*/third_party/*' -o coverage.info;
+  #    lcov --remove coverage.info '*/src/dependencies/*' -o coverage.info;
+  #    coveralls-lcov coverage.info;
+  #  fi
 

AUTHORS

@@ -4,10 +4,20 @@ openMVG authors
 Pierre Moulon <[email protected]>
 Pascal Monasse <[email protected]>
 Renaud Marlet <[email protected]>
-ySalaun
-bduisit
-ORNis
-fcastan
+
+anhtuann
+Bruno Duisit
+Fabien Castan
+Iivari Äikäs
+luxigo
+Michael Holroyd
+Romain Janvier
+Rory McCann
+Romuald Perrot
+sergi pujades-rocamora
+sflotron
+vincentweb
+Yohann Salaun
 
 -------------
 OpenMVG authors would thanks the libmv authors

BUILD

@@ -19,18 +19,9 @@ $ cd openMVG
 $ git submodule init
 $ git submodule update
 
-------------------------------------
-Using as library dependency in cmake
-------------------------------------
-Adding following lines to your CMakeLists.txt should provide OpenMVG usable as
-static library:
-
- add_subdirectory(openMVG/src)
- include_directories(${OpenMVG_INCLUDES})
- target_link_libraries(target ${OpenMVG_LIBS})
-
-Information about required dependencies, standalone build and platform 
-specificity can be found below.
+As openMVG use some C++11 features you must have a c++11 ready compiler:
+- Visual studio >= 2013
+- GCC >= 4.7
 
 --------------------------
 General informations
@@ -45,7 +36,7 @@ Linux compilation
 -----------------
 
 Setup the required external library.
-* sudo apt-get install libpng-dev libjpeg-dev libxxf86vm1 libxxf86vm-dev libxi-dev libxrandr-dev
+* sudo apt-get install libpng-dev libjpeg-dev libtiff-dev libxxf86vm1 libxxf86vm-dev libxi-dev libxrandr-dev
 
  $ git clone --recursive https://github.com/openMVG/openMVG.git
  $ cd openMVG
@@ -58,8 +49,8 @@ Setup the required external library.
 If you want enable unit tests and examples to the build:
  $ cmake -DCMAKE_BUILD_TYPE=RELEASE -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON . ../openMVG/src/
 
-=> In order to use the MOSEK 6 backend for the linear programming openMVG module
-  - Check that you have an uptodate MOSEK licence, else openMVG MOSEK unit test will fail.
+=> In order to use the MOSEK 6 back-end for the linear programming openMVG module
+  - Check that you have an up-to-date MOSEK licence, else openMVG MOSEK unit test will fail.
 
  $ cmake -DCMAKE_BUILD_TYPE=RELEASE
     -DMOSEK_SEARCH_HEADER="~/Documents/Lib/mosek/6/tools/platform/linux64x86/h"
@@ -113,3 +104,23 @@ If you want enable unit tests and examples to the build:
  $ cmake -DCMAKE_BUILD_TYPE=RELEASE -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON -G "Xcode" . ../openMVG/src/
  $ xcodebuild -configuration Release
 
+
+ --------------------
+ Using openCV sample
+ --------------------
+ Add -DOpenMVG_USE_OPENCV=ON to your cmake command line and set OpenCV_DIR variable to your openCV build directory
+=> i.e.: -DOpenCV_DIR="/home/user/Dev/github/itseez/opencv_Build" -DOpenMVG_USE_OPENCV=ON
+
+------------------------------------
+Using as library dependency in cmake
+------------------------------------
+Adding following lines to your CMakeLists.txt should provide OpenMVG usable as
+static library:
+
+ add_subdirectory(openMVG/src)
+ include_directories(${OpenMVG_INCLUDES})
+ target_link_libraries(target ${OpenMVG_LIBS})
+
+Information about required dependencies, standalone build and platform 
+specificity can be found below.
+

COPYRIGHT.md

@@ -0,0 +1,87 @@
+
+## OpenMVG License
+
+* __OpenMVG - open Multiple View Geometry__<br />
+  Copyright OpenMVG authors
+  Licensed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+
+## Included third parties licence details
+
+This program includes works distributed under the terms of another license(s) and other copyright notice(s).
+
+*   __ceres-solver__<br />
+    <[http://ceres-solver.org/](http://ceres-solver.org/)><br />
+    Copyright 2015 Google Inc. All rights reserved.
+    Licensed under the [New BSD licence](http://ceres-solver.org/license.html).
+
+*   __cmdLine__<br />
+    Copyright (c) Pascal Monasse.
+    Licensed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+
+*   __CppUnitLite__ (optionnal)<br />
+    Public domain.
+
+*   __cxsparse__  (optionnal)<br />
+    Copyright (c) 2006-2012, Timothy A. Davis.
+    Distributed under the [GNU LGPL license](http://opensource.org/licenses/lgpl-license).
+
+*   __easyexif__<br />
+    Copyright (c) 2010 Mayank Lahiri.
+    Distributed under the [New BSD License](http://opensource.org/licenses/BSD-3-Clause).
+
+*   __eigen__<br />
+    Copyright (c) Eigen authors.
+    Distributed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+    Compiled with EIGEN_MPL2_ONLY to ensure MPL2 compatible code.
+
+*   __flann__<br />
+    Copyright (c) 2008-2011  Marius Muja ([email protected]). All rights reserved.
+    Copyright (c) 2008-2011  David G. Lowe ([email protected]). All rights reserved.
+    Distributed under the [BSD License](http://www.opensource.org/licenses/bsd-license.php).
+
+*   __histogram__<br />
+    Copyright (c) Jansson Consulting & Pierre Moulon.
+    Licensed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+
+*   __htmlDoc__<br />
+    Copyright (c) Pierre Moulon.
+    Licensed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+
+*   __jpeg__<br />
+    Copyright (c) Independent JPEG Group License.
+    Licensed under the [Independent JPEG Group License](https://spdx.org/licenses/IJG).
+
+*   __lemon__<br />
+    Copyright (c) Lemon authors.
+    Licensed under the [Boost License 1.0](http://www.boost.org/LICENSE_1_0.txt).
+
+*   __png__ (optionnal)<br />
+    Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson
+    Licensed under the [lib png license](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt).
+
+*   __progress__<br />
+    Copyright (c) Pierre MOULON
+    Licensed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+
+*   __stlplus3__<br />
+    Copyright (c) 1999-2004 Southampton University, 2004 onwards Andy Rushton. All rights reserved.
+    Licensed under the [BSD license](http://opensource.org/licenses/bsd-license.php).
+
+*   __tiff__ (optionnal)<br />
+    Copyright (c) 1988-1997 Sam Leffler
+    Copyright (c) 1991-1997 Silicon Graphics, Inc.
+    Licensed under a BSD-like license.
+
+*   __tinythread__<br />
+    Copyright (c) 2010-2012 Marcus Geelnard.
+    Licensed under the [zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php).
+
+*   __vectorGraphics__<br />
+    Copyright (c) Pierre Moulon
+    Licensed under the [MPL2 license](http://opensource.org/licenses/MPL-2.0).
+
+*   __zlib__  (optionnal)<br />
+    Copyright (C) 1995-2005 Jean-loup Gailly
+    Licensed under the [zlib license](http://opensource.org/licenses/Zlib).
+
+