Changeset 32192

Timestamp:

2018-05-29T10:07:32+12:00 (6 years ago)

Author:

kjdon

Message:

with new result and result_str return values from convert, need to look at result_str not result for image dimensions

File:

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

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

@@ -407 +407 @@
     
     # Extract Thumbnail metadata from convert output
-    if ($result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
+    if ($result_str =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
         $doc_obj->add_metadata ($section, "ThumbWidth", $1);
         $doc_obj->add_metadata ($section, "ThumbHeight", $2);
@@ -451 +451 @@
 
     # get screenview dimensions, size and type
-    if ($result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
+    if ($result_str =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
         $doc_obj->add_metadata ($section, "ScreenWidth", $1);
         $doc_obj->add_metadata ($section, "ScreenHeight", $2);
-    } elsif ($result =~ m/([0-9]+)x([0-9]+)/) {
+    } elsif ($result_str =~ m/([0-9]+)x([0-9]+)/) {
         #if the image hasn't changed size, the previous regex doesn't match
         $doc_obj->add_metadata ($section, "ScreenWidth", $1);