Changeset 5103

Timestamp:

2003-08-07T11:13:15+12:00 (21 years ago)

Author:

mdewsnip

Message:

Newer versions of identify display more accurate file sizes (eg. 52.6kb instead of 53kb). The ImagePlug code for parsing this output assumed that the file size was always a whole number, and would fail on a size like 52.6kb. Added some code to handle this case.

File:

• trunk/gsdl/perllib/plugins/ImagePlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -326 +326 @@
     $height = $3;
     }
-    
+
     # Read the size
     my $size = "unknown";
     if ($result =~ m/^.* ([0-9]+)b/) {
     $size = $1;
-    } elsif ($result =~ m/^.* ([0-9]+)kb/) {
+    }
+    elsif ($result =~ m/^.* ([0-9]+)(\.([0-9]+))?kb/) {
     $size = 1024 * $1;
+    if (defined($2)) {
+        $size = $size + (1024 * $2);
+        # Truncate size (it isn't going to be very accurate anyway)
+        $size = int($size);
+    }
     }