Camera tracking integration
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Sep 2011 20:16:43 +0000 (20:16 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Sep 2011 20:16:43 +0000 (20:16 +0000)
===========================

Fix for msvc2010 compilaiton. Patch by Nico Blends, thanks!

extern/libmv/libmv/simple_pipeline/tracks.cc
extern/libmv/patches/msvc2010.patch [new file with mode: 0644]
extern/libmv/patches/series

index 0e2a1b63043da676888f5e2b68fd9f73c1f358cc..3fb8ddbe51321f4b01b1189942b69cbf988b85c7 100644 (file)
@@ -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 (file)
index 0000000..c090b07
--- /dev/null
@@ -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"
index f8048e27718ab323923596c16127f7c55d7e1809..9e4f8c15bd54947c093fb0e7a90fbbf0911f5f50 100644 (file)
@@ -7,3 +7,4 @@ levenberg_marquardt.patch
 function_derivative.patch
 high_distortion_crash_fix.patch
 mingw.patch
+msvc2010.patch