Merge commit 'c1f2b420a236a993ee068124548985c7d29e6d7c'

README.md

@@ -29,7 +29,7 @@ Be sure to update your `PYTHONPATH` to include `/usr/local/lib/python2.7/site-pa
 
  1. [OpenCV][] - Install by following the steps in the Ubuntu OpenCV  [installation guide](https://help.ubuntu.com/community/OpenCV). An alternative instruction tested for Ubuntu 10.04 can be found at [OpenCV Docs](http://docs.opencv.org/doc/tutorials/introduction/linux_install/linux_install.html). OpenCV requires [GCC](https://gcc.gnu.org/) and [CMake](http://www.cmake.org/) among other things.
 
- 2. [Ceres solver][] - Build Ceres according the [documentation](http://ceres-solver.org/building.html). Make sure to read the Linux note, follow the shared library instructions and compile Ceres with the -fPIC option. Install Ceres from the ceres-bin directory after `make` by:
+ 2. [Ceres solver][] - Build Ceres according the [documentation](http://ceres-solver.org/building.html). Make sure to read the Linux note, follow the **shared library** instructions and compile Ceres with the -fPIC option. Install Ceres from the ceres-bin directory after `make` by:
 
         sudo make install
 
@@ -49,7 +49,7 @@ Be sure to update your `PYTHONPATH` to include `/usr/local/lib/python2.7/site-pa
 
 ## Building
 
-    python setup.py build
+    python2 setup.py build
 
 
 ## Running

bin/detect_features

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import os.path, sys
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 

bin/focal_from_exif

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import os.path, sys
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 

opensfm/src/csfm.cc

@@ -11,13 +11,22 @@
 #include "akaze.cc"
 #include "bundle.h"
 
+#if (PY_VERSION_HEX < 0x03000000)
+static void numpy_import_array_wrapper()
+#else
+static int* numpy_import_array_wrapper()
+#endif
+{
+  /* Initialise numpy API and use 2/3 compatible return */
+  import_array();
+}
 
 BOOST_PYTHON_MODULE(csfm) {
   using namespace boost::python;
 
   google::InitGoogleLogging("csfm");
   boost::python::numeric::array::set_module_and_type("numpy", "ndarray");
-  import_array();
+  numpy_import_array_wrapper();
 
 
   enum_<DESCRIPTOR_TYPE>("AkazeDescriptorType")

opensfm/src/third_party/libmv/tools/tool.h

@@ -34,8 +34,8 @@ namespace libmv {
 
 inline void Init(const char *usage, int *argc, char ***argv) {
   google::InitGoogleLogging((*argv)[0]);
-  google::SetUsageMessage(std::string(usage));
-  google::ParseCommandLineFlags(argc, argv, true);
+  gflags::SetUsageMessage(std::string(usage));
+  gflags::ParseCommandLineFlags(argc, argv, true);
 }
 
 }  // namespace libmv