[Bf-blender-cvs] [6199462] master: Libmv: Yet again update to the latest version

Thu Dec 31 14:03:11 CET 2015

Commit: 619946253e5f2dbad8b4a564d3d489ce40eb9de2
Author: Sergey Sharybin
Date:   Thu Dec 31 17:56:57 2015 +0500
Branches: master
https://developer.blender.org/rB619946253e5f2dbad8b4a564d3d489ce40eb9de2

Libmv: Yet again update to the latest version

Again brings some fixes for MSVC-2015 and keeps it easier to backport
the fixes into upstream.

===================================================================

M	extern/libmv/CMakeLists.txt
M	extern/libmv/ChangeLog
M	extern/libmv/files.txt
M	extern/libmv/third_party/gflags/ChangeLog.txt
M	extern/libmv/third_party/gflags/config.h
M	extern/libmv/third_party/gflags/gflags.cc
M	extern/libmv/third_party/gflags/gflags/gflags.h
M	extern/libmv/third_party/gflags/gflags/gflags_completions.h
M	extern/libmv/third_party/gflags/gflags/gflags_declare.h
A	extern/libmv/third_party/gflags/gflags/gflags_gflags.h
M	extern/libmv/third_party/gflags/gflags_completions.cc
M	extern/libmv/third_party/gflags/mutex.h
M	extern/libmv/third_party/gflags/util.h
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/logging.cc

===================================================================

diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 0897435..fd559c8 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -277,6 +277,7 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
 		third_party/gflags/config.h
 		third_party/gflags/gflags/gflags_completions.h
 		third_party/gflags/gflags/gflags_declare.h
+		third_party/gflags/gflags/gflags_gflags.h
 		third_party/gflags/gflags/gflags.h
 		third_party/gflags/mutex.h
 		third_party/gflags/util.h
diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog
index 17338ac..e04defd 100644
--- a/extern/libmv/ChangeLog
+++ b/extern/libmv/ChangeLog
@@ -1,3 +1,17 @@
+commit df7642b270e8e43685e9ffb404b59d7b226a9f60
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Dec 31 17:56:12 2015 +0500
+
+    Alternative fix for missing prototype for a couple of functions
+
+commit 08f685797b7d776cdaa579136c82b15ddc6ffb30
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Dec 31 17:33:05 2015 +0500
+
+    Update GFlags to the latest upstream version
+    
+    Makes it easier to synchronize some compiler/warning fixes.
+
 commit e0ef5b09203e3906a555e6c2010f25cb667da9cd
 Author: Sergey Sharybin <sergey.vfx at gmail.com>
 Date:   Thu Dec 31 16:15:59 2015 +0500
@@ -608,62 +622,3 @@ Date:   Thu Apr 17 16:26:12 2014 +0600
     CC: jta
     
     Differential Revision: https://developer.blender.org/D335
-
-commit 313252083f6dfa69a93c287bed81dec616503c1b
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Tue Apr 15 18:23:38 2014 +0600
-
-    Fix failure of the image transform linear test
-    
-    Mainly was caused by the flakyness of image rotation in cases
-    when image has even size. The test was expecting the transform
-    code to rotate the image around pixel corner, which isn't a
-    common behavior in image processing applications. Rotation
-    is usually done around the pixel center.
-    
-    So now made it so RotateImage() rotates the image around the
-    pixel center which gives 100% proper result for odd sized images
-    (i.e. center pixel stays untouched).
-    
-    Also made the tests to use odd image sizes which are more
-    predictable by the humans. We can use even sized images in the
-    tests as well but their result wouldn't be so much spectacular.
-    
-    Another issue with the tests was caused by RescaleImageTranslation
-    test which did expect things which are not happening in the
-    function.
-    
-    Reviewers: keir
-    
-    Reviewed By: keir
-    
-    Differential Revision: https://developer.blender.org/D463
-
-commit 80d6945bf5f996b97cd41df0e422afce5e10e7f9
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Mon Apr 14 00:01:32 2014 +0600
-
-    Unit tests for feature detector
-    
-    Currently covers only simplest cases with synthetic images.
-    Also at this point mainly Harris detector is being testes,
-    other detectors behaves a bit unexpected on synthetic images
-    and this is to be investigated further.
-    
-    Tests will be extended further later.
-    
-    Additional change:
-    
-    - Added constructor to Feature structure
-    - Added operator << for feature for easier debug dumps.
-    
-    TODO: Some tests are not giving the result which i was expected
-    to. This is to be investigated further by finding the reference
-    detector implementation. For until then keeping that tests
-    commented out.
-    
-    Reviewers: keir
-    
-    Reviewed By: keir
-    
-    Differential Revision: https://developer.blender.org/D316
diff --git a/extern/libmv/files.txt b/extern/libmv/files.txt
index 11f8ef2..427ff86 100644
--- a/extern/libmv/files.txt
+++ b/extern/libmv/files.txt
@@ -141,6 +141,7 @@ third_party/gflags/gflags.cc
 third_party/gflags/gflags_completions.cc
 third_party/gflags/gflags/gflags_completions.h
 third_party/gflags/gflags/gflags_declare.h
