[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60500] trunk/blender/extern/libmv/libmv/ multiview: libmv: fix matrix address being printed instead of actual values

Sergey Sharybin sergey.vfx at gmail.com
Wed Oct 2 12:18:44 CEST 2013


Revision: 60500
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60500
Author:   nazgul
Date:     2013-10-02 10:18:43 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
libmv: fix matrix address being printed instead of actual values

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/multiview/fundamental.cc
    trunk/blender/extern/libmv/libmv/multiview/fundamental.h
    trunk/blender/extern/libmv/libmv/multiview/homography.cc

Modified: trunk/blender/extern/libmv/libmv/multiview/fundamental.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/fundamental.cc	2013-10-02 04:12:06 UTC (rev 60499)
+++ trunk/blender/extern/libmv/libmv/multiview/fundamental.cc	2013-10-02 10:18:43 UTC (rev 60500)
@@ -446,14 +446,16 @@
 };
 
 /* 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 @@
 
   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);

Modified: trunk/blender/extern/libmv/libmv/multiview/fundamental.h
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/fundamental.h	2013-10-02 04:12:06 UTC (rev 60499)
+++ trunk/blender/extern/libmv/libmv/multiview/fundamental.h	2013-10-02 10:18:43 UTC (rev 60500)
@@ -175,10 +175,11 @@
  * 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
 

Modified: trunk/blender/extern/libmv/libmv/multiview/homography.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/homography.cc	2013-10-02 04:12:06 UTC (rev 60499)
+++ trunk/blender/extern/libmv/libmv/multiview/homography.cc	2013-10-02 10:18:43 UTC (rev 60500)
@@ -220,7 +220,8 @@
       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 @@
 
   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);




More information about the Bf-blender-cvs mailing list