diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-05 13:23:20 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-05 13:23:20 +0400 |
commit | 898ba93a12117de413a9a5cd7b3fdf8c0d39ee7b (patch) | |
tree | 6b8be003ebe75e19aa5887a6461387f24fd93fdc /extern/libmv/third_party | |
parent | 43b61fb8bd6743072f53d7006d8bebe9ff06caf3 (diff) |
Update libmv to current upstream version
- Solves some strict compilation warning
- Style/code cleanup
Diffstat (limited to 'extern/libmv/third_party')
-rw-r--r-- | extern/libmv/third_party/fast/fast_10.c | 3 | ||||
-rw-r--r-- | extern/libmv/third_party/fast/fast_11.c | 3 | ||||
-rw-r--r-- | extern/libmv/third_party/fast/fast_12.c | 3 | ||||
-rw-r--r-- | extern/libmv/third_party/fast/fast_9.c | 3 | ||||
-rw-r--r-- | extern/libmv/third_party/gflags/gflags_completions.cc | 1 | ||||
-rw-r--r-- | extern/libmv/third_party/glog/src/logging.cc | 4 | ||||
-rw-r--r-- | extern/libmv/third_party/glog/src/utilities.cc | 2 | ||||
-rw-r--r-- | extern/libmv/third_party/glog/src/vlog_is_on.cc | 6 |
8 files changed, 16 insertions, 9 deletions
diff --git a/extern/libmv/third_party/fast/fast_10.c b/extern/libmv/third_party/fast/fast_10.c index 3af63869478..7929a653a12 100644 --- a/extern/libmv/third_party/fast/fast_10.c +++ b/extern/libmv/third_party/fast/fast_10.c @@ -1,8 +1,7 @@ /*This is mechanically generated code*/ #include <stdlib.h> -typedef struct { int x, y; } xy; -typedef unsigned char byte; +#include "fast.h" int fast10_corner_score(const byte* p, const int pixel[], int bstart) { diff --git a/extern/libmv/third_party/fast/fast_11.c b/extern/libmv/third_party/fast/fast_11.c index b4af4309521..589ddb169f1 100644 --- a/extern/libmv/third_party/fast/fast_11.c +++ b/extern/libmv/third_party/fast/fast_11.c @@ -1,8 +1,7 @@ /*This is mechanically generated code*/ #include <stdlib.h> -typedef struct { int x, y; } xy; -typedef unsigned char byte; +#include "fast.h" int fast11_corner_score(const byte* p, const int pixel[], int bstart) { diff --git a/extern/libmv/third_party/fast/fast_12.c b/extern/libmv/third_party/fast/fast_12.c index f73f68dd043..27426f8c0d8 100644 --- a/extern/libmv/third_party/fast/fast_12.c +++ b/extern/libmv/third_party/fast/fast_12.c @@ -1,8 +1,7 @@ /*This is mechanically generated code*/ #include <stdlib.h> -typedef struct { int x, y; } xy; -typedef unsigned char byte; +#include "fast.h" int fast12_corner_score(const byte* p, const int pixel[], int bstart) { diff --git a/extern/libmv/third_party/fast/fast_9.c b/extern/libmv/third_party/fast/fast_9.c index 6d33daeffbb..c22c1c0e6a0 100644 --- a/extern/libmv/third_party/fast/fast_9.c +++ b/extern/libmv/third_party/fast/fast_9.c @@ -1,8 +1,7 @@ /*This is mechanically generated code*/ #include <stdlib.h> -typedef struct { int x, y; } xy; -typedef unsigned char byte; +#include "fast.h" int fast9_corner_score(const byte* p, const int pixel[], int bstart) { diff --git a/extern/libmv/third_party/gflags/gflags_completions.cc b/extern/libmv/third_party/gflags/gflags_completions.cc index 75e9236ef63..f46a2e0814e 100644 --- a/extern/libmv/third_party/gflags/gflags_completions.cc +++ b/extern/libmv/third_party/gflags/gflags_completions.cc @@ -57,6 +57,7 @@ #include <utility> #include <vector> +#include "gflags/gflags_completions.h" #include "gflags/gflags.h" #include "util.h" diff --git a/extern/libmv/third_party/glog/src/logging.cc b/extern/libmv/third_party/glog/src/logging.cc index bf4d85be5b3..f36e14d2ce4 100644 --- a/extern/libmv/third_party/glog/src/logging.cc +++ b/extern/libmv/third_party/glog/src/logging.cc @@ -1464,6 +1464,10 @@ void LogToStderr() { namespace base { namespace internal { +/* Put prototypes here to suppress strict compiler warnings */ +bool GetExitOnDFatal(); +void SetExitOnDFatal(bool value); + bool GetExitOnDFatal() { MutexLock l(&log_mutex); return exit_on_dfatal; diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/libmv/third_party/glog/src/utilities.cc index c9db2b7f7cd..159b094c170 100644 --- a/extern/libmv/third_party/glog/src/utilities.cc +++ b/extern/libmv/third_party/glog/src/utilities.cc @@ -84,7 +84,7 @@ static void DebugWriteToStderr(const char* data, void *) { } } -void DebugWriteToString(const char* data, void *arg) { +static void DebugWriteToString(const char* data, void *arg) { reinterpret_cast<string*>(arg)->append(data); } diff --git a/extern/libmv/third_party/glog/src/vlog_is_on.cc b/extern/libmv/third_party/glog/src/vlog_is_on.cc index 5eefc96324a..4396aa8d066 100644 --- a/extern/libmv/third_party/glog/src/vlog_is_on.cc +++ b/extern/libmv/third_party/glog/src/vlog_is_on.cc @@ -62,6 +62,12 @@ _START_GOOGLE_NAMESPACE_ namespace glog_internal_namespace_ { +// Put protytype here to suppress strict compiler flags +GOOGLE_GLOG_DLL_DECL bool SafeFNMatch_(const char* pattern, + size_t patt_len, + const char* str, + size_t str_len); + // Implementation of fnmatch that does not need 0-termination // of arguments and does not allocate any memory, // but we only support "*" and "?" wildcards, not the "[...]" patterns. |