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

Timestamp:

2010-04-12T14:54:17+12:00 (14 years ago)

Author:

kjdon

Message:

added some code for if identify returns size in mb.

File:

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

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

@@ -449 +449 @@
     }
     }
+    elsif ($result =~ m/^.* ([0-9]+)(\.([0-9]+))?mb?/) {
+    $size = 1024 * 1024 * $1;
+        if (defined($2)) {
+        $size = $size + (1024 * 1024 * $2);
+            # Truncate size (it isn't going to be very accurate anyway)
+            $size = int($size);
+        }
+     }
     elsif ($result =~ m/^.* (([0-9]+)(\.([0-9]+))?e\+([0-9]+))(kb|b)?/) {
     # Deals with file sizes on Linux of type "3.4e+02kb" where e+02 is 1*10^2.