From e0bb9675ce349c02fce1e835b5aaa6601d4254d2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Jun 2009 15:34:48 +0100
Subject: img: depend on absolute page name, not relative

Previously, [[!img bar.jpg]] on foo, where foo/bar.jpg exists, would
get a dependency equivalent to "glob(bar.jpg)" (which might not match
anything), rather than the correct "glob(foo/bar.jpg)".
(cherry picked from commit 85b2ec49ecd12dd23e5c432933457a72744ce7cb)
---
 IkiWiki/Plugin/img.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin/img.pm')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 68b001671..5f97e3810 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -135,11 +135,15 @@ sub preprocess (@) {
 	elsif ($params{link} =~ /^\w+:\/\//) {
 		$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
 	}
-	elsif (length bestlink($params{page}, $params{link})) {
-		add_depends($params{page}, $params{link});
-		$imgtag=htmllink($params{page}, $params{destpage},
-			$params{link}, linktext => $imgtag,
-			noimageinline => 1);
+	else {
+		my $b = bestlink($params{page}, $params{link});
+	
+		if (length $b) {
+			add_depends($params{page}, $b);
+			$imgtag=htmllink($params{page}, $params{destpage},
+				$params{link}, linktext => $imgtag,
+				noimageinline => 1);
+		}
 	}
 
 	if (exists $params{caption}) {
-- 
cgit v1.2.3


From 03449610d6c666ba24bea68f01d896613e522278 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 23:23:06 -0400
Subject: img: Don't generate new verison of image if it is scaled to be larger
 in either dimension.

Although imagemagick handles even really large sizes sanely, using a page
file, doing so would just waste time and disk space, since the browser
can be told to resize it larger.
---
 IkiWiki/Plugin/img.pm | 39 ++++++++++++++++++++++++++++++++++++---
 debian/changelog      |  2 ++
 2 files changed, 38 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin/img.pm')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 5f97e3810..9ae85c4e6 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -65,6 +65,8 @@ sub preprocess (@) {
 	my $imglink;
 	my $r;
 
+	my ($dwidth, $dheight);
+
 	if ($params{size} ne 'full') {
 		add_depends($params{page}, $image);
 
@@ -86,7 +88,15 @@ sub preprocess (@) {
 			$r = $im->Read($srcfile);
 			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
-			$r = $im->Resize(geometry => "${w}x${h}");
+			# 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;
 
 			# don't actually write file in preview mode
@@ -98,11 +108,34 @@ sub preprocess (@) {
 				$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");
 	}
 
 	my ($fileurl, $imgurl);
@@ -120,8 +153,8 @@ sub preprocess (@) {
 	}
 
 	my $imgtag='<img src="'.$imgurl.
-		'" width="'.$im->Get("width").
-		'" height="'.$im->Get("height").'"'.
+		'" width="'.$dwidth.
+		'" height="'.$dheight.'"'.
 		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
 		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
 		(exists $params{align} ? ' align="'.$params{align}.'"' : '').
diff --git a/debian/changelog b/debian/changelog
index 870abfdd5..992692566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * po: fix interdiction to create pages of type po (intrigeri)
   * po: po: favor the type of linking page's masterpage on page creation
     (intrigeri)
+  * img: Don't generate new verison of image if it is scaled to be
+    larger in either dimension.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3