From 9c42bbddcb19f792f9920aac077ef02415b76b76 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 4 Aug 2012 21:55:53 +0200
Subject: Favor Graphics::Macick over Image::Magick if available.

---
 IkiWiki/Plugin/img.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b92e24c..d31febf 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -65,10 +65,17 @@ sub preprocess (@) {
 	my $dir = $params{page};
 	my $base = IkiWiki::basename($file);
 	my $issvg = $base=~s/\.svg$/.png/i;
+	my $usegm = 1;
 
-	eval q{use Image::Magick};
-	error gettext("Image::Magick is not installed") if $@;
-	my $im = Image::Magick->new($issvg ? (magick => "png") : ());
+	eval q{use Graphics::Magick};
+	if ($@) {
+		$usegm = 0;
+		eval q{use Image::Magick};
+		error gettext("Image::Magick is not installed") if $@;
+	}
+	my $im = $usegm
+		? Graphics::Magick->new($issvg ? (magick => "png") : ())
+		: Image::Magick->new($issvg ? (magick => "png") : ());
 	my $imglink;
 	my $r = $im->Read($srcfile);
 	error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
@@ -113,7 +120,7 @@ sub preprocess (@) {
 			will_render($params{page}, $imglink);
 
 			if (-e $outfile && (-M $srcfile >= -M $outfile)) {
-				$im = Image::Magick->new;
+				$im = $usegm ? Graphics::Magick->new : Image::Magick->new;
 				$r = $im->Read($outfile);
 				error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
 			}
-- 
cgit v1.2.3