[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39557] branches/soc-2011-tomato/extern/ libmv: Camera tracking integration

[Sergey Sharybin]

Revision: 39557
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39557
Author:   nazgul
Date:     2011-08-19 15:38:11 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

Another fix for MSVC.

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/ChangeLog
    branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.cc

Modified: branches/soc-2011-tomato/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2011-tomato/extern/libmv/ChangeLog	2011-08-19 15:17:26 UTC (rev 39556)
+++ branches/soc-2011-tomato/extern/libmv/ChangeLog	2011-08-19 15:38:11 UTC (rev 39557)
@@ -1,3 +1,15 @@
+commit 2ac7281ff6b9545b425dd84fb03bf9c5c98b4de2
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Fri Aug 19 17:34:45 2011 +0200
+
+    Avoid symbol shadowing.
+
+commit 2a7c3de4acc60e0433b4952f69e30528dbafe0d2
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Fri Aug 19 17:22:47 2011 +0200
+
+    Better dragging behavior when hitting borders.
+
 commit a14eb3953c9521b2e08ff9ddd45b33ff1f8aeafb
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
 Date:   Fri Aug 19 17:12:12 2011 +0200

Modified: branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.cc	2011-08-19 15:17:26 UTC (rev 39556)
+++ branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.cc	2011-08-19 15:38:11 UTC (rev 39557)
@@ -128,9 +128,9 @@
     for(int i = 0; i < 2; i++) { // iterate twice per precision level
       //TODO: other sweep pattern might converge better
       for(int d=0; d < 6; d++) { // iterate dimension sequentially (cyclic descent)
-        for(float x = -step; x <= step; x+=step) { //solve subproblem (evaluate only along one coordinate)
+        for(float e = -step; e <= step; e+=step) { //solve subproblem (evaluate only along one coordinate)
           mat32 t = m;
-          t.data[d] += x;
+          t.data[d] += e;
           //TODO: better performance would also allow a more exhaustive search
           SamplePattern(image,stride,t,match,size);
           uint sad = SAD(reference,match,size,size);