From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Nov 2011 22:44:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/pelle/patch/img_size'
X-Git-Tag: 3.20111107~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/344a50f5b9594d34eb70bea64c85e46e01765546?hp=a066e0405e22ed846cb21ec26b8ee972413a79e1

Merge remote-tracking branch 'remotes/pelle/patch/img_size'
---

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b98e843d4..a28d6a6d5 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -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 {