Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a28d6a6d519125f0d459ce6b6107dbee06683939..b92e24cc06fb93d8d88adcf1517903e46e49dc25 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -118,7 +118,6 @@ sub preprocess (@) {
                                error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
                        }
                        else {
-                               ($dwidth, $dheight)=($w, $h);
                                $r = $im->Resize(geometry => "${w}x${h}");
                                error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
@@ -132,6 +131,7 @@ sub preprocess (@) {
                                        $imglink = $file;
                                }
                        }
+
                        # always get the true size of the resized image
                        $dwidth  = $im->Get("width"); 
                        $dheight = $im->Get("height");