Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Jpeg2000.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/Jpeg2000.pm (modified) (12 diffs)

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

@@ -17 +17 @@
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.12';
+$VERSION = '1.16';
 
 sub ProcessJpeg2000Box($$$);
@@ -39 +39 @@
     IFD0         => 'UUID-EXIF',
     XMP          => 'UUID-XMP',
+   'UUID-IPTC'   => 'JP2',
+   'UUID-EXIF'   => 'JP2',
+   'UUID-XMP'    => 'JP2',
   # jp2h         => 'JP2',  (not yet functional)
   # ICC_Profile  => 'jp2h', (not yet functional)
@@ -61 +64 @@
 );
 
-# JPEG 2000 "box" (ie. segment) names
+# JPEG 2000 "box" (ie. atom) names
 %Image::ExifTool::Jpeg2000::Main = (
     GROUPS => { 2 => 'Image' },
@@ -73 +76 @@
    "jP\x1a\x1a" => 'JP2Signature', # (ref 2)
     prfl => 'Profile',
-    ftyp => { Name => 'FileType', Priority => 0 },
+    ftyp => {
+        Name => 'FileType',
+        SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::FileType' },
+    },
     rreq => 'ReaderRequirements',
     jp2h => {
@@ -192 +198 @@
                 ProcessProc => \&Image::ExifTool::ProcessTIFF,
                 WriteProc => \&Image::ExifTool::WriteTIFF,
+                DirName => 'EXIF',
                 Start => '$valuePtr + 16',
             },
@@ -274 +281 @@
             8 => 'JBIG2',
         },
+    },
+);
+
+# (ref fcd15444-1/2/6.pdf)
+# (also see http://developer.apple.com/mac/library/documentation/QuickTime/QTFF/QTFFChap1/qtff1.html)
+%Image::ExifTool::Jpeg2000::FileType = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Video' },
+    FORMAT => 'int32u',
+    0 => {
+        Name => 'MajorBrand',
+        Format => 'undef[4]',
+        PrintConv => {
+            'jp2 ' => 'JPEG 2000 Image (.JP2)',           # image/jp2
+            'jpm ' => 'JPEG 2000 Compound Image (.JPM)',  # image/jpm
+            'jpx ' => 'JPEG 2000 with extensions (.JPX)', # image/jpx
+        },
+    },
+    1 => {
+        Name => 'MinorVersion',
+        Format => 'undef[4]',
+        ValueConv => 'sprintf("%x.%x.%x", unpack("nCC", $val))',
+    },
+    2 => {
+        Name => 'CompatibleBrands',
+        Format => 'undef[$size-8]',
+        # ignore any entry with a null, and return others as a list
+        ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a', 
     },
 );
@@ -344 +379 @@
             my $tagTable = GetTagTable($$subdir{TagTable});
             my %dirInfo = (
-                DirName => $dirName,
+                DirName => $$subdir{DirName} || $dirName,
                 Parent => 'JP2',
             );
@@ -464 +499 @@
         if (defined $tagInfo and not $tagInfo) {
             # GetTagInfo() required the value for a Condition
-            my $tmpVal = substr($$dataPt, $valuePtr, $boxLen < 48 ? $boxLen : 48);
+            my $tmpVal = substr($$dataPt, $valuePtr, $boxLen < 128 ? $boxLen : 128);
             $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $boxID, \$tmpVal);
         }
@@ -497 +532 @@
                 DirStart => $subdirStart,
                 DirLen => $subdirLen,
-                DirName => $$tagInfo{Name},
+                DirName => $$subdir{DirName} || $$tagInfo{Name},
                 OutFile => $outfile,
                 Base => $dataPos + $subdirStart,
@@ -555 +590 @@
     my $raf = $$dirInfo{RAF};
     my $outfile = $$dirInfo{OutFile};
-    my $rtnVal = 0;
     my $hdr;
 
@@ -570 +604 @@
         $$exifTool{AddJp2Dirs} = \%addDirs;
     } else {
-        $exifTool->SetFileType();
+        my ($buff, $fileType);
+        # recognize JPX and JPM as unique types of JP2
+        if ($raf->Read($buff, 12) == 12 and $buff =~ /^.{4}ftyp(.{4})/s) {
+            $fileType = 'JPX' if $1 eq 'jpx ';
+            $fileType = 'JPM' if $1 eq 'jpm ';
+        }
+        $raf->Seek(-length($buff), 1) if defined $buff;
+        $exifTool->SetFileType($fileType);
     }
     SetByteOrder('MM'); # JPEG 2000 files are big-endian
@@ -601 +642 @@
 =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