Changeset 32183 for main/trunk

Timestamp:

2018-05-21T10:20:27+12:00 (6 years ago)

Author:

kjdon

Message:

image height and width might be returned as 'unknown', in particular if something has gone wrong with image magick. so lets check for that so we don't get 'Argument unknown isn't numeric in numeric gt (>)' type errors

File:

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

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

@@ -333 +333 @@
     $doc_obj->add_metadata ($section, "ImageSize",   $size_str);
 
-    if ((defined $self->{'MaxImageWidth'}) 
+    if ((defined $self->{'MaxImageWidth'}) && ($image_width ne "unknown")
     && ($image_width > $self->{'MaxImageWidth'})) {
     $self->{'MaxImageWidth'} = $image_width;
     }
-    if ((defined $self->{'MaxImageHeight'})
+    if ((defined $self->{'MaxImageHeight'}) && ($image_height ne "unknown")
     && ($image_height > $self->{'MaxImageHeight'})) {
     $self->{'MaxImageHeight'} = $image_height;