From 95e3a7057b8823c6b4da6828368796b659cf0fd4 Mon Sep 17 00:00:00 2001 From: Daniel Schwarz Date: Wed, 22 Jun 2011 20:28:46 +0200 Subject: [PATCH 1/4] changed ldconfig => /sbin/ldconfig --- install-centos.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install-centos.sh b/install-centos.sh index d5aeeb2f..96319604 100644 --- a/install-centos.sh +++ b/install-centos.sh @@ -304,8 +304,7 @@ echo cd "$TOOLS_PATH" sudo install -o `id -u` -g `id -g` -m 644 -t "$LIB_PATH" lib/*.so -sudo ldconfig -v > "$TOOLS_LOG_PATH/ldconfig.log" 2>&1 - +sudo /sbin/ldconfig -v > "$TOOLS_LOG_PATH/ldconfig.log" 2>&1 sudo chown -R `id -u`:`id -g` * sudo chmod -R 777 * From e4661803c00052a032231b5307ca951b4e779bc7 Mon Sep 17 00:00:00 2001 From: Daniel Schwarz Date: Wed, 22 Jun 2011 20:33:12 +0200 Subject: [PATCH 2/4] Revert 95e3a7057b8823c6b4da6828368796b659cf0fd4^..HEAD --- ccd_defs.pl | 0 convert_vlsift_to_lowesift.pl | 0 install-centos.sh | 0 install.sh | 0 run.pl | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ccd_defs.pl mode change 100644 => 100755 convert_vlsift_to_lowesift.pl mode change 100644 => 100755 install-centos.sh mode change 100644 => 100755 install.sh mode change 100644 => 100755 run.pl diff --git a/ccd_defs.pl b/ccd_defs.pl old mode 100644 new mode 100755 diff --git a/convert_vlsift_to_lowesift.pl b/convert_vlsift_to_lowesift.pl old mode 100644 new mode 100755 diff --git a/install-centos.sh b/install-centos.sh old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 diff --git a/run.pl b/run.pl old mode 100644 new mode 100755 From 8ec51d02e2ad64140a8b27bcdfb8fee264f30a00 Mon Sep 17 00:00:00 2001 From: Daniel Schwarz Date: Thu, 23 Jun 2011 02:12:12 +0200 Subject: [PATCH 3/4] bumped cmvs-fix1.tar.gz => cmvs-fix2.tar.gz && bundler fix for gcc4.5 --- install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 8427386a..ea14863a 100755 --- a/install.sh +++ b/install.sh @@ -118,7 +118,7 @@ clapack.tgz http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz bundler.zip http://phototour.cs.washington.edu/bundler/distr/bundler-v0.4-source.zip graclus.tar.gz https://www.topoi.hu-berlin.de/graclus1.2.tar.gz PoissonRecon.zip http://www.cs.jhu.edu/~misha/Code/PoissonRecon/Version2/PoissonRecon.zip -cmvs.tar.gz http://grail.cs.washington.edu/software/cmvs/cmvs-fix1.tar.gz +cmvs.tar.gz http://grail.cs.washington.edu/software/cmvs/cmvs-fix2.tar.gz EOF echo " < done - `date`" @@ -286,6 +286,8 @@ echo echo " > bundler" cd "$BUNDLER_PATH" + sed -i "$BUNDLER_PATH/src/BundlerApp.h" -e "620c\ BundlerApp();" + echo " - cleaning bundler" make clean > "$TOOLS_LOG_PATH/bundler_1_clean.log" 2>&1 @@ -309,4 +311,4 @@ sudo chmod -R 777 * echo " - script finished - `date`" -exit \ No newline at end of file +exit From 454b30b521faf05d97bb93061f88577c5326398a Mon Sep 17 00:00:00 2001 From: Daniel Schwarz Date: Fri, 24 Jun 2011 12:37:40 +0200 Subject: [PATCH 4/4] updated ccd definitions --- ccd_defs.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) mode change 100755 => 100644 ccd_defs.pl diff --git a/ccd_defs.pl b/ccd_defs.pl old mode 100755 new mode 100644 index 5443808b..edb5508e --- a/ccd_defs.pl +++ b/ccd_defs.pl @@ -14,6 +14,7 @@ "Canon Canon DIGITAL IXUS 750" => 7.176, # 1/1.8" "Canon Canon DIGITAL IXUS 800 IS" => 5.76, # 1/2.5" "Canon Canon DIGITAL IXUS II" => 5.27, # 1/2.7" + "Canon Canon DIGITAL IXUS 430" => 6.18, # 1/2.3" "Canon Canon EOS 10D" => 22.7, "Canon Canon EOS-1D Mark II" => 28.7, "Canon Canon EOS-1Ds Mark II" => 35.95, @@ -160,6 +161,7 @@ "NIKON CORPORATION NIKON D70" => 23.7, "NIKON CORPORATION NIKON D70s" => 23.7, "NIKON CORPORATION NIKON D80" => 23.6, + "NIKON CORPORATION NIKON D700" => 36.0, "NIKON E2500" => 5.27, # 1/2.7" "NIKON E2500" => 5.27, # 1/2.7" "NIKON E3100" => 5.27, # 1/2.7" @@ -195,7 +197,8 @@ "OLYMPUS CORPORATION X250,D560Z,C350Z" => 5.76, # 1/2.5" "OLYMPUS CORPORATION X-3,C-60Z" => 7.176, # 1.8" "OLYMPUS CORPORATION X400,D580Z,C460Z" => 5.27, # 1/2.7" - "OLYMPUS IMAGING CORP. E-500" => 17.3, # 4/3? + "OLYMPUS IMAGING CORP. E-500" => 17.3, # 4/3? + "OLYMPUS IMAGING CORP. E-510" => 17.3, "OLYMPUS IMAGING CORP. FE115,X715" => 5.76, # 1/2.5" "OLYMPUS IMAGING CORP. SP310" => 7.176, # 1/1.8" "OLYMPUS IMAGING CORP. SP510UZ" => 5.75, # 1/2.5" @@ -228,6 +231,7 @@ "Panasonic DMC-LZ2" => 5.76, # 1/2.5" "Panasonic DMC-TZ1" => 5.75, # 1/2.5" "Panasonic DMC-TZ3" => 5.68, # 1/2.35" + "Panasonic DMC-TZ5" => 6.12, # 1/2.33" "PENTAX Corporation PENTAX *ist DL" => 23.5, "PENTAX Corporation PENTAX *ist DS2" => 23.5, "PENTAX Corporation PENTAX *ist DS" => 23.5, @@ -270,4 +274,4 @@ "SONY DSC-W5" => 7.176, # 1/1.8" "SONY DSC-W7" => 7.176, # 1/1.8" "SONY DSC-W80" => 5.75, # 1/2.5" -); \ No newline at end of file +);