[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50723] trunk/blender/extern/libmv/ third_party/ceres: Ceres: resolve no previous declarations warnings
Sergey Sharybin
sergey.vfx at gmail.com
Tue Sep 18 13:01:51 CEST 2012
Revision: 50723
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50723
Author: nazgul
Date: 2012-09-18 11:01:51 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Ceres: resolve no previous declarations warnings
Currently done as patch applied on bundling, would forward it to Ceres developers.
Modified Paths:
--------------
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/file.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/split.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/types.cc
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
trunk/blender/extern/libmv/third_party/ceres/patches/series
Added Paths:
-----------
trunk/blender/extern/libmv/third_party/ceres/patches/no_previous_declaration_fix.patch
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/file.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/file.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/file.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -31,6 +31,7 @@
// Really simple file IO.
#include <cstdio>
+#include "file.h"
#include "glog/logging.h"
namespace ceres {
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -573,13 +573,13 @@
return problem;
}
-bool DumpLinearLeastSquaresProblemToConsole(const string& directory,
- int iteration,
- const SparseMatrix* A,
- const double* D,
- const double* b,
- const double* x,
- int num_eliminate_blocks) {
+static bool DumpLinearLeastSquaresProblemToConsole(const string& directory,
+ int iteration,
+ const SparseMatrix* A,
+ const double* D,
+ const double* b,
+ const double* x,
+ int num_eliminate_blocks) {
CHECK_NOTNULL(A);
Matrix AA;
A->ToDenseMatrix(&AA);
@@ -601,13 +601,13 @@
};
#ifndef CERES_NO_PROTOCOL_BUFFERS
-bool DumpLinearLeastSquaresProblemToProtocolBuffer(const string& directory,
- int iteration,
- const SparseMatrix* A,
- const double* D,
- const double* b,
- const double* x,
- int num_eliminate_blocks) {
+static bool DumpLinearLeastSquaresProblemToProtocolBuffer(const string& directory,
+ int iteration,
+ const SparseMatrix* A,
+ const double* D,
+ const double* b,
+ const double* x,
+ int num_eliminate_blocks) {
CHECK_NOTNULL(A);
LinearLeastSquaresProblemProto lsqp;
A->ToProto(lsqp.mutable_a());
@@ -641,13 +641,13 @@
return true;
}
#else
-bool DumpLinearLeastSquaresProblemToProtocolBuffer(const string& directory,
- int iteration,
- const SparseMatrix* A,
- const double* D,
- const double* b,
- const double* x,
- int num_eliminate_blocks) {
+static bool DumpLinearLeastSquaresProblemToProtocolBuffer(const string& directory,
+ int iteration,
+ const SparseMatrix* A,
+ const double* D,
+ const double* b,
+ const double* x,
+ int num_eliminate_blocks) {
LOG(ERROR) << "Dumping least squares problems is only "
<< "supported when Ceres is compiled with "
<< "protocol buffer support.";
@@ -655,9 +655,9 @@
}
#endif
-void WriteArrayToFileOrDie(const string& filename,
- const double* x,
- const int size) {
+static void WriteArrayToFileOrDie(const string& filename,
+ const double* x,
+ const int size) {
CHECK_NOTNULL(x);
VLOG(2) << "Writing array to: " << filename;
FILE* fptr = fopen(filename.c_str(), "w");
@@ -668,13 +668,13 @@
fclose(fptr);
}
-bool DumpLinearLeastSquaresProblemToTextFile(const string& directory,
- int iteration,
- const SparseMatrix* A,
- const double* D,
- const double* b,
- const double* x,
- int num_eliminate_blocks) {
+static bool DumpLinearLeastSquaresProblemToTextFile(const string& directory,
+ int iteration,
+ const SparseMatrix* A,
+ const double* D,
+ const double* b,
+ const double* x,
+ int num_eliminate_blocks) {
CHECK_NOTNULL(A);
string format_string = JoinPath(directory,
"lm_iteration_%03d");
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -63,7 +63,7 @@
// Utility routine to print an array of doubles to a string. If the
// array pointer is NULL, it is treated as an array of zeros.
-void AppendArrayToString(const int size, const double* x, string* result) {
+static void AppendArrayToString(const int size, const double* x, string* result) {
for (int i = 0; i < size; ++i) {
if (x == NULL) {
StringAppendF(result, "Not Computed ");
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -685,8 +685,8 @@
// Find the minimum index of any parameter block to the given residual.
// Parameter blocks that have indices greater than num_eliminate_blocks are
// considered to have an index equal to num_eliminate_blocks.
-int MinParameterBlock(const ResidualBlock* residual_block,
- int num_eliminate_blocks) {
+static int MinParameterBlock(const ResidualBlock* residual_block,
+ int num_eliminate_blocks) {
int min_parameter_block_position = num_eliminate_blocks;
for (int i = 0; i < residual_block->NumParameterBlocks(); ++i) {
ParameterBlock* parameter_block = residual_block->parameter_blocks()[i];
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/split.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/split.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/split.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -31,6 +31,7 @@
#include <string>
#include <vector>
#include <iterator>
+#include "ceres/split.h"
#include "ceres/internal/port.h"
namespace ceres {
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -34,6 +34,7 @@
#include <string>
#include <vector>
+#include "ceres/stringprintf.h"
#include "ceres/internal/port.h"
namespace ceres {
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/types.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/types.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/types.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -98,7 +98,8 @@
}
}
-const char* SparseLinearAlgebraTypeToString(
+#if 0 /* UNUSED */
+static const char* SparseLinearAlgebraTypeToString(
SparseLinearAlgebraLibraryType sparse_linear_algebra_library_type) {
switch (sparse_linear_algebra_library_type) {
CASESTR(CX_SPARSE);
@@ -107,6 +108,7 @@
return "UNKNOWN";
}
}
+#endif
const char* TrustRegionStrategyTypeToString(
TrustRegionStrategyType trust_region_strategy_type) {
Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/visibility.cc 2012-09-18 10:51:48 UTC (rev 50722)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/visibility.cc 2012-09-18 11:01:51 UTC (rev 50723)
@@ -36,6 +36,7 @@
#include <utility>
#include "ceres/block_structure.h"
#include "ceres/collections_port.h"
+#include "ceres/visibility.h"
#include "ceres/graph.h"
#include "glog/logging.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list