Changeset 19420

Timestamp:

2009-05-13T11:48:49+12:00 (15 years ago)

Author:

kjdon

Message:

on linux, running identify was returning 1, which looked like 256 and so looked like it couldn't find imagemagick. modified the test to be 256 on windows, -1 otherwise

File:

• gsdl/trunk/perllib/plugins/ImageConverter.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -128 +128 @@
     } else {
     my $result = `identify -version 2>&1`;
-    if ($? == -1 || $? == 256) {  # Linux and Windows return different values for "program not found"
+    my $return_value = $?;
+    if ( ($ENV{'GSDLOS'} eq "windows" && $return_value == 256) || $return_value == -1) {  # Linux and Windows return different values for "program not found"
         $image_conversion_available = 0;
         $no_image_conversion_reason = "imagemagicknotinstalled";