diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-12 21:06:00 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-12 21:06:00 +0400 |
| commit | 5637b0d39b007766a0131ca293a9f6f81bb4455b (patch) | |
| tree | 831cf156e6534168bd1038f11a53b98f3fdc0c85 /extern/libmv/third_party | |
| parent | c3b1f0fa20325aa82faef2761fc76ee76dc35cb8 (diff) | |
Update bundled version of libmv
- Ensures fix for msvc2012 is applying correct.
- Some code cleanup to match libmv's code style.
- Do not include points which were intersect
behind the camera to a reconstruction.
- Includes changes needed for keyframe selection.
Diffstat (limited to 'extern/libmv/third_party')
| -rw-r--r-- | extern/libmv/third_party/glog/src/windows/port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/libmv/third_party/glog/src/windows/port.h b/extern/libmv/third_party/glog/src/windows/port.h index 09cfe3f1b28..e3e76ec29e0 100644 --- a/extern/libmv/third_party/glog/src/windows/port.h +++ b/extern/libmv/third_party/glog/src/windows/port.h @@ -96,7 +96,7 @@ enum { STDIN_FILENO = 0, STDOUT_FILENO = 1, STDERR_FILENO = 2 }; /* In windows-land, hash<> is called hash_compare<> (from xhash.h) */ /* VC11 provides std::hash */ #if defined(_MSC_VER) && (_MSC_VER < 1700) -#define hash hash_compare +#define hash hash_compare #endif /* Sleep is in ms, on windows */ |