From e37ff1dd46a274d6e58e3c8ca340caec1fbf0263 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 18 Sep 2012 10:31:00 +0000 Subject: Libmv: resolved some compilation warnings (missed prototypes) In some cases it was missed include of header file, in some other cases symbol could be static. --- extern/libmv/libmv/multiview/euclidean_resection.cc | 14 +++++++------- extern/libmv/libmv/multiview/fundamental.cc | 4 ++-- extern/libmv/libmv/multiview/homography.cc | 2 +- extern/libmv/libmv/simple_pipeline/detect.cc | 2 +- .../libmv/simple_pipeline/initialize_reconstruction.cc | 1 + extern/libmv/libmv/simple_pipeline/intersect.cc | 1 + extern/libmv/libmv/simple_pipeline/resect.cc | 1 + 7 files changed, 14 insertions(+), 11 deletions(-) (limited to 'extern') diff --git a/extern/libmv/libmv/multiview/euclidean_resection.cc b/extern/libmv/libmv/multiview/euclidean_resection.cc index 92862515d7e..bcde6de5cab 100644 --- a/extern/libmv/libmv/multiview/euclidean_resection.cc +++ b/extern/libmv/libmv/multiview/euclidean_resection.cc @@ -351,9 +351,9 @@ void EuclideanResectionAnsarDaniilidis(const Mat2X &x_camera, } // Selects 4 virtual control points using mean and PCA. -void SelectControlPoints(const Mat3X &X_world, - Mat *X_centered, - Mat34 *X_control_points) { +static void SelectControlPoints(const Mat3X &X_world, + Mat *X_centered, + Mat34 *X_control_points) { size_t num_points = X_world.cols(); // The first virtual control point, C0, is the centroid. @@ -377,9 +377,9 @@ void SelectControlPoints(const Mat3X &X_world, } // Computes the barycentric coordinates for all real points -void ComputeBarycentricCoordinates(const Mat3X &X_world_centered, - const Mat34 &X_control_points, - Mat4X *alphas) { +static void ComputeBarycentricCoordinates(const Mat3X &X_world_centered, + const Mat34 &X_control_points, + Mat4X *alphas) { size_t num_points = X_world_centered.cols(); Mat3 C2 ; for (size_t c = 1; c < 4; c++) { @@ -398,7 +398,7 @@ void ComputeBarycentricCoordinates(const Mat3X &X_world_centered, } // Estimates the coordinates of all real points in the camera coordinate frame -void ComputePointsCoordinatesInCameraFrame( +static void ComputePointsCoordinatesInCameraFrame( const Mat4X &alphas, const Vec4 &betas, const Eigen::Matrix &U, diff --git a/extern/libmv/libmv/multiview/fundamental.cc b/extern/libmv/libmv/multiview/fundamental.cc index 7a6b4a08439..80f155e804d 100644 --- a/extern/libmv/libmv/multiview/fundamental.cc +++ b/extern/libmv/libmv/multiview/fundamental.cc @@ -28,7 +28,7 @@ namespace libmv { -void EliminateRow(const Mat34 &P, int row, Mat *X) { +static void EliminateRow(const Mat34 &P, int row, Mat *X) { X->resize(2, 4); int first_row = (row + 1) % 3; @@ -69,7 +69,7 @@ void FundamentalFromProjections(const Mat34 &P1, const Mat34 &P2, Mat3 *F) { // HZ 11.1 pag.279 (x1 = x, x2 = x') // http://www.cs.unc.edu/~marc/tutorial/node54.html -double EightPointSolver(const Mat &x1, const Mat &x2, Mat3 *F) { +static double EightPointSolver(const Mat &x1, const Mat &x2, Mat3 *F) { DCHECK_EQ(x1.rows(), 2); DCHECK_GE(x1.cols(), 8); DCHECK_EQ(x1.rows(), x2.rows()); diff --git a/extern/libmv/libmv/multiview/homography.cc b/extern/libmv/libmv/multiview/homography.cc index 366392f3923..b5c483998d8 100644 --- a/extern/libmv/libmv/multiview/homography.cc +++ b/extern/libmv/libmv/multiview/homography.cc @@ -40,7 +40,7 @@ namespace libmv { * (a-x1*g)*y1 + (b-x1*h)*y2 + c-x1 = |0| * (-x2*a+x1*d)*y1 + (-x2*b+x1*e)*y2 + -x2*c+x1*f |0| */ -bool Homography2DFromCorrespondencesLinearEuc( +static bool Homography2DFromCorrespondencesLinearEuc( const Mat &x1, const Mat &x2, Mat3 *H, diff --git a/extern/libmv/libmv/simple_pipeline/detect.cc b/extern/libmv/libmv/simple_pipeline/detect.cc index 8a093dadeca..9e3edf32d71 100644 --- a/extern/libmv/libmv/simple_pipeline/detect.cc +++ b/extern/libmv/libmv/simple_pipeline/detect.cc @@ -35,7 +35,7 @@ namespace libmv { typedef unsigned int uint; -int featurecmp(const void *a_v, const void *b_v) +static int featurecmp(const void *a_v, const void *b_v) { Feature *a = (Feature*)a_v; Feature *b = (Feature*)b_v; diff --git a/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc b/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc index 77fe2a530c4..9c06d1ef4e6 100644 --- a/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc +++ b/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc @@ -24,6 +24,7 @@ #include "libmv/multiview/projection.h" #include "libmv/numeric/levenberg_marquardt.h" #include "libmv/numeric/numeric.h" +#include "libmv/simple_pipeline/initialize_reconstruction.h" #include "libmv/simple_pipeline/reconstruction.h" #include "libmv/simple_pipeline/tracks.h" diff --git a/extern/libmv/libmv/simple_pipeline/intersect.cc b/extern/libmv/libmv/simple_pipeline/intersect.cc index b1518e04651..0c2f744dc1c 100644 --- a/extern/libmv/libmv/simple_pipeline/intersect.cc +++ b/extern/libmv/libmv/simple_pipeline/intersect.cc @@ -26,6 +26,7 @@ #include "libmv/multiview/projection.h" #include "libmv/numeric/numeric.h" #include "libmv/numeric/levenberg_marquardt.h" +#include "libmv/simple_pipeline/intersect.h" #include "libmv/simple_pipeline/reconstruction.h" #include "libmv/simple_pipeline/tracks.h" diff --git a/extern/libmv/libmv/simple_pipeline/resect.cc b/extern/libmv/libmv/simple_pipeline/resect.cc index b30d959b512..b30238f7e39 100644 --- a/extern/libmv/libmv/simple_pipeline/resect.cc +++ b/extern/libmv/libmv/simple_pipeline/resect.cc @@ -27,6 +27,7 @@ #include "libmv/multiview/projection.h" #include "libmv/numeric/numeric.h" #include "libmv/numeric/levenberg_marquardt.h" +#include "libmv/simple_pipeline/resect.h" #include "libmv/simple_pipeline/reconstruction.h" #include "libmv/simple_pipeline/tracks.h" -- cgit v1.2.3