From 0abf2a6bf39fbe85c2673fb0d8d1723727bde04c Mon Sep 17 00:00:00 2001
From: Daniel <qwesda@me.com>
Date: Sat, 30 Oct 2010 18:56:56 +0200
Subject: [PATCH] compiles

---
 install.sh               |  10 ++--
 run-1-get-keypoints.sh   |  21 ++++----
 run-1.sh                 | 104 ++++++---------------------------------
 run-2-match-keypoints.sh |  17 ++++---
 run-3-bundler.sh         |  17 ++++---
 run-4-bundle2pmvs.sh     |  17 ++++---
 run-5-cmvs.sh            |  17 ++++---
 run-6-genOption.sh       |  17 ++++---
 run-7-pmvs.sh            |  17 ++++---
 9 files changed, 85 insertions(+), 152 deletions(-)

diff --git a/install.sh b/install.sh
index 424125bc..16ca66de 100755
--- a/install.sh
+++ b/install.sh
@@ -150,12 +150,12 @@ sed -i $BUNDLER_PATH/bin/extract_focal.pl -e '18c\    $JHEAD_EXE = "jhead";'
 sed -i $BUNDLER_PATH/bin/ToSift.sh -e '36c\    echo "SIFT -o $key_file -x $d; gzip -f $key_file"'
 
 
-cho
-cho ---- building ----
-cho
+echo
+echo ---- building ----
+echo
 
-udo chown -R $USER:$USER *
-udo chmod -R 755 *
+sudo chown -R $USER:$USER *
+sudo chmod -R 755 *
 
 cd $OPENCV_PATH
 cmake .
diff --git a/run-1-get-keypoints.sh b/run-1-get-keypoints.sh
index 27e7efeb..94b0406c 100755
--- a/run-1-get-keypoints.sh
+++ b/run-1-get-keypoints.sh
@@ -3,16 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
-VLSIFT=$BASE_PATH/bin/vlsift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
@@ -41,7 +41,8 @@ do
     pgm_file=`echo $d | sed 's/jpg$/pgm/'`
     jpg_file=`echo $d`
 
-	SIFT_CMD="$VLSIFT -o $IMAGE_DIR/$key_file -x $IMAGE_DIR/$jpg_file; gzip -f $IMAGE_DIR/$key_file"
+#	SIFT_CMD="$VLSIFT -o $IMAGE_DIR/$key_file -x $IMAGE_DIR/$jpg_file; gzip -f $IMAGE_DIR/$key_file"
+	SIFT_CMD="mogrify -format pgm $IMAGE_DIR/$jpg_file; $VLSIFT -v -o $IMAGE_DIR/$key_file $IMAGE_DIR/$pgm_file; rm $IMAGE_DIR/$pgm_file; gzip -f $IMAGE_DIR/$key_file"
 #	SIFT_CMD="mogrify -format pgm $IMAGE_DIR/$jpg_file; $SIFT < $IMAGE_DIR/$pgm_file > $IMAGE_DIR/$key_file; rm $IMAGE_DIR/$pgm_file; gzip -f $IMAGE_DIR/$key_file"
 	eval $SIFT_CMD
 done
diff --git a/run-1.sh b/run-1.sh
index cc290cb5..5a072767 100755
--- a/run-1.sh
+++ b/run-1.sh
@@ -1,15 +1,18 @@
+#!/bin/bash
+
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
@@ -23,12 +26,6 @@ do
     mv $d `echo $d | sed 's/\.JPG/\.jpg/'`
 done
 
-echo
-echo '[- Scaling images -]'
-echo
-
-mogrify -resize 1600x1200 -quality 100 *
-
 # Create the list of images
 find $IMAGE_DIR -maxdepth 1 | egrep ".jpg$" | sort > list_tmp.txt
 $EXTRACT_FOCAL list_tmp.txt
@@ -44,81 +41,10 @@ do
     pgm_file=`echo $d | sed 's/jpg$/pgm/'`
     jpg_file=`echo $d`
 
-	SIFT_CMD="$SIFTFEAT -o $IMAGE_DIR/$key_file -x $IMAGE_DIR/$jpg_file; gzip -f $IMAGE_DIR/$key_file"
-#	SIFT_CMD="mogrify -format pgm $IMAGE_DIR/$jpg_file; $SIFT < $IMAGE_DIR/$pgm_file > $IMAGE_DIR/$key_file; rm $IMAGE_DIR/$pgm_file; gzip -f $IMAGE_DIR/$key_file"
+#	SIFT_CMD="$VLSIFT -o $IMAGE_DIR/$key_file -x $IMAGE_DIR/$jpg_file; gzip -f $IMAGE_DIR/$key_file"
+#	SIFT_CMD="mogrify -format pgm $IMAGE_DIR/$jpg_file; $VLSIFT < $IMAGE_DIR/$pgm_file > $IMAGE_DIR/$key_file; rm $IMAGE_DIR/$pgm_file; gzip -f $IMAGE_DIR/$key_file"
+	SIFT_CMD="mogrify -format pgm $IMAGE_DIR/$jpg_file; $SIFT < $IMAGE_DIR/$pgm_file > $IMAGE_DIR/$key_file; rm $IMAGE_DIR/$pgm_file; gzip -f $IMAGE_DIR/$key_file"
 	eval $SIFT_CMD
 done
 
