Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/AIFF.pm

Timestamp:

2011-06-01T12:33:42+12:00 (13 years ago)

Author:

sjm84

Message:

Updating the ExifTool perl modules

File:

• main/trunk/greenstone2/perllib/cpan/Image/ExifTool/AIFF.pm (modified) (8 diffs)

main/trunk/greenstone2/perllib/cpan/Image/ExifTool/AIFF.pm

@@ -5 +5 @@
 #
 # Revisions:    01/06/2006 - P. Harvey Created
+#               09/22/2008 - PH Added DjVu support
 #
 # References:   1) http://developer.apple.com/documentation/QuickTime/INMAC/SOUND/imsoundmgr.30.htm#pgfId=3190
@@ -18 +19 @@
 use Image::ExifTool::ID3;
 
-$VERSION = '1.01';
+$VERSION = '1.03';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
@@ -29 +30 @@
 # AIFF info
 %Image::ExifTool::AIFF::Main = (
-    PROCESS_PROC => \&Image::ExifTool::AIFF::ProcessSubChunks,
     GROUPS => { 2 => 'Audio' },
     NOTES => 'Only the tags decoded by ExifTool are listed in this table.',
@@ -137 +137 @@
     my ($exifTool, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my $verbose = $exifTool->Options('Verbose');
-    my ($buff, $err);
+    my ($buff, $err, $tagTablePtr, $page, $type);
 
     # verify this is a valid AIFF file
     return 0 unless $raf->Read($buff, 12) == 12;
-    return 0 unless $buff =~ /^FORM....(AIF(F|C))/s;
-    $exifTool->SetFileType($1);
+    my $pos = 12;
+    # check for DjVu image
+    if ($buff =~ /^AT&TFORM/) {
+        # http://www.djvu.org/
+        # http://djvu.sourceforge.net/specs/djvu3changes.txt
+        my $buf2;
+        return 0 unless $raf->Read($buf2, 4) == 4 and $buf2 =~ /^(DJVU|DJVM)/;
+        $pos += 4;
+        $buff = substr($buff, 4) . $buf2;
+        $tagTablePtr = GetTagTable('Image::ExifTool::DjVu::Main');
+        $exifTool->SetFileType('DJVU');
+        # modifiy FileType to indicate a multi-page document
+        $exifTool->{VALUE}->{FileType} .= " (multi-page)" if $buf2 eq 'DJVM';
+        $type = 'DjVu';
+    } else {
+        return 0 unless $buff =~ /^FORM....(AIF(F|C))/s;
+        $exifTool->SetFileType($1);
+        $tagTablePtr = GetTagTable('Image::ExifTool::AIFF::Main');
+        $type = 'AIFF';
+    }
     SetByteOrder('MM');
-    my $tagTablePtr = GetTagTable('Image::ExifTool::AIFF::Main');
-    my $pos = 12;
-#
-# Read chunks in AIFF image
+#
+# Read through the IFF chunks
 #
     for (;;) {
@@ -159 +174 @@
         my $len2 = $len + ($len & 0x01);
         if ($tagInfo) {
-            $raf->Read($buff, $len2) == $len2 or $err=1, last;
+            if ($$tagInfo{TypeOnly}) {
+                $len = $len2 = 4;
+                $page = ($page || 0) + 1;
+                $exifTool->VPrint(0, $exifTool->{INDENT} . "Page $page:\n");
+            }
+            $raf->Read($buff, $len2) >= $len or $err=1, last;
+            unless ($$tagInfo{SubDirectory} or $$tagInfo{Binary}) {
+                $buff =~ s/\0+$//;  # remove trailing nulls
+            }
             $exifTool->HandleTag($tagTablePtr, $tag, $buff,
                 DataPt => \$buff,
@@ -171 +194 @@
         $pos += $len2;
     }
-    $err and $exifTool->Warn('Error reading AIFF file (corrupted?)');
+    $err and $exifTool->Warn("Error reading $type file (corrupted?)");
     return 1;
 }
@@ -194 +217 @@
 =head1 AUTHOR
 
-Copyright 2003-2007, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
@@ -217 +240 @@
 
 =cut
-