Camera tracking integration
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Sep 2011 16:46:16 +0000 (16:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Sep 2011 16:46:16 +0000 (16:46 +0000)
===========================

MSVC should work fine now.

extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
extern/libmv/patches/scaled_distortion.patch

index 99141c61bfc3e07ad4bf1e456f3a3cb86a3f5d3c..c89832fb56868d77dbbfc15b530b9d444259253a 100644 (file)
@@ -26,6 +26,8 @@ typedef Eigen::Matrix<double, 3, 3> Mat3;
 
 namespace libmv {
 
+struct Grid;
+
 class CameraIntrinsics {
  public:
   CameraIntrinsics();
index 5088c6725c98bc50af29bf70ba7766d3d91136e6..e1bb84af40e20b68e9b4c0dfee0bdb2203bf598e 100644 (file)
@@ -179,19 +179,19 @@ index f9888ff..e1e6117 100644
    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 @@ index 29bc8a1..99141c6 100644
    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_;