From ac539ced570c60e5f46e12ada6fe219a09cb1b65 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Wed, 26 Sep 2007 09:47:35 +0000
Subject: [PATCH] better image library loading

---
 lib/WebGUI/Storage/Image.pm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/WebGUI/Storage/Image.pm b/lib/WebGUI/Storage/Image.pm
index d4920f2a4..76e877774 100644
--- a/lib/WebGUI/Storage/Image.pm
+++ b/lib/WebGUI/Storage/Image.pm
@@ -18,21 +18,19 @@ use strict;
 use WebGUI::Storage;
 use WebGUI::Utility;
 use Carp qw(croak);
-eval 'use Graphics::Magick';
-my $graphicsMagickAvailable = ($@) ? 0 : 1;
-eval 'use Image::Magick';
-my $imageMagickAvailable = ($@) ? 0 : 1;
-my $graphicsPackage = '';
-if ($imageMagickAvailable) {
-    $graphicsPackage = "Image::Magick";
-}
-elsif ($graphicsMagickAvailable) {
-    $graphicsPackage = "Graphics::Magick";
-}
-else {
-    croak "You must have either Graphics::Magick or Image::Magick installed to run WebGUI.\n";
-}
 
+my $graphicsPackage;
+BEGIN {
+    if (eval { require Graphics::Magick; 1 }) {
+        $graphicsPackage = 'Graphics::Magick';
+    }
+    elsif (eval { require Image::Magick; 1 }) {
+        $graphicsPackage = 'Image::Magick';
+    }
+    else {
+        croak "You must have either Graphics::Magick or Image::Magick installed to run WebGUI.\n";
+    }
+}
 
 our @ISA = qw(WebGUI::Storage);