From f5612f861479811c744be641e3796bb10273280a Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 30 Oct 2010 18:44:07 +0200 Subject: [PATCH] compiles --- install.sh | 1 + run-1-get-keypoints.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0eab7214..424125bc 100755 --- a/install.sh +++ b/install.sh @@ -213,6 +213,7 @@ cp $BUNDLER_PATH/bin/Bundle2PMVS $BUNDLER_PATH/bin/Bundle2Vis $BUNDLER_PATH/bin/ cp $CMVS_PATH/program/main/cmvs $CMVS_PATH/program/main/pmvs2 $CMVS_PATH/program/main/genOption $TOOLS_BIN_PATH/ +sudo cp $VLFEAT_PATH/bin/glx/libvl.so $LIB_PATH/ sudo cp $BUNDLER_PATH/lib/libANN_char.so $LIB_PATH/ exit \ No newline at end of file diff --git a/run-1-get-keypoints.sh b/run-1-get-keypoints.sh index 28724d27..27e7efeb 100755 --- a/run-1-get-keypoints.sh +++ b/run-1-get-keypoints.sh @@ -11,6 +11,7 @@ CMVS=$BASE_PATH/cmvs PMVS=$BASE_PATH/pmvs2 GENOPTION=$BASE_PATH/genOption SIFT=$BASE_PATH/sift +VLSIFT=$BASE_PATH/bin/vlsift SIFTFEAT=$BASE_PATH/siftfeat if [ $# -eq 1 ] @@ -40,8 +41,8 @@ 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; $SIFT < $IMAGE_DIR/$pgm_file > $IMAGE_DIR/$key_file; rm $IMAGE_DIR/$pgm_file; gzip -f $IMAGE_DIR/$key_file" eval $SIFT_CMD done