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

[Sergey Sharybin]

Revision: 40664
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40664
Author:   nazgul
Date:     2011-09-28 16:46:16 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

MSVC should work fine now.

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2011-tomato/extern/libmv/patches/scaled_distortion.patch

Modified: branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h	2011-09-28 16:25:50 UTC (rev 40663)
+++ branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h	2011-09-28 16:46:16 UTC (rev 40664)
@@ -26,6 +26,8 @@
 
 namespace libmv {
 
+struct Grid;
+
 class CameraIntrinsics {
  public:
   CameraIntrinsics();

Modified: branches/soc-2011-tomato/extern/libmv/patches/scaled_distortion.patch
===================================================================
--- branches/soc-2011-tomato/extern/libmv/patches/scaled_distortion.patch	2011-09-28 16:25:50 UTC (rev 40663)
+++ branches/soc-2011-tomato/extern/libmv/patches/scaled_distortion.patch	2011-09-28 16:46:16 UTC (rev 40664)
@@ -179,19 +179,19 @@
    else if(channels==2) Warp<unsigned char,2>(undistort_,src,dst,width,height);
    else if(channels==3) Warp<unsigned char,3>(undistort_,src,dst,width,height);
 diff --git a/src/libmv/simple_pipeline/camera_intrinsics.h b/src/libmv/simple_pipeline/camera_intrinsics.h
-index 29bc8a1..99141c6 100644
+index 29bc8a1..c89832f 100644
 --- a/src/libmv/simple_pipeline/camera_intrinsics.h
 +++ b/src/libmv/simple_pipeline/camera_intrinsics.h
-@@ -26,8 +26,6 @@ typedef Eigen::Matrix<double, 3, 3> Mat3;
+@@ -26,7 +26,7 @@ typedef Eigen::Matrix<double, 3, 3> Mat3;
  
  namespace libmv {
  
 -struct Offset;
--
++struct Grid;
+ 
  class CameraIntrinsics {
   public:
-   CameraIntrinsics();
-@@ -123,7 +121,9 @@ class CameraIntrinsics {
+@@ -123,7 +123,9 @@ class CameraIntrinsics {
                   int width, int height, int channels);
  
   private:
@@ -202,7 +202,7 @@
    void FreeLookupGrid();
  
    // The traditional intrinsics matrix from x = K[R|t]X.
-@@ -140,8 +140,8 @@ class CameraIntrinsics {
+@@ -140,8 +142,8 @@ class CameraIntrinsics {
    // independent of image size.
    double k1_, k2_, k3_, p1_, p2_;