Skip to content

Commit 70bbc65

Browse files
committed
Updated version handling to deal with changes in ImageMagick's versioning interface
1 parent f888955 commit 70bbc65

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

Image.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use warnings;
1919
use Carp;
2020

2121
use vars qw($VERSION @ISA);
22-
$VERSION = '1.03';
22+
$VERSION = '1.04';
2323

2424
@ISA = qw(Exporter);
2525

Image/Magick.pm

+5-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,11 @@ eval 'use Image::Magick';
150150
# Get engine version
151151
sub EngineVersion
152152
{
153-
return $Image::Magick::VERSION;
153+
return $Image::Magick::VERSION if ($Image::Magick::VERSION);
154+
my $im = new Image::Magick;
155+
my $ver = $im->Get('version');
156+
return $1 if ($ver =~ m|ImageMagick ([0-9\.]+)|);
157+
return undef;
154158
}
155159

156160
# Get engine description

README

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ You can find the latest releases and information for installing/using
1818
these modules at the Perl OpenGL (POGL) Developer's Site:
1919
http://graphcomp.com/opengl
2020

21+
The official github repository is at http://github.com/bfree-github/OpenGL-Image
22+
2123

2224
NOTE: as of 1.03, you _must_ call Sync prior to calling native (eg. ImageMagick) APIs
2325
on an OpenGL::Image object, and call SyncOGA when done with your native calls.

t/OpenGL-Image.t

+18-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,27 @@ $exec = qq
4040
{
4141
use Image\::Magick;
4242
\$im_ver = \$Image::Magick::VERSION;
43+
if (!$im_ver)
44+
{
45+
my \$im = new Image::Magick;
46+
\$im_ver = \$im->Get('version');
47+
}
4348
};
4449
eval($exec);
45-
if ($@ || !$im_ver)
50+
my $err = $@;
51+
52+
if ($im_ver =~ m|ImageMagick ([0-9\.]+)|)
53+
{
54+
$im_ver = $1;
55+
}
56+
else
57+
{
58+
$im_ver = undef;
59+
}
60+
61+
if ($err || !$im_ver)
4662
{
47-
$t->skip("Image::Magick module not installed: $@")
63+
$t->skip("Image::Magick module not installed: $err")
4864
}
4965
elsif ($im_ver lt '6.3.5' )
5066
{

0 commit comments

Comments
 (0)