diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-28 20:46:16 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-28 20:46:16 +0400 |
| commit | 424f6463c1bb8a632d7c875123b16cf6d5a4660a (patch) | |
| tree | a995c3f71a6b97999b8661d5af760ff93217cd69 /extern/libmv | |
| parent | b107724eef1a800c6c989debeb0d6664769ea6b5 (diff) | |
Camera tracking integration
===========================
MSVC should work fine now.
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/libmv/simple_pipeline/camera_intrinsics.h | 2 | ||||
| -rw-r--r-- | extern/libmv/patches/scaled_distortion.patch | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h index 99141c61bfc..c89832fb568 100644 --- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h +++ b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h @@ -26,6 +26,8 @@ typedef Eigen::Matrix<double, 3, 3> Mat3; namespace libmv { +struct Grid; + class CameraIntrinsics { public: CameraIntrinsics(); diff --git a/extern/libmv/patches/scaled_distortion.patch b/extern/libmv/patches/scaled_distortion.patch index 5088c6725c9..e1bb84af40e 100644 --- a/extern/libmv/patches/scaled_distortion.patch +++ b/extern/libmv/patches/scaled_distortion.patch @@ -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_; |