Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 9ae85c4e682839d7a2179785e1c4e504d6ecc866..e2f541506c309cd4dcef8ad0290c6ffdd03703d1 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -44,6 +44,7 @@ sub preprocess (@) {
        }
 
        add_link($params{page}, $image);
+       add_depends($params{page}, $image);
 
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {
@@ -63,80 +64,81 @@ sub preprocess (@) {
        error gettext("Image::Magick is not installed") if $@;
        my $im = Image::Magick->new;
        my $imglink;
-       my $r;
-
+       my $r = $im->Read($srcfile);
+       error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
+       
        my ($dwidth, $dheight);
 
        if ($params{size} ne 'full') {
-               add_depends($params{page}, $image);
-
                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&
                                (length $w || length $h));
-
-               my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
-               $imglink = "$dir/${w}x${h}-$base";
                
-               will_render($params{page}, $imglink);
-
-               if (-e $outfile && (-M $srcfile >= -M $outfile)) {
-                       $r = $im->Read($outfile);
-                       error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
+               if ((length $w && $w > $im->Get("width")) ||
+                   (length $h && $h > $im->Get("height"))) {
+                       # resizing larger
+                       $imglink = $file;
+
+                       # don't generate larger image, just set display size
+                       if (length $w && length $h) {
+                               ($dwidth, $dheight)=($w, $h);
+                       }
+                       # avoid division by zero on 0x0 image
+                       elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
+                               ($dwidth, $dheight)=(0, 0);
+                       }
+                       # calculate unspecified size from the other one, preserving
+                       # aspect ratio
+                       elsif (length $w) {
+                               $dwidth=$w;
+                               $dheight=$w / $im->Get("width") * $im->Get("height");
+                       }
+                       elsif (length $h) {
+                               $dheight=$h;
+                               $dwidth=$h / $im->Get("height") * $im->Get("width");
+                       }
                }
                else {
-                       $r = $im->Read($srcfile);
-                       error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
-
-                       # don't resize any larger
-                       my ($rw, $rh) = ($w, $h);
-                       if ((length $rw && $rw > $im->Get("width")) ||
-                           (length $rh && $rh > $im->Get("height"))) {
-                               $rw=$im->Get("width");
-                               $rh=$im->Get("height");
-                       }
-
-                       $r = $im->Resize(geometry => "${rw}x${rh}");
-                       error sprintf(gettext("failed to resize: %s"), $r) if $r;
+                       # resizing smaller
+                       my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
+                       $imglink = "$dir/${w}x${h}-$base";
+               
+                       will_render($params{page}, $imglink);
 
-                       # don't actually write file in preview mode
-                       if (! $params{preview}) {
-                               my @blob = $im->ImageToBlob();
-                               writefile($imglink, $config{destdir}, $blob[0], 1);
+                       if (-e $outfile && (-M $srcfile >= -M $outfile)) {
+                               $im = Image::Magick->new;
+                               $r = $im->Read($outfile);
+                               error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
+               
+                               $dwidth = $im->Get("width");
+                               $dheight = $im->Get("height");
                        }
                        else {
-                               $imglink = $file;
+                               ($dwidth, $dheight)=($w, $h);
+                               $r = $im->Resize(geometry => "${w}x${h}");
+                               error sprintf(gettext("failed to resize: %s"), $r) if $r;
+
+                               # don't actually write file in preview mode
+                               if (! $params{preview}) {
+                                       my @blob = $im->ImageToBlob();
+                                       writefile($imglink, $config{destdir}, $blob[0], 1);
+                               }
+                               else {
+                                       $imglink = $file;
+                               }
                        }
                }
-
-               # since we don't really resize larger, set the display
-               # size, so the browser can scale the image up if necessary
-               if (length $w && length $h) {
-                       ($dwidth, $dheight)=($w, $h);
-               }
-               # avoid division by zero on 0x0 image
-               elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
-                       ($dwidth, $dheight)=(0, 0);
-               }
-               # calculate unspecified size from the other one, preserving
-               # aspect ratio
-               elsif (length $w) {
-                       $dwidth=$w;
-                       $dheight=$w / $im->Get("width") * $im->Get("height");
-               }
-               elsif (length $h) {
-                       $dheight=$h;
-                       $dwidth=$h / $im->Get("height") * $im->Get("width");
-               }
-
        }
        else {
-               $r = $im->Read($srcfile);
-               error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
                $imglink = $file;
                $dwidth = $im->Get("width");
                $dheight = $im->Get("height");
        }
+       
+       if (! defined($dwidth) || ! defined($dheight)) {
+               error sprintf(gettext("failed to determine size of image %s"), $file)
+       }
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {
@@ -148,10 +150,6 @@ sub preprocess (@) {
                $imgurl="$config{url}/$imglink";
        }
 
-       if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-               error sprintf(gettext("failed to determine size of image %s"), $file)
-       }
-
        my $imgtag='<img src="'.$imgurl.
                '" width="'.$dwidth.
                '" height="'.$dheight.'"'.

diff --git a/debian/changelog b/debian/changelog
index 2e27d623e86663ac43af95ad63e7b1a415b03b39..44c810b00f8817ba11d1a5582cc1f30f7808650d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
 
   * parentlinks: Add has_parentlinks template parameter to allow styling
     the toplevel index differently etc.
+  * img: Correct bug in image size calculation code.
+  * img: Fix dependency code for full size images.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400