]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote-tracking branch 'remotes/pelle/patch/img_size'
authorJoey Hess <joey@kitenet.net>
Thu, 17 Nov 2011 22:44:27 +0000 (18:44 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Nov 2011 22:44:27 +0000 (18:44 -0400)
IkiWiki/Plugin/img.pm

index b98e843d436b1aed68ca13a12da94ee44a74dd06..a28d6a6d519125f0d459ce6b6107dbee06683939 100644 (file)
@@ -132,9 +132,9 @@ sub preprocess (@) {
                                        $imglink = $file;
                                }
                        }
-                       
-                       $dwidth = $im->Get("width") unless defined $dwidth;
-                       $dheight = $im->Get("height") unless defined $dheight;
+                       # always get the true size of the resized image
+                       $dwidth  = $im->Get("width"); 
+                       $dheight = $im->Get("height");
                }
        }
        else {