head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.192 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.190 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.188 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.186 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.184 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.182 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.180 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.178 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.176 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.174 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.172 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.170 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.168 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.166 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.164 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.162 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.160 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.158 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.156 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.154 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.152 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.150 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.148 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.144 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.124 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.146 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.142 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.140 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.138 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.136 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.134 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.132 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.130 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.128 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.126 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.122 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.120 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.118 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.116 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.114 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.112 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.110 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.108 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.106 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.104 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.102 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.100 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.98 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.96 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.94 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.92 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.90 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.88 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.86 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.84 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.82 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.80 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.78 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.76 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.74 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.72 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.70 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.68 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.66 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.64 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.62 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2002.03.12.23.34.46; author lukem; state Exp; branches; next 1.1; 1.1 date 2001.12.26.08.00.58; author lukem; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.12.26.08.00.58; author lukem; state Exp; branches; next ; desc @@ 1.2 log @fix floating exception when the focus is "infinite" @ text @$NetBSD$ --- make_album.orig Fri Sep 15 07:43:30 2000 +++ make_album @@@@ -1221,10 +1221,14 @@@@ # sub read_cameras { my ($model, $camfile); + my (@@camfiles) = ( + $ENV{"CAMERAS_TXT"}, + $ENV{"HOME"} . "/lib/cameras.txt", + $0 . "/../../lib/cameras.txt", + ); - if (!defined ($camfile = $ENV{"CAMERAS_TXT"})) { - $camfile = $ENV{"HOME"}."/lib/cameras.txt"; - } + foreach $camfile (@@camfiles) { + next if ($camfile eq ""); if (open(CAMERAS, "<$camfile")) { $model = ""; @@camera_models = (); @@@@ -1253,7 +1257,9 @@@@ } } close(CAMERAS); + return; } + } } # Get EXIF/other info about the image "$tag" @@@@ -1440,7 +1446,7 @@@@ print FILE ""; print FILE ""; print FILE ""; - print FILE "This img:\n"; + print FILE "This image:\n"; foreach $t (@@tours) { if ($tour{$t}{"dir"} eq ".") { $d2 = ""; @@@@ -1454,20 +1460,8 @@@@ print FILE "" if ($t eq $tour); print FILE ""; } - print FILE "
Indices:"; - foreach $t (@@tours) { - if ($tour{$t}{"dir"} eq ".") { - $d2 = ""; - } else { - $d2 = $tour{$t}{"dir"}."/"; - } - print FILE "
"; - print FILE "" if ($t eq $tour); - print FILE $t; - print FILE "" if ($t eq $tour); - print FILE ""; - } + print FILE "
Index"; + print FILE "
Parent directory"; print FILE "\n"; print FILE ""; if ($next) { @@@@ -1478,7 +1472,7 @@@@ print FILE "\n"; print FILE ""; if ($notes{$tag} ne "") { - print FILE $notes{$tag}; + print FILE "
$notes{$tag}
"; } print FILE "
".$x."x".$y." (best"; if ($x != $image{"master/$tag.tiff"}{"x"} || $y != $image{"master/$tag.tiff"}{"y"}) { @@@@ -1563,6 +1557,7 @@@@ print FILE ", " if ($comma); $comma = 1; print FILE "Focus: $m $f"; if ($f != 0 + && $f ne "infinite" && defined ($focal = $rexif->{"focal"}) && $focal ne "" && ($aperture = $rexif->{"fstop"}) ne "" @@@@ -1858,9 +1853,9 @@@@ %image = {}; foreach $tag (@@tags) { - if (open(IDENTIFY, "identify -cache $im_cache -ping web/thumbs/$tag.jpg|")) { + if (open(IDENTIFY, "identify -cache $im_cache web/thumbs/$tag.jpg|")) { while () { - if (/^\S+\s+(\d+)x(\d+)/) { + if (/JPEG\s+(\d+)x(\d+)/) { $image{"thumbs/$tag.jpg"}{"x"} = $1; $image{"thumbs/$tag.jpg"}{"y"} = $2; } @@@@ -1890,9 +1885,10 @@@@ if ((! -f $file) && -f $file.".gz") { $file = $file.".gz"; } - if (open(IDENTIFY, "identify -ping $file|")) { + print "\t$file\n"; + if (open(IDENTIFY, "identify $file|")) { while () { - if (/^\S+\s+(\d+)x(\d+)/) { + if (/TIFF\s+(\d+)x(\d+)/) { $image{"master/$tag.tiff"}{"x"} = $1; $image{"master/$tag.tiff"}{"y"} = $2; $got_size = 1; @@@@ -1961,7 +1957,7 @@@@ print INDEX ""; } print INDEX ""; - print INDEX "Parent"; + print INDEX "
Parent directory"; foreach $section (sort {$a <=> $b} keys %section) { print INDEX "

".$section{$section}{"name"}."

\n"; @ 1.1 log @Initial revision @ text @d4 1 a4 1 +++ make_album Wed Dec 26 19:00:26 2001 d74 9 a82 1 @@@@ -1858,9 +1852,9 @@@@ d94 1 a94 1 @@@@ -1890,9 +1884,10 @@@@ d107 1 a107 1 @@@@ -1961,7 +1956,7 @@@@ @ 1.1.1.1 log @make_album organises images into HTML "albums", with thumbnails and different sized images. It supports reading the EXIF data out of the original image and presenting that information. An example configuration can be found at: http://www.burren.cx/david/files/example_album.tar.gz @ text @@