Changeset 9574

Timestamp:

2005-04-07T12:32:06+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a couple of checks for Windows 95/98 to a) prevent pluginfo.pl from barfing on ImagePlug, and b) display a message telling the user that ImagePlug won't work on Windows 95/98.

File:

• trunk/gsdl/perllib/plugins/ImagePlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -107 +107 @@
     }
 
-    # Check that ImageMagick is installed and available on the path
-    my $result = `identify 2>&1`;
-    if ($? == -1 || $? == 256) {  # Linux and Windows return different values for "program not found"
-    $self->{'imagemagick_not_installed'} = 1;
+    # Check that ImageMagick is installed and available on the path (except for Windows 95/98)
+    if (!($ENV{'GSDLOS'} eq "windows" && !Win32::IsWinNT())) {
+    my $result = `identify 2>&1`;
+    if ($? == -1 || $? == 256) {  # Linux and Windows return different values for "program not found"
+        $self->{'imagemagick_not_installed'} = 1;
+    }
     }
 
@@ -142 +144 @@
     my $verbosity = $self->{'verbosity'};
     my $outhandle = $self->{'outhandle'};
+
+    # None of this works very well on Windows 95/98...
+    if ($ENV{'GSDLOS'} eq "windows" && !Win32::IsWinNT()) {
+    print $outhandle "ImagePlug: Windows 95/98 not supported\n" if ($verbosity > 1);
+    return undef;
+    }
 
     # None of this is going to work very well without ImageMagick...