-# Match images (can take a while)
-echo
-echo '[- Matching keypoints (this can take a while) -]'
-echo
-
-sed 's/\.jpg$/\.key/' $IMAGE_DIR/list_tmp.txt > $IMAGE_DIR/list_keys.txt
-
-echo $MATCHKEYS $IMAGE_DIR/list_keys.txt $IMAGE_DIR/matches.init.txt
-$MATCHKEYS $IMAGE_DIR/list_keys.txt $IMAGE_DIR/matches.init.txt
-
-mkdir bundle
-rm -f $IMAGE_DIR/options.txt
-
-echo "--match_table matches.init.txt" >> options.txt
-echo "--output bundle.out" >> options.txt
-echo "--output_all bundle_" >> options.txt
-echo "--output_dir bundle" >> options.txt
-echo "--variable_focal_length" >> options.txt
-echo "--use_focal_estimate" >> options.txt
-echo "--constrain_focal" >> options.txt
-echo "--constrain_focal_weight 0.0001" >> options.txt
-echo "--estimate_distortion" >> options.txt
-echo "--run_bundle" >> options.txt
-
-# Run Bundler!
-echo
-echo '[- Running Bundler -]'
-echo
-
-rm -f $IMAGE_DIR/constraints.txt
-rm -f $IMAGE_DIR/pairwise_scores.txt
-$BUNDLER $IMAGE_DIR/list.txt --options_file $IMAGE_DIR/options.txt > $IMAGE_DIR/bundle/out
-
-# Run Bundle2PMVS!
-echo
-echo '[- Running Bundle2PMVS -]'
-echo
-
-$BUNDLE2PVMS list.txt bundle/bundle.out
-
-# Run prep_pmvs!
-echo
-echo '[- Running prep_pmvs -]'
-echo
-
-sed -i $IMAGE_DIR/pmvs/prep_pmvs.sh -e "4c\BUNDLER_BIN_PATH=\"$BASE_PATH\""
-sh pmvs/prep_pmvs.sh
-
-# Run cmvs!
-echo
-echo '[- Running cmvs -]'
-echo
-
-$CMVS pmvs/ 20
-
-# Run pmvs!
-echo
-echo '[- Running genOption -]'
-echo
-
-$GENOPTION pmvs/
-
-# Run prep_pmvs!
-echo
-echo '[- Running pmvs -]'
-echo
-
-$PMVS pmvs/ option-0000
-#sh pmvs/pmvs.sh
-
-echo
-echo '[- Done -]'
-echo
\ No newline at end of file
+exit
diff --git a/run-2-match-keypoints.sh b/run-2-match-keypoints.sh
index b2e04908..86f4a9b9 100755
--- a/run-2-match-keypoints.sh
+++ b/run-2-match-keypoints.sh
@@ -3,15 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
diff --git a/run-3-bundler.sh b/run-3-bundler.sh
index 55c2f070..ab01945a 100755
--- a/run-3-bundler.sh
+++ b/run-3-bundler.sh
@@ -3,15 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
diff --git a/run-4-bundle2pmvs.sh b/run-4-bundle2pmvs.sh
index 54a11cb7..7b468353 100755
--- a/run-4-bundle2pmvs.sh
+++ b/run-4-bundle2pmvs.sh
@@ -3,15 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
diff --git a/run-5-cmvs.sh b/run-5-cmvs.sh
index 87d381b1..22f289a3 100755
--- a/run-5-cmvs.sh
+++ b/run-5-cmvs.sh
@@ -3,15 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
diff --git a/run-6-genOption.sh b/run-6-genOption.sh
index f029aa90..69fb1119 100755
--- a/run-6-genOption.sh
+++ b/run-6-genOption.sh
@@ -3,15 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then
diff --git a/run-7-pmvs.sh b/run-7-pmvs.sh
index 989461c9..4892bbf4 100755
--- a/run-7-pmvs.sh
+++ b/run-7-pmvs.sh
@@ -3,15 +3,16 @@
 BASE_PATH=$(dirname $(which $0));
 IMAGE_DIR="."
 
-EXTRACT_FOCAL=$BASE_PATH/extract_focal.pl
-MATCHKEYS=$BASE_PATH/KeyMatchFull
-BUNDLER=$BASE_PATH/bundler
-BUNDLE2PVMS=$BASE_PATH/Bundle2PMVS
-CMVS=$BASE_PATH/cmvs
-PMVS=$BASE_PATH/pmvs2
-GENOPTION=$BASE_PATH/genOption
-SIFT=$BASE_PATH/sift
+EXTRACT_FOCAL=$BASE_PATH/bin/extract_focal.pl
+MATCHKEYS=$BASE_PATH/bin/KeyMatchFull
+BUNDLER=$BASE_PATH/bin/bundler
+BUNDLE2PVMS=$BASE_PATH/bin/Bundle2PMVS
+CMVS=$BASE_PATH/bin/cmvs
+PMVS=$BASE_PATH/bin/pmvs2
+GENOPTION=$BASE_PATH/bin/genOption
+SIFT=$BASE_PATH/bin/sift
 SIFTFEAT=$BASE_PATH/siftfeat
+VLSIFT=$BASE_PATH/bin/vlsift
 
 if [ $# -eq 1 ]
 then