Skip to content

Commit 3421341

Browse files
committed
initial commit
1 parent 0d60ac1 commit 3421341

File tree

962 files changed

+281319
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

962 files changed

+281319
-3
lines changed

CHANGELOG

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2010-04-03 Noah Snavely <[email protected]>
2+
* Upgrade to v0.4
3+
* Removed reference implementations of LAPACK and BLAS due to
4+
bugs in 64-bit version
5+
* Updated Bundle2PMVS to work with new version of PMVS
6+
* Updated RadialUndistort (note that you now must specify an
7+
* output directory)
8+
* Added Bundle2Vis tool
9+
10+
2009-05-04 Noah Snavely <[email protected]>
11+
12+
* Upgrade to v0.3
13+
* Added Visual Studio project files
14+
* Added reference implementations of required libs: LAPACK, BLAS,
15+
MINPACK, CBLAS, f2c, etc.
16+
* Several bug fixes
17+
* Added Bundle2PMVS utility program
18+
* Cleaner Makefiles and scripts (thanks to Bart van Andel)
19+
20+
21+
2008-10-08 Noah Snavely <[email protected]>
22+
23+
* Upgrade to v0.2
24+
* Mainly code refactoring

INSTALL.txt

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
--------------------------------------------------------------------------
2+
Bundler v0.4 Installation Guide
3+
copyright 2009 Noah Snavely ([email protected])
4+
5+
based on the Photo Tourism work of Noah Snavely, Steven M. Seitz,
6+
(University of Washington) and Richard Szeliski (Microsoft Research)
7+
8+
For more technical information, visit http://phototour.cs.washington.edu
9+
10+
The source provided in this distribution can be accessed at
11+
http://phototour.cs.washington.edu/bundler/
12+
--------------------------------------------------------------------------
13+
14+
This distribution contains source code for Bundler as well as several
15+
libraries and utility programs. Note that you'll need several other
16+
libraries installed on your system in order to successfully compile
17+
and link Bundler. Note that the binary distribution is *highly
18+
recommended*, as compiling from source is currently much less
19+
user-friendly than using the pre-compiled binaries. Compilation has
20+
been tested on Linux, but has also worked under Windows using Cygwin
21+
and Visual Studio 2005.
22+
23+
Bundler relies on several libraries. Reference implementations from
24+
netlib are included with this distribution (and available from
25+
www.netlib.org, but you may want to install and link to optimized
26+
versions (e.g., GotoBLAS, or the Intel MKL)). In Ubuntu, LAPACK,
27+
BLAS, and MINPACK and their dependencies can all be installed as
28+
standard packages. The required libraries are:
29+
30+
- LAPACK (the Linear Algebra PACKage)
31+
- BLAS (Basic Linear Algebra Subprograms)
32+
- CBLAS (C interface to BLAS)
33+
34+
(Note that LAPACK, BLAS, and CBLAS implementations are also
35+
provided as part of Intel's Math Kernel Library -- these
36+
implementations can be significantly faster than the ones linked
37+
to here.)
38+
39+
- MINPACK (non-linear minimization library)
40+
- f2c (fortran to C library)
41+
42+
If you install alternate versions of these libraries, you may need to
43+
edit the Bundler Makefile (src/Makefile) to make sure that these
44+
libraries are all visible at link-time (or just copy the compiled
45+
libraries to the $(BASE_PATH)/lib directory). In addition to these
46+
libraries, the standard libjpeg and libz libraries must be installed
47+
on your system.
48+
49+
This distribution also contains a modified version of the Approximate
50+
Nearest Neighbors (ANN) v1.1 library of David M. Mount and Sunil Arya
51+
(http://www.cs.umd.edu/~mount/ANN/), and the Sparse Bundle Adjustment
52+
(SBA) v.1.2.1 package of Manolis Lourakis and Antonis Argyros
53+
(http://www.ics.forth.gr/~lourakis/sba/).
54+
55+
On a Linux (or cygwin) system, typing "make" in the base directory
56+
will compile Bundler and its dependencies (assuming all goes well).
57+
Upon successful compilation, an executable called 'bundler' will be
58+
copied to the bin directory, along with an executable called
59+
'KeyMatchAll'.
60+
61+
For Windows systems, see the vc++ directory for a Visual Studio 2005
62+
solution file (vc++/Bundler.sln). Note that you will still need
63+
cygwin (or at least have bash and perl installed) in order to run the
64+
RunBundler.sh script.
65+
66+
See the README.txt file for more information on running Bundler.

Makefile

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#-----------------------------------------------------------------------------
2+
# Top level makefile for Bundler
3+
#
4+
# Bundler: Structure from Motion for Unordered Photo Collections
5+
# Version: 0.4 04/03/2010
6+
# http://phototour.cs.washington.edu/bundler/
7+
#-----------------------------------------------------------------------------
8+
# Copyright (c) 2008-2010 University of Washington and Noah Snavely
9+
# All Rights Reserved.
10+
#-----------------------------------------------------------------------------
11+
12+
ANN_TARGET = linux-g++-shared
13+
14+
OS = $(shell uname -o)
15+
ifeq ($(OS), Cygwin)
16+
ANN_TARGET = win32-g++-shared
17+
endif
18+
19+
default:
20+
# Make libraries
21+
cd lib/5point; $(MAKE)
22+
cd lib/ann_1.1_char; $(MAKE) $(ANN_TARGET)
23+
cd lib/imagelib; $(MAKE)
24+
cd lib/matrix; $(MAKE)
25+
cd lib/sba-1.5; $(MAKE)
26+
cd lib/sfm-driver; $(MAKE)
27+
# Auxiliary libraries
28+
cd lib/minpack; $(MAKE)
29+
cd lib/cblas; $(MAKE)
30+
cd lib/f2c; $(MAKE)
31+
# Main program
32+
cd src; $(MAKE)
33+
34+
35+
clean:
36+
cd lib/5point; $(MAKE) clean
37+
cd lib/ann_1.1_char; $(MAKE) clean
38+
cd lib/imagelib; $(MAKE) clean
39+
cd lib/matrix; $(MAKE) clean
40+
cd lib/sba-1.5; $(MAKE) clean
41+
cd lib/sfm-driver; $(MAKE) clean
42+
cd lib/minpack; $(MAKE) clean
43+
cd lib/cblas; $(MAKE) clean
44+
cd lib/f2c; $(MAKE) clean
45+
cd src; $(MAKE) clean
46+
rm -f bin/bundler bin/KeyMatchFull bin/Bundle2PMVS bin/Bundle2Vis bin/RadialUndistort
47+
rm -f lib/*.a

0 commit comments

Comments
 (0)