diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-27 00:16:43 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-27 00:16:43 +0400 |
| commit | 13e63a82d265c22190e638f9f4bb9f42398e1593 (patch) | |
| tree | 8f780f7443ded232784b87870df46716f7862389 /extern/libmv | |
| parent | 7505de5c597946409699f0c48a3b9b1d178d7071 (diff) | |
Camera tracking integration
===========================
Fix for msvc2010 compilaiton. Patch by Nico Blends, thanks!
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/libmv/simple_pipeline/tracks.cc | 1 | ||||
| -rw-r--r-- | extern/libmv/patches/msvc2010.patch | 12 | ||||
| -rw-r--r-- | extern/libmv/patches/series | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/extern/libmv/libmv/simple_pipeline/tracks.cc b/extern/libmv/libmv/simple_pipeline/tracks.cc index 0e2a1b63043..3fb8ddbe513 100644 --- a/extern/libmv/libmv/simple_pipeline/tracks.cc +++ b/extern/libmv/libmv/simple_pipeline/tracks.cc @@ -20,6 +20,7 @@ #include <algorithm> #include <vector> +#include <iterator> #include "libmv/numeric/numeric.h" #include "libmv/simple_pipeline/tracks.h" diff --git a/extern/libmv/patches/msvc2010.patch b/extern/libmv/patches/msvc2010.patch new file mode 100644 index 00000000000..c090b070628 --- /dev/null +++ b/extern/libmv/patches/msvc2010.patch @@ -0,0 +1,12 @@ +diff --git a/src/libmv/simple_pipeline/tracks.cc b/src/libmv/simple_pipeline/tracks.cc +index 0e2a1b6..3fb8ddb 100644 +--- a/src/libmv/simple_pipeline/tracks.cc ++++ b/src/libmv/simple_pipeline/tracks.cc +@@ -20,6 +20,7 @@ + + #include <algorithm> + #include <vector> ++#include <iterator> + + #include "libmv/numeric/numeric.h" + #include "libmv/simple_pipeline/tracks.h" diff --git a/extern/libmv/patches/series b/extern/libmv/patches/series index f8048e27718..9e4f8c15bd5 100644 --- a/extern/libmv/patches/series +++ b/extern/libmv/patches/series @@ -7,3 +7,4 @@ levenberg_marquardt.patch function_derivative.patch high_distortion_crash_fix.patch mingw.patch +msvc2010.patch |