forked from bartvdbraak/blender
libmv: bundle new upstream version from own branch which should support
compilation of glog on hurd platform.
This commit is contained in:
Sergey Sharybin
parent
bb0a3e1d90
commit
ce95b0be1e
3
extern/libmv/CMakeLists.txt
vendored
3
extern/libmv/CMakeLists.txt
vendored
@ -102,8 +102,8 @@ set(SRC
|
||||
libmv/base/vector_utils.h
|
||||
libmv/image/array_nd.h
|
||||
libmv/image/convolve.h
|
||||
libmv/image/image.h
|
||||
libmv/image/correlation.h
|
||||
libmv/image/image.h
|
||||
libmv/image/sample.h
|
||||
libmv/image/tuple.h
|
||||
libmv/logging/logging.h
|
||||
@ -217,6 +217,7 @@ else()
|
||||
third_party/glog/src/base/mutex.h
|
||||
third_party/glog/src/config_freebsd.h
|
||||
third_party/glog/src/config.h
|
||||
third_party/glog/src/config_hurd.h
|
||||
third_party/glog/src/config_linux.h
|
||||
third_party/glog/src/config_mac.h
|
||||
third_party/glog/src/demangle.h
|
||||
|
||||
40
extern/libmv/ChangeLog
vendored
40
extern/libmv/ChangeLog
vendored
@ -1,3 +1,29 @@
|
||||
commit 9618d9a1d48bb3c28da605d9027f57a74f462785
|
||||
Author: Sergey Sharybin <sergey.vfx@gmail.com>
|
||||
Date: Wed Apr 11 14:17:14 2012 +0600
|
||||
|
||||
Added configuration file for glog to compile smooth on Hurd platform.
|
||||
|
||||
Patch by Pino Toscano <pino@debian.org>, thanks!
|
||||
|
||||
commit 63b2bd20237c8599fa73ce42556e4fb99b9f7cca
|
||||
Author: Sergey Sharybin <sergey.vfx@gmail.com>
|
||||
Date: Thu Mar 22 17:03:34 2012 +0600
|
||||
|
||||
Trackers refactoring:
|
||||
- Deduplicate pattern sampling used in esm and lmicklt trackers
|
||||
and move SamplePattern to image/sample.h
|
||||
- Move computation of Pearson product-moment correlation into
|
||||
own function in new file image/correlation.h so all trackers
|
||||
can use it to check final correlation.
|
||||
- Remove SAD tracker. It's almost the same as brute tracker,
|
||||
with only two differences:
|
||||
1. It does brute search of affine transformation which in some cases
|
||||
helps to track rotating features
|
||||
2. It didn't use common tracker api which probably gave some speed
|
||||
advantage, but lead to a real headache to use it together with
|
||||
other trackers leading to duplicated code in 3d-party software.
|
||||
|
||||
commit 9fe49c32e990f28c83f2bbb1d18057aed8879af7
|
||||
Author: Sergey Sharybin <sergey.vfx@gmail.com>
|
||||
Date: Mon Mar 12 09:36:15 2012 +0600
|
||||
@ -475,17 +501,3 @@ Date: Fri Aug 19 14:19:27 2011 +0200
|
||||
Add LaplaceFilter.
|
||||
Add regularization in affine SAD Tracker (keep constant area and good condition number).
|
||||
UI: Better track display (+enable line antialiasing).
|
||||
|
||||
commit 6d26d9a8ccc4ce009fbf253898fea8864dd5001a
|
||||
Author: Matthias Fauconneau <matthias.fauconneau@gmail.com>
|
||||
Date: Fri Aug 19 10:25:26 2011 +0200
|
||||
|
||||
Add optimization for integer pixel search.
|
||||
Allows more agressive settings for affine coordinate descent.
|
||||
|
||||
commit 70ceae81c0ab561b07e640ecb9933f0a902b57cd
|
||||
Author: Matthias Fauconneau <matthias.fauconneau@gmail.com>
|
||||
Date: Fri Aug 19 00:02:12 2011 +0200
|
||||
|
||||
Document coordinate descent method in affine SAD matcher.
|
||||
Add heuristic to prevent high distortions.
|
||||
|
||||
4
extern/libmv/files.txt
vendored
4
extern/libmv/files.txt
vendored
@ -6,6 +6,7 @@ libmv/image/array_nd.cc
|
||||
libmv/image/array_nd.h
|
||||
libmv/image/convolve.cc
|
||||
libmv/image/convolve.h
|
||||
libmv/image/correlation.h
|
||||
libmv/image/image.h
|
||||
libmv/image/sample.h
|
||||
libmv/image/tuple.h
|
||||
@ -64,8 +65,6 @@ libmv/tracking/pyramid_region_tracker.h
|
||||
libmv/tracking/region_tracker.h
|
||||
libmv/tracking/retrack_region_tracker.cc
|
||||
libmv/tracking/retrack_region_tracker.h
|
||||
libmv/tracking/sad.cc
|
||||
libmv/tracking/sad.h
|
||||
libmv/tracking/trklt_region_tracker.cc
|
||||
libmv/tracking/trklt_region_tracker.h
|
||||
third_party/fast/fast_10.c
|
||||
@ -103,6 +102,7 @@ third_party/glog/src/base/googleinit.h
|
||||
third_party/glog/src/base/mutex.h
|
||||
third_party/glog/src/config_freebsd.h
|
||||
third_party/glog/src/config.h
|
||||
third_party/glog/src/config_hurd.h
|
||||
third_party/glog/src/config_linux.h
|
||||
third_party/glog/src/config_mac.h
|
||||
third_party/glog/src/demangle.cc
|
||||
|
||||
2
extern/libmv/third_party/glog/src/config.h
vendored
2
extern/libmv/third_party/glog/src/config.h
vendored
@ -12,4 +12,6 @@
|
||||
#include "config_linux.h"
|
||||
#elif defined(_MSC_VER)
|
||||
#include "windows/config.h"
|
||||
#elif defined(__GNU__)
|
||||
#include "config_hurd.h"
|
||||
#endif
|
||||
|
||||
166
extern/libmv/third_party/glog/src/config_hurd.h
vendored
Normal file
166
extern/libmv/third_party/glog/src/config_hurd.h
vendored
Normal file
@ -0,0 +1,166 @@
|
||||
/* src/config.h. Generated from config.h.in by configure. */
|
||||
/* src/config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Namespace for Google classes */
|
||||
#define GOOGLE_NAMESPACE google
|
||||
|
||||
/* Define if you have the `dladdr' function */
|
||||
/* #undef HAVE_DLADDR */
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
/* Define to 1 if you have the <execinfo.h> header file. */
|
||||
#define HAVE_EXECINFO_H 1
|
||||
|
||||
/* Define if you have the `fcntl' function */
|
||||
#define HAVE_FCNTL 1
|
||||
|
||||
/* Define to 1 if you have the <glob.h> header file. */
|
||||
#define HAVE_GLOB_H 1
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#define HAVE_INTTYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the `pthread' library (-lpthread). */
|
||||
#define HAVE_LIBPTHREAD 1
|
||||
|
||||
/* Define to 1 if you have the <libunwind.h> header file. */
|
||||
/* #undef HAVE_LIBUNWIND_H */
|
||||
|
||||
/* define if you have google gflags library */
|
||||
#define HAVE_LIB_GFLAGS 1
|
||||
|
||||
/* define if you have google gmock library */
|
||||
/* #undef HAVE_LIB_GMOCK */
|
||||
|
||||
/* define if you have google gtest library */
|
||||
/* #undef HAVE_LIB_GTEST */
|
||||
|
||||
/* define if you have libunwind */
|
||||
/* #undef HAVE_LIB_UNWIND */
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#define HAVE_MEMORY_H 1
|
||||
|
||||
/* define if the compiler implements namespaces */
|
||||
#define HAVE_NAMESPACES 1
|
||||
|
||||
/* Define if you have POSIX threads libraries and header files. */
|
||||
#define HAVE_PTHREAD 1
|
||||
|
||||
/* Define to 1 if you have the <pwd.h> header file. */
|
||||
#define HAVE_PWD_H 1
|
||||
|
||||
/* define if the compiler implements pthread_rwlock_* */
|
||||
#define HAVE_RWLOCK 1
|
||||
|
||||
/* Define if you have the `sigaltstack' function */
|
||||
#define HAVE_SIGALTSTACK 1
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#define HAVE_STDINT_H 1
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#define HAVE_STDLIB_H 1
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#define HAVE_STRINGS_H 1
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#define HAVE_STRING_H 1
|
||||
|
||||
/* Define to 1 if you have the <syscall.h> header file. */
|
||||
/* #undef HAVE_SYSCALL_H */
|
||||
|
||||
/* Define to 1 if you have the <syslog.h> header file. */
|
||||
#define HAVE_SYSLOG_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#define HAVE_SYS_STAT_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/syscall.h> header file. */
|
||||
/* #undef HAVE_SYS_SYSCALL_H */
|
||||
|
||||
/* Define to 1 if you have the <sys/time.h> header file. */
|
||||
#define HAVE_SYS_TIME_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/ucontext.h> header file. */
|
||||
#define HAVE_SYS_UCONTEXT_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/utsname.h> header file. */
|
||||
#define HAVE_SYS_UTSNAME_H 1
|
||||
|
||||
/* Define to 1 if you have the <ucontext.h> header file. */
|
||||
#define HAVE_UCONTEXT_H 1
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#define HAVE_UNISTD_H 1
|
||||
|
||||
/* define if the compiler supports using expression for operator */
|
||||
#define HAVE_USING_OPERATOR 1
|
||||
|
||||
/* define if your compiler has __attribute__ */
|
||||
#define HAVE___ATTRIBUTE__ 1
|
||||
|
||||
/* define if your compiler has __builtin_expect */
|
||||
#define HAVE___BUILTIN_EXPECT 1
|
||||
|
||||
/* define if your compiler has __sync_val_compare_and_swap */
|
||||
/* #undef HAVE___SYNC_VAL_COMPARE_AND_SWAP */
|
||||
|
||||
/* Name of package */
|
||||
#define PACKAGE "glog"
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#define PACKAGE_BUGREPORT "opensource@google.com"
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#define PACKAGE_NAME "glog"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "glog 0.3.1"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "glog"
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "0.3.1"
|
||||
|
||||
/* How to access the PC from a struct ucontext */
|
||||
#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
|
||||
#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
|
||||
#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)
|
||||
#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
|
||||
#else
|
||||
#undef PC_FROM_UCONTEXT
|
||||
#endif
|
||||
|
||||
/* Define to necessary symbol if this constant uses a non-standard name on
|
||||
your system. */
|
||||
/* #undef PTHREAD_CREATE_JOINABLE */
|
||||
|
||||
/* The size of `void *', as computed by sizeof. */
|
||||
#define SIZEOF_VOID_P 4
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
/* #undef STDC_HEADERS */
|
||||
|
||||
#define STDC_HEADERS 1
|
||||
/* the namespace where STL code like vector<> is defined */
|
||||
#define STL_NAMESPACE std
|
||||
|
||||
/* location of source code */
|
||||
#define TEST_SRC_DIR "."
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.3.1"
|
||||
|
||||
/* Stops putting the code inside the Google namespace */
|
||||
#define _END_GOOGLE_NAMESPACE_ }
|
||||
|
||||
/* Puts following code inside the Google namespace */
|
||||
#define _START_GOOGLE_NAMESPACE_ namespace google {
|
||||
Loading…
Reference in New Issue
Block a user