[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44825] trunk/blender/extern/libmv: Re-bundle libmv from own branch.
Sergey Sharybin
sergey.vfx at gmail.com
Mon Mar 12 09:45:13 CET 2012
Revision: 44825
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44825
Author: nazgul
Date: 2012-03-12 08:45:06 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Re-bundle libmv from own branch.
Should resolve compilation error on some platforms when using linux and
compilation error of libmv on FreeBSB.
It was a regression caused by not applied changes on config_linux.h
and some changes made to utilities.cc were also occasionally missed.
Modified Paths:
--------------
trunk/blender/extern/libmv/ChangeLog
trunk/blender/extern/libmv/third_party/glog/src/config_linux.h
trunk/blender/extern/libmv/third_party/glog/src/utilities.cc
Modified: trunk/blender/extern/libmv/ChangeLog
===================================================================
--- trunk/blender/extern/libmv/ChangeLog 2012-03-12 07:21:22 UTC (rev 44824)
+++ trunk/blender/extern/libmv/ChangeLog 2012-03-12 08:45:06 UTC (rev 44825)
@@ -1,4 +1,13 @@
-commit bf0c3423ba41b90638e89a56500aeaeb120fbaf1
+commit 9fe49c32e990f28c83f2bbb1d18057aed8879af7
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Mon Mar 12 09:36:15 2012 +0600
+
+ Code cleanup: convert line endings to Unix style (native on my platform) so it
+ wouldn't confuse other versioning systems used for project where libmv is bundled to,
+
+ Also change mode to +x for glog's windows-related script.
+
+commit fe74ae2b53769389b0ed9d7e604c8e60be81077d
Author: Sergey I. Sharybin <g.ulairi at gmail.com>
Date: Sun Mar 11 20:34:15 2012 +0600
@@ -9,7 +18,7 @@
it's easier to move libraries around and even use libraries installed
on the operation system.
-commit 3e2673282f313c5bd19720f26d769f5d240a0563
+commit 37fc726701479f2d321d6af878fa93f3176278d5
Author: Sergey I. Sharybin <g.ulairi at gmail.com>
Date: Sun Mar 11 19:27:41 2012 +0600
@@ -480,9 +489,3 @@
Document coordinate descent method in affine SAD matcher.
Add heuristic to prevent high distortions.
-
-commit 75520f4bc4ccbb272a1b4149d3b8d05a90f7f896
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Thu Aug 18 23:14:17 2011 +0200
-
- Fix affine iteration.
Modified: trunk/blender/extern/libmv/third_party/glog/src/config_linux.h
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/config_linux.h 2012-03-12 07:21:22 UTC (rev 44824)
+++ trunk/blender/extern/libmv/third_party/glog/src/config_linux.h 2012-03-12 08:45:06 UTC (rev 44825)
@@ -110,7 +110,7 @@
#define HAVE___BUILTIN_EXPECT 1
/* define if your compiler has __sync_val_compare_and_swap */
-#define HAVE___SYNC_VAL_COMPARE_AND_SWAP 1
+/* #undef HAVE___SYNC_VAL_COMPARE_AND_SWAP */
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
@@ -138,7 +138,13 @@
#define PACKAGE_VERSION "0.3.2"
/* How to access the PC from a struct ucontext */
-#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+#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. */
@@ -150,6 +156,7 @@
/* 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
Modified: trunk/blender/extern/libmv/third_party/glog/src/utilities.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/utilities.cc 2012-03-12 07:21:22 UTC (rev 44824)
+++ trunk/blender/extern/libmv/third_party/glog/src/utilities.cc 2012-03-12 08:45:06 UTC (rev 44825)
@@ -233,8 +233,8 @@
}
pid_t GetTID() {
- // On Linux and FreeBSD, we try to use gettid().
-#if defined OS_LINUX || defined OS_FREEBSD || defined OS_MACOSX
+ // On Linux and MACOSX , we try to use gettid().
+#if defined OS_LINUX || defined OS_MACOSX
#ifndef __NR_gettid
#ifdef OS_MACOSX
#define __NR_gettid SYS_gettid
@@ -256,7 +256,7 @@
// the value change to "true".
lacks_gettid = true;
}
-#endif // OS_LINUX || OS_FREEBSD
+#endif // OS_LINUX || OS_MACOSX
// If gettid() could not be used, we use one of the following.
#if defined OS_LINUX
More information about the Bf-blender-cvs
mailing list