[Bf-blender-cvs] [8e1fae3] master: Libmv: Update to latest upstream version
Sergey Sharybin
noreply at git.blender.org
Thu Dec 31 12:17:17 CET 2015
Commit: 8e1fae3e387f5533971c3ccc4d5048a34bbf5c81
Author: Sergey Sharybin
Date: Thu Dec 31 16:16:52 2015 +0500
Branches: master
https://developer.blender.org/rB8e1fae3e387f5533971c3ccc4d5048a34bbf5c81
Libmv: Update to latest upstream version
Brings some extra fixes for MSVC-2015
===================================================================
M extern/libmv/ChangeLog
M extern/libmv/third_party/gflags/windows_port.cc
M extern/libmv/third_party/gflags/windows_port.h
M extern/libmv/third_party/glog/src/windows/config.h
===================================================================
diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog
index 39ec478..17338ac 100644
--- a/extern/libmv/ChangeLog
+++ b/extern/libmv/ChangeLog
@@ -1,3 +1,33 @@
+commit e0ef5b09203e3906a555e6c2010f25cb667da9cd
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Thu Dec 31 16:15:59 2015 +0500
+
+ GLog: Solve some compilation warnings
+
+ Those are actually sent to a pull-request, see
+
+ https://github.com/google/glog/pull/81
+
+commit 2072b213d4d3a55d099a063ed1e7331cc773454e
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Thu Dec 31 16:13:53 2015 +0500
+
+ Add Martijn Berger to the AUTHORS file
+
+commit 4dd0770d98d67896e4f936356e281f63d927410e
+Author: Martijn Berger <martijn.berger at gmail.com>
+Date: Thu Dec 31 16:13:08 2015 +0500
+
+ Fix compilation error of Glog and Gflags with MSVC2015
+
+commit 2712f42be2ad79e7d3a6c9905f6d8d1e3b7133ac
+Author: Brecht Van Lommel <brechtvanlommel at gmail.com>
+Date: Thu Dec 31 14:00:58 2015 +0500
+
+ Fix OS X (with 10.11 SDK) glog build errors due to using deprecated code.
+
+ Some values are now restored to the ones from before the upgrade today.
+
commit d249280fdf7c937fd6ebbc465508843a70aafd4c
Author: Sergey Sharybin <sergey.vfx at gmail.com>
Date: Wed Dec 30 16:59:28 2015 +0500
@@ -637,49 +667,3 @@ Date: Mon Apr 14 00:01:32 2014 +0600
Reviewed By: keir
Differential Revision: https://developer.blender.org/D316
-
-commit 397c3d3ed46eb4967eb285c8369cc125bea4b132
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Fri Apr 4 16:17:57 2014 +0600
-
- Compilation error fix
-
- Not totally sure why this is needed, but multiview indeed
- uses V3D library still, so it needs to be linked against it.
-
- Patc by Martijn Berger, thanks!
-
-commit 1c36279239cbffe152493106eb04e55df7ebd649
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Fri Apr 4 14:03:43 2014 +0600
-
- Upgrade Eigen to 3.2.1 version
-
- To main reasons for this:
- - Probably this would solve strict compiler warnings
- - It brings new stuff like sparse LU decomposition which
- might be useful in the future.
-
-commit de698f442934f475478463445f78a00ea632e823
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Thu Apr 3 15:08:26 2014 +0600
-
- Fix compilation error when using make from the sources root
-
- - Don't force flann to be static. It's a general rule on linux
- to have dynamic libraries for all the bits instead of having
- statically-linked dynamic libraries.
-
- - Some weirdo stuff was happening around OpenExif, it was only
- built on Apple, so don't link targets against this lib on
- other platforms.
-
- - Some libraries were missing for qt-tracker.
-
-commit 901b146f28825d3e05f4157ca2a34ae00261b91a
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date: Wed Mar 26 17:44:09 2014 +0600
-
- Fix bad memory write in BA code when having zero-weighted tracks
-
- Issue was really stupid and caused by the wrong vector initialization.
diff --git a/extern/libmv/third_party/gflags/windows_port.cc b/extern/libmv/third_party/gflags/windows_port.cc
index 1f40458..b1a0f19 100644
--- a/extern/libmv/third_party/gflags/windows_port.cc
+++ b/extern/libmv/third_party/gflags/windows_port.cc
@@ -43,7 +43,7 @@
#include "windows_port.h"
// These call the windows _vsnprintf, but always NUL-terminate.
-#if !defined(__MINGW32__) && !defined(__MINGW64__) /* mingw already defines */
+#if !defined(__MINGW32__) && !defined(__MINGW64__) && !(defined(_MSC_VER) && _MSC_VER >= 1900) /* mingw already defines */
#ifdef _MSC_VER
# pragma warning(push)
@@ -68,4 +68,4 @@ int snprintf(char *str, size_t size, const char *format, ...) {
return r;
}
-#endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */
+#endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) && !(defined(_MSC_VER) && _MSC_VER >= 1900) */
diff --git a/extern/libmv/third_party/gflags/windows_port.h b/extern/libmv/third_party/gflags/windows_port.h
index c8ff24f..3ccd4f2 100644
--- a/extern/libmv/third_party/gflags/windows_port.h
+++ b/extern/libmv/third_party/gflags/windows_port.h
@@ -62,7 +62,7 @@
* because they don't always NUL-terminate. :-( We also can't use the
* name vsnprintf, since windows defines that (but not snprintf (!)).
*/
-#if !defined(__MINGW32__) && !defined(__MINGW64__) /* mingw already defines */
+#if !defined(__MINGW32__) && !defined(__MINGW64__) && !(_MSC_VER >= 1900) /* mingw already defines */
extern GFLAGS_DLL_DECL int snprintf(char *str, size_t size,
const char *format, ...);
extern int GFLAGS_DLL_DECL safe_vsnprintf(char *str, size_t size,
@@ -107,10 +107,12 @@ inline void setenv(const char* name, const char* value, int) {
#define unlink _unlink
#endif
+#if !(_MSC_VER >= 1900)
#define PRId32 "d"
#define PRIu32 "u"
#define PRId64 "I64d"
#define PRIu64 "I64u"
+#endif
#if !defined(__MINGW32__) && !defined(__MINGW64__)
#define strtoq _strtoi64
diff --git a/extern/libmv/third_party/glog/src/windows/config.h b/extern/libmv/third_party/glog/src/windows/config.h
index 279eca4..1cc2533 100644
--- a/extern/libmv/third_party/glog/src/windows/config.h
+++ b/extern/libmv/third_party/glog/src/windows/config.h
@@ -12,7 +12,7 @@
/* Puts following code inside the Google namespace */
#define _START_GOOGLE_NAMESPACE_ namespace google {
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
# define HAVE_SNPRINTF
#endif
More information about the Bf-blender-cvs
mailing list