[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54860] trunk/blender/extern/libmv: Bye-bye, SSBA!
Sergey Sharybin
sergey.vfx at gmail.com
Mon Feb 25 21:15:44 CET 2013
Revision: 54860
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54860
Author: nazgul
Date: 2013-02-25 20:15:42 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Bye-bye, SSBA!
With new bundle adjustment based on Ceres we don't need
SSBA library anymore. This also means we don't need ldl
library and libmv is no longer depends on colamd as well.
Modified Paths:
--------------
trunk/blender/extern/libmv/CMakeLists.txt
trunk/blender/extern/libmv/SConscript
trunk/blender/extern/libmv/bundle.sh
trunk/blender/extern/libmv/libmv-capi.cpp
Removed Paths:
-------------
trunk/blender/extern/libmv/third_party/ldl/CMakeLists.txt
trunk/blender/extern/libmv/third_party/ldl/Doc/ChangeLog
trunk/blender/extern/libmv/third_party/ldl/Doc/lesser.txt
trunk/blender/extern/libmv/third_party/ldl/Include/ldl.h
trunk/blender/extern/libmv/third_party/ldl/README.libmv
trunk/blender/extern/libmv/third_party/ldl/README.txt
trunk/blender/extern/libmv/third_party/ldl/Source/ldl.c
trunk/blender/extern/libmv/third_party/ssba/COPYING.TXT
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_linear.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_optimization.h
trunk/blender/extern/libmv/third_party/ssba/README.TXT
trunk/blender/extern/libmv/third_party/ssba/README.libmv
Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/CMakeLists.txt 2013-02-25 20:15:42 UTC (rev 54860)
@@ -28,14 +28,11 @@
set(INC
.
- ../colamd/Include
third_party/ceres/include
)
set(INC_SYS
../Eigen3
- third_party/ssba
- third_party/ldl/Include
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
@@ -83,9 +80,6 @@
third_party/gflags/gflags.cc
third_party/gflags/gflags_completions.cc
third_party/gflags/gflags_reporting.cc
- third_party/ldl/Source/ldl.c
- third_party/ssba/Geometry/v3d_metricbundle.cpp
- third_party/ssba/Math/v3d_optimization.cpp
libmv-capi.h
libmv/base/id_generator.h
@@ -143,16 +137,8 @@
third_party/gflags/gflags/gflags.h
third_party/gflags/mutex.h
third_party/gflags/util.h
- third_party/ldl/Include/ldl.h
third_party/msinttypes/inttypes.h
third_party/msinttypes/stdint.h
- third_party/ssba/Geometry/v3d_cameramatrix.h
- third_party/ssba/Geometry/v3d_distortion.h
- third_party/ssba/Geometry/v3d_metricbundle.h
- third_party/ssba/Math/v3d_linear.h
- third_party/ssba/Math/v3d_linear_utils.h
- third_party/ssba/Math/v3d_mathutilities.h
- third_party/ssba/Math/v3d_optimization.h
)
if(WIN32)
Modified: trunk/blender/extern/libmv/SConscript
===================================================================
--- trunk/blender/extern/libmv/SConscript 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/SConscript 2013-02-25 20:15:42 UTC (rev 54860)
@@ -22,9 +22,6 @@
src += env.Glob('libmv/tracking/*.cc')
src += env.Glob('third_party/fast/*.c')
src += env.Glob('third_party/gflags/*.cc')
-src += env.Glob('third_party/ldl/Source/*.c')
-src += env.Glob('third_party/ssba/Geometry/*.cpp')
-src += env.Glob('third_party/ssba/Math/*.cpp')
incs = '. ../Eigen3 third_party/ceres/include'
incs += ' ' + env['BF_PNG_INC']
@@ -41,8 +38,6 @@
src += env.Glob("third_party/glog/src/*.cc")
incs += ' ./third_party/glog/src'
-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-
env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )
SConscript(['third_party/SConscript'])
Modified: trunk/blender/extern/libmv/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/bundle.sh 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/bundle.sh 2013-02-25 20:15:42 UTC (rev 54860)
@@ -130,8 +130,6 @@
set(INC_SYS
../Eigen3
- third_party/ssba
- third_party/ldl/Include
\${PNG_INCLUDE_DIR}
\${ZLIB_INCLUDE_DIRS}
)
@@ -241,8 +239,6 @@
src += env.Glob("third_party/glog/src/*.cc")
incs += ' ./third_party/glog/src'
-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-
env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )
SConscript(['third_party/SConscript'])
Modified: trunk/blender/extern/libmv/libmv-capi.cpp
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.cpp 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/libmv-capi.cpp 2013-02-25 20:15:42 UTC (rev 54860)
@@ -38,8 +38,6 @@
#include "glog/logging.h"
#include "libmv/logging/logging.h"
-#include "Math/v3d_optimization.h"
-
#include "libmv/numeric/numeric.h"
#include "libmv/tracking/esm_region_tracker.h"
@@ -96,7 +94,6 @@
google::SetCommandLineOption("v", "0");
google::SetCommandLineOption("stderrthreshold", "7");
google::SetCommandLineOption("minloglevel", "7");
- V3D::optimizerVerbosenessLevel = 0;
}
void libmv_startDebugLogging(void)
@@ -105,7 +102,6 @@
google::SetCommandLineOption("v", "2");
google::SetCommandLineOption("stderrthreshold", "1");
google::SetCommandLineOption("minloglevel", "0");
- V3D::optimizerVerbosenessLevel = 1;
}
void libmv_setLoggingVerbosity(int verbosity)
@@ -114,7 +110,6 @@
snprintf(val, sizeof(val), "%d", verbosity);
google::SetCommandLineOption("v", val);
- V3D::optimizerVerbosenessLevel = verbosity;
}
/* ************ Utility ************ */
Deleted: trunk/blender/extern/libmv/third_party/ldl/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/third_party/ldl/CMakeLists.txt 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/third_party/ldl/CMakeLists.txt 2013-02-25 20:15:42 UTC (rev 54860)
@@ -1,5 +0,0 @@
-include_directories(../ufconfig)
-include_directories(Include)
-add_library(ldl Source/ldl.c)
-
-LIBMV_INSTALL_THIRD_PARTY_LIB(ldl)
Deleted: trunk/blender/extern/libmv/third_party/ldl/Doc/ChangeLog
===================================================================
--- trunk/blender/extern/libmv/third_party/ldl/Doc/ChangeLog 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/third_party/ldl/Doc/ChangeLog 2013-02-25 20:15:42 UTC (rev 54860)
@@ -1,39 +0,0 @@
-May 31, 2007: version 2.0.0
-
- * C-callable 64-bit version added
-
- * ported to 64-bit MATLAB
-
- * subdirectories added (Source/, Include/, Lib/, Demo/, Doc/, MATLAB/)
-
-Dec 12, 2006: version 1.3.4
-
- * minor MATLAB cleanup
-
-Sept 11, 2006: version 1.3.1
-
- * The ldl m-file renamed to ldlsparse, to avoid name conflict with the
- new MATLAB ldl function (in MATLAB 7.3).
-
-Apr 30, 2006: version 1.3
-
- * requires AMD v2.0. ldlmain.c demo program modified, since AMD can now
- handle jumbled matrices. Minor change to Makefile.
-
-Aug 30, 2005:
-
- * Makefile changed to use ../UFconfig/UFconfig.mk. License changed to
- GNU LGPL.
-
-July 4, 2005:
-
- * user guide added. Since no changes to the code were made,
- the version number (1.1) and code release date (Apr 22, 2005)
- were left unchanged.
-
-Apr. 22, 2005: LDL v1.1 released.
-
- * No real changes were made. The code was revised so
- that each routine fits on a single page in the documentation.
-
-Dec 31, 2003: LDL v1.0 released.
Deleted: trunk/blender/extern/libmv/third_party/ldl/Doc/lesser.txt
===================================================================
--- trunk/blender/extern/libmv/third_party/ldl/Doc/lesser.txt 2013-02-25 20:00:48 UTC (rev 54859)
+++ trunk/blender/extern/libmv/third_party/ldl/Doc/lesser.txt 2013-02-25 20:15:42 UTC (rev 54860)
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list