[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54953] trunk/blender/extern/libmv/libmv/ simple_pipeline/modal_solver.cc: Hrm, gcc became broken after recent commit .

[Sergey Sharybin]

Revision: 54953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54953
Author:   nazgul
Date:     2013-03-01 08:56:04 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
Hrm, gcc became broken after recent commit.
Hope now gcc and 32bit msvc would both work.

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc

Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc	2013-03-01 08:20:13 UTC (rev 54952)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc	2013-03-01 08:56:04 UTC (rev 54953)
@@ -56,8 +56,8 @@
 }
 
 struct ModalReprojectionError {
-  ModalReprojectionError(Vec2 &marker, Vec3 &bundle)
-    : marker(marker), bundle(bundle) { }
+  ModalReprojectionError(double observed_x, double observed_y, Vec3 &bundle)
+    : observed_x(observed_x), observed_y(observed_y), bundle(bundle) { }
 
   template <typename T>
   bool operator()(const T* quaternion,   // Rotation quaternion
@@ -84,13 +84,14 @@
 
     // The error is the difference between reprojected
     // and observed marker position.
-    residuals[0] = xn - T(marker(0));
-    residuals[1] = yn - T(marker(1));
+    residuals[0] = xn - T(observed_x);
+    residuals[1] = yn - T(observed_y);
 
     return true;
   }
 
-  Vec2 marker;
+  double observed_x;
+  double observed_y;
   Vec3 bundle;
 };
 }  // namespace
@@ -183,7 +184,7 @@
         problem.AddResidualBlock(new ceres::AutoDiffCostFunction<
             ModalReprojectionError,
             2, /* num_residuals */
-            4>(new ModalReprojectionError(Vec2(marker.x, marker.y),
+            4>(new ModalReprojectionError(marker.x, marker.y,
                                           point->X)),
             NULL,
             &quaternion(0));