diff options
| author | lukem <lukem@pkgsrc.org> | 2002-03-12 23:34:46 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2002-03-12 23:34:46 +0000 |
| commit | 5d8fc945611c10219d610f92247909a36326e454 (patch) | |
| tree | e08dca4666e237887077dc266a12a1900eeacb55 /www/make_album | |
| parent | 7c2319fea996b8c5161816be6bb35feb26b193a4 (diff) | |
| download | pkgsrc-5d8fc945611c10219d610f92247909a36326e454.tar.gz | |
fix floating exception when the focus is "infinite"
Diffstat (limited to 'www/make_album')
| -rw-r--r-- | www/make_album/Makefile | 4 | ||||
| -rw-r--r-- | www/make_album/distinfo | 4 | ||||
| -rw-r--r-- | www/make_album/patches/patch-aa | 18 |
3 files changed, 17 insertions, 9 deletions
diff --git a/www/make_album/Makefile b/www/make_album/Makefile index c33f3a060cd..ee89be11cc8 100644 --- a/www/make_album/Makefile +++ b/www/make_album/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/12/26 08:04:59 lukem Exp $ +# $NetBSD: Makefile,v 1.2 2002/03/12 23:34:46 lukem Exp $ # DISTNAME= make_album_1_6 PKGNAME= make_album-1.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.burren.cx/david/files/ diff --git a/www/make_album/distinfo b/www/make_album/distinfo index 001c97ee047..294d8b12102 100644 --- a/www/make_album/distinfo +++ b/www/make_album/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/12/26 08:01:12 lukem Exp $ +$NetBSD: distinfo,v 1.2 2002/03/12 23:34:46 lukem Exp $ SHA1 (make_album_1_6.tar.gz) = 90eae5af7ee5fd3a5e2172e03e131893bb67256d Size (make_album_1_6.tar.gz) = 25983 bytes -SHA1 (patch-aa) = 59e3f3b84be0715ae0250f60615db63686ebf675 +SHA1 (patch-aa) = 90c5295a5cb56696a2ad784fea189222017a165d diff --git a/www/make_album/patches/patch-aa b/www/make_album/patches/patch-aa index 1f95d557851..2763ce525b9 100644 --- a/www/make_album/patches/patch-aa +++ b/www/make_album/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/26 08:00:58 lukem Exp $ +$NetBSD: patch-aa,v 1.2 2002/03/12 23:34:46 lukem Exp $ --- make_album.orig Fri Sep 15 07:43:30 2000 -+++ make_album Wed Dec 26 19:00:26 2001 ++++ make_album @@ -1221,10 +1221,14 @@ # sub read_cameras { @@ -71,7 +71,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/12/26 08:00:58 lukem Exp $ } print FILE "<br /><font size=\"-1\">".$x."x".$y." (best"; if ($x != $image{"master/$tag.tiff"}{"x"} || $y != $image{"master/$tag.tiff"}{"y"}) { -@@ -1858,9 +1852,9 @@ +@@ -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) { @@ -83,7 +91,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/12/26 08:00:58 lukem Exp $ $image{"thumbs/$tag.jpg"}{"x"} = $1; $image{"thumbs/$tag.jpg"}{"y"} = $2; } -@@ -1890,9 +1884,10 @@ +@@ -1890,9 +1885,10 @@ if ((! -f $file) && -f $file.".gz") { $file = $file.".gz"; } @@ -96,7 +104,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/12/26 08:00:58 lukem Exp $ $image{"master/$tag.tiff"}{"x"} = $1; $image{"master/$tag.tiff"}{"y"} = $2; $got_size = 1; -@@ -1961,7 +1956,7 @@ +@@ -1961,7 +1957,7 @@ print INDEX "</td></tr>"; } print INDEX "</table>"; |