[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50721] trunk/blender/extern/libmv/libmv: Libmv: resolved some compilation warnings (missed prototypes)

[Sergey Sharybin]

Revision: 50721
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50721
Author:   nazgul
Date:     2012-09-18 10:31:00 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc
    trunk/blender/extern/libmv/libmv/multiview/fundamental.cc
    trunk/blender/extern/libmv/libmv/multiview/homography.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/resect.cc

Modified: trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -351,9 +351,9 @@
 }
 
 // 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 @@
 }
 
 // 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 @@
 }
 
 // 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<double, 12, 12> &U,

Modified: trunk/blender/extern/libmv/libmv/multiview/fundamental.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/fundamental.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/multiview/fundamental.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -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 @@
 
 // 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());

Modified: trunk/blender/extern/libmv/libmv/multiview/homography.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/homography.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/multiview/homography.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -40,7 +40,7 @@
  * (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,

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -35,7 +35,7 @@
 
 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;

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -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"
 

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -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"
 

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/resect.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/resect.cc	2012-09-18 10:11:46 UTC (rev 50720)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/resect.cc	2012-09-18 10:31:00 UTC (rev 50721)
@@ -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"