oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix image library selection

Browse source
This commit is contained in:
Graham Knop 2007-09-12 20:51:23 +00:00
parent 6ee7dfa099
commit afdc412033
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Image.pm
View file

@ -9,8 +9,8 @@ BEGIN {
if (eval { require Graphics::Magick; 1 }) {
$graphicsPackage = 'Graphics::Magick';
}
elsif (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";

15
t/Macro/Thumbnail.t
View file

@ -18,7 +18,18 @@ use WebGUI::Session;
use WebGUI::Image;
use WebGUI::Storage::Image;
use Image::Magick;
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";
}
}
use Test::More; # increment this value for each test you create
use Test::Deep;
@ -88,7 +99,7 @@ SKIP: {
##Load the image into some parser and check a few pixels to see if they're blue-ish.
##->Get('pixel[x,y]') hopefully returns color in hex triplets
my $thumbImg = Image::Magick->new();
my $thumbImg = $graphicsPackage->new();
$thumbImg->Read(filename => $thumbFile);
cmp_bag([$thumbImg->GetPixels(width=>1, height=>1, x=>25, y=>25, map=>'RGB', normalize=>'true')], [0,0,1], 'blue pixel #1');