+third_party/gflags/gflags/gflags_gflags.h
 third_party/gflags/gflags/gflags.h
 third_party/gflags/gflags_reporting.cc
 third_party/gflags/mutex.h
diff --git a/extern/libmv/third_party/gflags/ChangeLog.txt b/extern/libmv/third_party/gflags/ChangeLog.txt
index e14d88e..eea9f83 100644
--- a/extern/libmv/third_party/gflags/ChangeLog.txt
+++ b/extern/libmv/third_party/gflags/ChangeLog.txt
@@ -1,3 +1,13 @@
+* Tue Mar 24 2014 - Andreas Schuh <andreas.schuh.84 at gmail.com>
+
+- gflags: version 2.1.2
+- Moved project to GitHub
+- Added GFLAGS_NAMESPACE definition to gflags_declare.h
+- Fixed issue 94: Keep "google" as primary namespace and import symbols into "gflags" namespace
+- Fixed issue 96: Fix binary ABI compatibility with gflags 2.0 using "google" as primary namespace
+- Fixed issue 97/101: Removed (patched) CMake modules and enabled C language instead
+- Fixed issue 103: Set CMake policy CMP0042 to silence warning regarding MACOS_RPATH setting
+
 * Sun Mar 20 2014 - Andreas Schuh <google-gflags at googlegroups.com>
 
 - gflags: version 2.1.1
diff --git a/extern/libmv/third_party/gflags/config.h b/extern/libmv/third_party/gflags/config.h
index 8585108..8d20e22 100644
--- a/extern/libmv/third_party/gflags/config.h
+++ b/extern/libmv/third_party/gflags/config.h
@@ -29,7 +29,7 @@
 /* #undef HAVE_FNMATCH_H */
 
 // Define if you have the <shlwapi.h> header file (Windows 2000/XP).
-#undef HAVE_SHLWAPI_H
+/* #undef HAVE_SHLWAPI_H */
 
 // Define if you have the strtoll function.
 #define HAVE_STRTOLL
@@ -58,22 +58,19 @@
 #define PACKAGE_NAME gflags
 
 // Define to the full name and version of this package.
-#define PACKAGE_STRING gflags 2.1.1
+#define PACKAGE_STRING gflags 2.2.0
 
 // Define to the one symbol short name of this package.
-#define PACKAGE_TARNAME gflags-2.1.1
+#define PACKAGE_TARNAME gflags-2.2.0
 
 // Define to the version of this package.
-#define PACKAGE_VERSION 2.1.1
+#define PACKAGE_VERSION 2.2.0
 
 // Version number of package.
 #define VERSION PACKAGE_VERSION
 
 // Define to the address where bug reports for this package should be sent.
-#define PACKAGE_BUGREPORT https://code.google.com/p/gflags/issues/
-
-// Namespace of gflags library symbols.
-#define GFLAGS_NAMESPACE gflags
+#define PACKAGE_BUGREPORT https://github.com/schuhschuh/gflags/issues
 
 // ---------------------------------------------------------------------------
 // Path separator
diff --git a/extern/libmv/third_party/gflags/gflags.cc b/extern/libmv/third_party/gflags/gflags.cc
index 285050f..a35bbfe 100644
--- a/extern/libmv/third_party/gflags/gflags.cc
+++ b/extern/libmv/third_party/gflags/gflags.cc
@@ -111,6 +111,9 @@
 #include "mutex.h"
 #include "util.h"
 
