Changeset 24600 for main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

Timestamp:

2011-09-15T16:31:11+12:00 (13 years ago)

Author:

ak19

Message:

Added gs-magick.pl script which will set the environment for ImageMagick (including LD_LIBRARY_PATH) before launching the requested ImageMagick command and arguments. By setting the Imagemagick environment from this script we ensure that the modified env variables don't create conflicts with libraries needed for normal linux execution. All the Greenstone files in the *binary* that made direct calls to imagemagick now go through this script. The affected files are perl files in bin/script and perllib and Gatherer.java of GLI. (wvware has files that test for imagemagick during compilation stage, which is independent of our changs which are only for users running imagemagick from a GS binary.) The final problems were related to how different perl files made use of the return values and the output of running their imagemagick command: they would query the 127 and/or and/or run the command with backtick operators to get the output printed to STDOUT. By inserting an intermediate gs-magick.pl file, needed to ensure that the exit code stored in 127 would at least be passed on correctly, as is necessary when testing the exit code against non-zero values or greater/less than zero (instead of comparing them with equals/not equal to 0). To get the correct exit code as emitted by imagemagick, calling code needs to shift bits in 127 and converting it to a signed value.

File:

• main/trunk/greenstone2/perllib/plugins/ImageConverter.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

@@ -32 +32 @@
 no strict 'refs'; # allow filehandles to be variables and viceversa
 
+use util;
 use gsprintf 'gsprintf';
 
@@ -131 +132 @@
     $no_image_conversion_reason = "win95notsupported";
     } else {
-    my $result = `identify -help 2>&1`;
+    my $imagick_cmd = "\"".&util::get_perl_exec()."\" -S gs-magick.pl";
+    my $result = `$imagick_cmd identify -help 2>&1`;
     my $return_value = $?;
- 
-    if ( ($ENV{'GSDLOS'} eq "windows" && $return_value == 256) || $return_value == -1) {  # Linux and Windows return different values for "program not found"
+
+    # When testing against non-zero return_value ($?), need to shift by 8 
+    # and convert it to its signed value. Linux returns -1 and Windows returns 
+    # 256 for "program not found". The signed equivalents are -1 and 1 respectively.
+    $return_value >>= 8;
+    $return_value = (($return_value & 0x80) ? -(0x100 - ($return_value & 0xFF)) : $return_value);
+
+    if ( ($ENV{'GSDLOS'} eq "windows" && $return_value == 1) || $return_value == -1) {  # Linux and Windows return different values for "program not found"
         $image_conversion_available = 0;
         $no_image_conversion_reason = "imagemagicknotinstalled";
@@ -407 +415 @@
 
     # Generate and run the convert command
-    my $convert_command = "convert -interlace plane -verbose $convert_options \"$source_file_path\" \"$target_file_path\"";
+    my $convert_command = "\"".&util::get_perl_exec()."\" -S gs-magick.pl convert -interlace plane -verbose $convert_options \"$source_file_path\" \"$target_file_path\"";
 
     my $print_info = { 'message_prefix' => $convert_id,
@@ -439 +447 @@
 
     # Use the ImageMagick "identify" command to get the file specs
-    my $command = "identify \"$image\" 2>&1";
+    my $command = "\"".&util::get_perl_exec()."\" -S gs-magick.pl identify \"$image\" 2>&1";
     print $outhandle "$command\n" if ($verbosity > 2);
     my $result = '';