File tree 4 files changed +26
-4
lines changed
4 files changed +26
-4
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ use warnings;
19
19
use Carp;
20
20
21
21
use vars qw( $VERSION @ISA) ;
22
- $VERSION = ' 1.03 ' ;
22
+ $VERSION = ' 1.04 ' ;
23
23
24
24
@ISA = qw( Exporter) ;
25
25
Original file line number Diff line number Diff line change @@ -150,7 +150,11 @@ eval 'use Image::Magick';
150
150
# Get engine version
151
151
sub EngineVersion
152
152
{
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 ;
154
158
}
155
159
156
160
# Get engine description
Original file line number Diff line number Diff line change @@ -18,6 +18,8 @@ You can find the latest releases and information for installing/using
18
18
these modules at the Perl OpenGL (POGL) Developer's Site:
19
19
http://graphcomp.com/opengl
20
20
21
+ The official github repository is at http://github.com/bfree-github/OpenGL-Image
22
+
21
23
22
24
NOTE: as of 1.03, you _must_ call Sync prior to calling native (eg. ImageMagick) APIs
23
25
on an OpenGL::Image object, and call SyncOGA when done with your native calls.
Original file line number Diff line number Diff line change @@ -40,11 +40,27 @@ $exec = qq
40
40
{
41
41
use Image\::Magick;
42
42
\$im_ver = \$Image::Magick::VERSION ;
43
+ if (!$im_ver )
44
+ {
45
+ my \$im = new Image::Magick;
46
+ \$im_ver = \$im -> Get(' version' );
47
+ }
43
48
};
44
49
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 )
46
62
{
47
- $t -> skip(" Image::Magick module not installed: $@ " )
63
+ $t -> skip(" Image::Magick module not installed: $err " )
48
64
}
49
65
elsif ($im_ver lt ' 6.3.5' )
50
66
{
You can’t perform that action at this time.
0 commit comments