+using namespace MUTEX_NAMESPACE;
+
+
 // Special flags, type 1: the 'recursive' flags.  They set another flag's val.
 DEFINE_string(flagfile,   "", "load flags from file");
 DEFINE_string(fromenv,    "", "set flags from the environment"
diff --git a/extern/libmv/third_party/gflags/gflags/gflags.h b/extern/libmv/third_party/gflags/gflags/gflags.h
index 797a54c..5e04772 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags.h
+++ b/extern/libmv/third_party/gflags/gflags/gflags.h
@@ -94,7 +94,7 @@
 #endif
 
 
-namespace gflags {
+namespace GFLAGS_NAMESPACE {
 
 
 // --------------------------------------------------------------------
@@ -136,7 +136,7 @@ extern GFLAGS_DLL_DECL bool RegisterFlagValidator(const std::string* flag, bool
 // Convenience macro for the registration of a flag validator
 #define DEFINE_validator(name, validator) \
     static const bool name##_validator_registered = \
-            gflags::RegisterFlagValidator(&FLAGS_##name, validator)
+            GFLAGS_NAMESPACE::RegisterFlagValidator(&FLAGS_##name, validator)
 
 
 // --------------------------------------------------------------------
@@ -442,7 +442,7 @@ class GFLAGS_DLL_DECL FlagRegisterer {
 extern GFLAGS_DLL_DECL const char kStrippedFlagHelp[];
 
 
-} // namespace gflags
+} // namespace GFLAGS_NAMESPACE
 
 
 #ifndef SWIG  // In swig, ignore the main flag declarations
@@ -450,7 +450,7 @@ extern GFLAGS_DLL_DECL const char kStrippedFlagHelp[];
 #if defined(STRIP_FLAG_HELP) && STRIP_FLAG_HELP > 0
 // Need this construct to avoid the 'defined but not used' warning.
 #define MAYBE_STRIPPED_HELP(txt) \
-   (false ? (txt) : gflags::kStrippedFlagHelp)
+   (false ? (txt) : GFLAGS_NAMESPACE::kStrippedFlagHelp)
 #else
 #define MAYBE_STRIPPED_HELP(txt) txt
 #endif
@@ -472,7 +472,7 @@ extern GFLAGS_DLL_DECL const char kStrippedFlagHelp[];
     /* We always want to export defined variables, dll or no */         \
     GFLAGS_DLL_DEFINE_FLAG type FLAGS_##name = FLAGS_nono##name;        \
     type FLAGS_no##name = FLAGS_nono##name;                             \
-    static gflags::FlagRegisterer o_##name( \
+    static GFLAGS_NAMESPACE::FlagRegisterer o_##name(                   \
       #name, #type, MAYBE_STRIPPED_HELP(help), __FILE__,                \
       &FLAGS_##name, &FLAGS_no##name);                                  \
   }                                                                     \
@@ -500,20 +500,20 @@ GFLAGS_DLL_DECL bool IsBoolFlag(bool from);
 #define DEFINE_bool(name, val, txt)                                     \
   namespace fLB {                                                       \
     typedef ::fLB::CompileAssert FLAG_##name##_value_is_not_a_bool[     \
-            (sizeof(::fLB::IsBoolFlag(val)) != sizeof(double)) ? 1 : -1]; \
+            (sizeof(::fLB::IsBoolFlag(val)) != sizeof(double))? 1: -1]; \
   }                                                                     \
   DEFINE_VARIABLE(bool, B, name, val, txt)
 
 #define DEFINE_int32(name, val, txt) \
-   DEFINE_VARIABLE(gflags::int32, I, \
+   DEFINE_VARIABLE(GFLAGS_NAMESPACE::int32, I, \
                    name, val, txt)
 
 #define DEFINE_int64(name, val, txt) \
-   DEFINE_VARIABLE(gflags::int64, I64, \
+   DEFINE_VARIABLE(GFLAGS_NAMESPACE::int64, I64, \
                    name, val, txt)
 
 #define DEFINE_uint64(name,val, txt) \
-   DEFINE_VARIABLE(gflags::uint64, U64, \
+   DEFINE_VARIABLE(GFLAGS_NAMESPACE::uint64, U64, \
                    name, val, txt)
 
 #define DEFINE_double(name, val, txt) \
@@ -554,7 +554,7 @@ inline clstring* dont_pass0toDEFINE_string(char *stringspot,
     clstring*

@@ Diff output truncated at 10240 characters. @@


