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.
This commit is contained in:
@@ -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<double, 12, 12> &U,
|
||||
|
||||
4
extern/libmv/libmv/multiview/fundamental.cc
vendored
4
extern/libmv/libmv/multiview/fundamental.cc
vendored
@@ -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());
|
||||
|
||||
2
extern/libmv/libmv/multiview/homography.cc
vendored
2
extern/libmv/libmv/multiview/homography.cc
vendored
@@ -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,
|
||||
|
||||
2
extern/libmv/libmv/simple_pipeline/detect.cc
vendored
2
extern/libmv/libmv/simple_pipeline/detect.cc
vendored
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
1
extern/libmv/libmv/simple_pipeline/resect.cc
vendored
1
extern/libmv/libmv/simple_pipeline/resect.cc
vendored
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user