Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-10-02 14:18:43 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-10-02 14:18:43 +0400
commit724b015da2ed219ab12a64c01c4fd1608231edf4 (patch)
treedaa5152d17ee16d35350c0a8ac4f1617a474dc1d /extern
parent0959482acb48d2c9a725fa4bbe5b52a9092f148b (diff)
libmv: fix matrix address being printed instead of actual values
Diffstat (limited to 'extern')
-rw-r--r--extern/libmv/libmv/multiview/fundamental.cc14
-rw-r--r--extern/libmv/libmv/multiview/fundamental.h9
-rw-r--r--extern/libmv/libmv/multiview/homography.cc5
3 files changed, 16 insertions, 12 deletions
diff --git a/extern/libmv/libmv/multiview/fundamental.cc b/extern/libmv/libmv/multiview/fundamental.cc
index 2b7515d7810..ec6c70d81cf 100644
--- a/extern/libmv/libmv/multiview/fundamental.cc
+++ b/extern/libmv/libmv/multiview/fundamental.cc
@@ -446,14 +446,16 @@ class FundamentalSymmetricEpipolarCostFunctor {
};
/* Fundamental transformation estimation. */
-bool FundamentalFromCorrespondencesEuc(const Mat &x1,
- const Mat &x2,
- const FundamentalEstimationOptions &options,
- Mat3 *F) {
+bool FundamentalFromCorrespondencesEuc(
+ const Mat &x1,
+ const Mat &x2,
+ const FundamentalEstimationOptions &options,
+ Mat3 *F) {
// Step 1: Algebraic fundamental estimation.
bool algebraic_success = NormalizedEightPointSolver(x1, x2, F);
- LG << "Algebraic result " << algebraic_success << ", estimated matrix " << F;
+ LG << "Algebraic result " << algebraic_success
+ << ", estimated matrix:\n" << *F;
if (!algebraic_success && !options.use_refine_if_algebraic_fails) {
return false;
@@ -490,7 +492,7 @@ bool FundamentalFromCorrespondencesEuc(const Mat &x1,
VLOG(1) << "Summary:\n" << summary.FullReport();
- LG << "Final refined matrix: " << F;
+ LG << "Final refined matrix:\n" << *F;
return !(summary.termination_type == ceres::DID_NOT_RUN ||
summary.termination_type == ceres::NUMERICAL_FAILURE);
diff --git a/extern/libmv/libmv/multiview/fundamental.h b/extern/libmv/libmv/multiview/fundamental.h
index e899fdd521c..2961a46cdc4 100644
--- a/extern/libmv/libmv/multiview/fundamental.h
+++ b/extern/libmv/libmv/multiview/fundamental.h
@@ -175,10 +175,11 @@ struct FundamentalEstimationOptions {
* correspondences by doing algebraic estimation first followed with result
* refinement.
*/
-bool FundamentalFromCorrespondencesEuc(const Mat &x1,
- const Mat &x2,
- const FundamentalEstimationOptions &options,
- Mat3 *F);
+bool FundamentalFromCorrespondencesEuc(
+ const Mat &x1,
+ const Mat &x2,
+ const FundamentalEstimationOptions &options,
+ Mat3 *F);
} // namespace libmv
diff --git a/extern/libmv/libmv/multiview/homography.cc b/extern/libmv/libmv/multiview/homography.cc
index 11e12abf455..6041849d9fe 100644
--- a/extern/libmv/libmv/multiview/homography.cc
+++ b/extern/libmv/libmv/multiview/homography.cc
@@ -220,7 +220,8 @@ bool Homography2DFromCorrespondencesEuc(
Homography2DFromCorrespondencesLinear(x1, x2, H,
options.expected_algebraic_precision);
- LG << "Algebraic result " << algebraic_success << ", estimated matrix " << H;
+ LG << "Algebraic result " << algebraic_success
+ << ", estimated matrix:\n" << *H;
if (!algebraic_success && !options.use_refine_if_algebraic_fails) {
return false;
@@ -257,7 +258,7 @@ bool Homography2DFromCorrespondencesEuc(
VLOG(1) << "Summary:\n" << summary.FullReport();
- LG << "Final refined matrix: " << H;
+ LG << "Final refined matrix:\n" << *H;
return !(summary.termination_type == ceres::DID_NOT_RUN ||
summary.termination_type == ceres::NUMERICAL_FAILURE);