[Bf-blender-cvs] [7491f13] soc-2016-multiview: Multiview reconstruction: Fix compilation error on Linux with strict compiler flags

[Sergey Sharybin]

Commit: 7491f13085bcad17c1034d85ca72ede25742b4fa
Author: Sergey Sharybin
Date:   Wed Jun 29 12:21:03 2016 +0500
Branches: soc-2016-multiview
https://developer.blender.org/rB7491f13085bcad17c1034d85ca72ede25742b4fa

Multiview reconstruction: Fix compilation error on Linux with strict compiler flags

===================================================================

M	intern/libmv/libmv/autotrack/bundle.cc
M	intern/libmv/libmv/autotrack/pipeline.cc
M	intern/libmv/libmv/autotrack/reconstruction.cc

===================================================================

diff --git a/intern/libmv/libmv/autotrack/bundle.cc b/intern/libmv/libmv/autotrack/bundle.cc
index a96e4c2..c232a14 100644
--- a/intern/libmv/libmv/autotrack/bundle.cc
+++ b/intern/libmv/libmv/autotrack/bundle.cc
@@ -25,6 +25,7 @@
 
 #include "libmv/autotrack/bundle.h"
 
+#include <cstdio>
 #include <map>
 
 #include "ceres/ceres.h"
diff --git a/intern/libmv/libmv/autotrack/pipeline.cc b/intern/libmv/libmv/autotrack/pipeline.cc
index cdd417f..a8ac232 100644
--- a/intern/libmv/libmv/autotrack/pipeline.cc
+++ b/intern/libmv/libmv/autotrack/pipeline.cc
@@ -42,9 +42,9 @@ namespace {
 // Use this functor-like struct to reuse reconstruction pipeline code
 // in the future, in case we will do projective reconstruction
 struct EuclideanPipelineRoutines {
-	typedef Reconstruction Reconstruction;
+	typedef ::mv::Reconstruction Reconstruction;
 	typedef CameraPose Camera;
-	typedef Point Point;
+	typedef ::mv::Point Point;
 
 	static void Bundle(const Tracks &tracks,
 	                   Reconstruction *reconstruction) {
diff --git a/intern/libmv/libmv/autotrack/reconstruction.cc b/intern/libmv/libmv/autotrack/reconstruction.cc
index e077cb1..14a1aaa 100644
--- a/intern/libmv/libmv/autotrack/reconstruction.cc
+++ b/intern/libmv/libmv/autotrack/reconstruction.cc
@@ -38,8 +38,8 @@ using libmv::Vec2;
 
 namespace mv {
 
-void GetFramesInMarkers(const vector<Marker> &markers,
-                        int *image1, int *image2) {
+static void GetFramesInMarkers(const vector<Marker> &markers,
+                               int *image1, int *image2) {
 	if (markers.size() < 2) {
 		return;
 	}
@@ -54,9 +54,9 @@ void GetFramesInMarkers(const vector<Marker> &markers,
 	LOG(FATAL) << "Only one image in the markers.";
 }
 
-void CoordinatesForMarkersInFrame(const vector<Marker> &markers,
-                                  int clip, int frame,
-                                  Mat *coordinates) {
+static void CoordinatesForMarkersInFrame(const vector<Marker> &markers,
+                                         int clip, int frame,
+                                         Mat *coordinates) {
 	vector<Vec2> coords;
 	for (int i = 0; i < markers.size(); ++i) {
 		const Marker &marker = markers[i];
@@ -188,13 +188,14 @@ const Point* Reconstruction::PointForTrack(int track) const {
 	return const_cast<Point *>(static_cast<const Reconstruction *>(this)->PointForTrack(track));
 }
 
-int  Reconstruction::AddPoint(const Point& point) {
+int Reconstruction::AddPoint(const Point& point) {
 	LG << "InsertPoint " << point.track << ":\n" << point.X;
 	if (point.track >= points_.size()) {
 		points_.resize(point.track + 1);
 	}
 	points_[point.track].track = point.track;
 	points_[point.track].X = point.X;
+	return point.track;
 }
 
 const vector<vector<CameraPose> >& Reconstruction::camera_poses() const {