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

[Sergey Sharybin]

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

Another fix for msvc/osx. Hope it'll work now.

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

Modified: branches/soc-2011-tomato/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2011-tomato/extern/libmv/ChangeLog	2011-08-17 17:17:14 UTC (rev 39498)
+++ branches/soc-2011-tomato/extern/libmv/ChangeLog	2011-08-17 17:44:38 UTC (rev 39499)
@@ -1,3 +1,9 @@
+commit 65a9d496f81e8b37eae39a4063957b8be9a4e6f0
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date:   Wed Aug 17 19:25:17 2011 +0200
+
+    Fix compilation on OSX.
+
 commit d22720e618456329388d2c107422c3b371657cba
 Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
 Date:   Wed Aug 17 14:14:45 2011 +0200
@@ -395,15 +401,3 @@
     Add some #if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0)) and #define constBits bits macros to support Qt < 4.7 which is still used on older systems.
     
     Build using Qt < 4.7 will see increased memory usage and unecessary copying.
-
-commit 1b91161241f90ef40391edd13c902d1901b723fb
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jul 17 18:25:47 2011 +0200
-
-    Fix sequence caching.
-
-commit e1737d71b50237c0f0d5a7f2b7463284d95a902e
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sun Jul 17 16:35:48 2011 +0200
-
-    Use deprecated FFmpeg API.

Modified: branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc	2011-08-17 17:17:14 UTC (rev 39498)
+++ branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc	2011-08-17 17:44:38 UTC (rev 39499)
@@ -27,6 +27,8 @@
 
 namespace libmv {
 
+typedef unsigned int uint;
+
 #ifdef __SSE2__
 #include <emmintrin.h>
 static uint SAD(const ubyte* imageA, const ubyte* imageB, int strideA, int strideB) {

Modified: branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.h	2011-08-17 17:17:14 UTC (rev 39498)
+++ branches/soc-2011-tomato/extern/libmv/libmv/tracking/sad.h	2011-08-17 17:44:38 UTC (rev 39499)
@@ -61,6 +61,8 @@
     \note \a stride allow you to reference your search region instead of copying.
 
     \return Sum of absolute difference between reference and matched pattern.
+            A lower value indicate a better match. Divide this sum by the pattern area (16x16)
+            to compute the per pixel deviation (0=perfect match, 255=worst match).
 */
 int Track(ubyte* pattern, ubyte* image, int stride, int width, int height, float* x, float* y);