Changeset 19420

Show
Ignore:
Timestamp:
13.05.2009 11:48:49 (10 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/ImageConverter.pm

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