exiftool_vendored 9.37.0 → 9.41.0

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/lib/Image/ExifTool/iWork.pm

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::ZIP;
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 # test for recognized iWork document extensions and outer XML elements
 my %iWorkType = (
@@ -81,25 +81,25 @@ sub GetTagID($)
 # Returns: 1 if valid tag was found
 sub FoundTag($$$$;$)
 {
-    my ($exifTool, $tagTablePtr, $props, $val, $attrs) = @_;
+    my ($et, $tagTablePtr, $props, $val, $attrs) = @_;
     return 0 unless @$props;
-    my $verbose = $exifTool->Options('Verbose');
+    my $verbose = $et->Options('Verbose');
 
-    $exifTool->VPrint(0, "  | - Tag '", join('/',@$props), "'\n") if $verbose > 1;
+    $et->VPrint(0, "  | - Tag '", join('/',@$props), "'\n") if $verbose > 1;
 
     # un-escape XML character entities
     $val = Image::ExifTool::XMP::UnescapeXML($val);
     # convert from UTF8 to ExifTool Charset
-    $val = $exifTool->Decode($val, 'UTF8');
+    $val = $et->Decode($val, 'UTF8');
     my $tag = GetTagID($props) or return 0;
 
     # add any unknown tags to table
     unless ($$tagTablePtr{$tag}) {
-        $exifTool->VPrint(0, "  [adding $tag]\n") if $verbose;
+        $et->VPrint(0, "  [adding $tag]\n") if $verbose;
         AddTagToTable($tagTablePtr, $tag, { Name => ucfirst $tag });
     }
     # save the tag
-    $exifTool->HandleTag($tagTablePtr, $tag, $val);
+    $et->HandleTag($tagTablePtr, $tag, $val);
 
     return 1;
 }
@@ -112,14 +112,14 @@ sub FoundTag($$$$;$)
 # as ZIP and the dirInfo hash contains a 'ZIP' Archive::Zip object reference
 sub Process_iWork($$)
 {
-    my ($exifTool, $dirInfo) = @_;
+    my ($et, $dirInfo) = @_;
     my $zip = $$dirInfo{ZIP};
     my ($type, $index, $indexFile, $status);
 
     # try to determine the file type
     local $SIG{'__WARN__'} = \&Image::ExifTool::ZIP::WarnProc;
     # trust type given by file extension if available
-    $type = $iWorkType{$$exifTool{FILE_EXT}} if $$exifTool{FILE_EXT};
+    $type = $iWorkType{$$et{FILE_EXT}} if $$et{FILE_EXT};
     unless ($type) {
         # read the index file
         my @members = $zip->membersMatching('^index\.(xml|apxl)$');
@@ -134,7 +134,7 @@ sub Process_iWork($$)
         }
         $type or $type = 'ZIP';     # assume ZIP by default
     }
-    $exifTool->SetFileType($type, $mimeType{$type});
+    $et->SetFileType($type, $mimeType{$type});
 
     my @members = $zip->members();
     my $docNum = 0;
@@ -143,10 +143,10 @@ sub Process_iWork($$)
         # get filename of this ZIP member
         my $file = $member->fileName();
         next unless defined $file;
-        $exifTool->VPrint(0, "File: $file\n");
+        $et->VPrint(0, "File: $file\n");
         # set the document number and extract ZIP tags
-        $$exifTool{DOC_NUM} = ++$docNum;
-        Image::ExifTool::ZIP::HandleMember($exifTool, $member);
+        $$et{DOC_NUM} = ++$docNum;
+        Image::ExifTool::ZIP::HandleMember($et, $member);
 
         # process only the index XML and JPEG thumbnail files
         next unless $file =~ m{^(index\.(xml|apxl)|QuickLook/Thumbnail\.jpg)$}i;
@@ -158,12 +158,12 @@ sub Process_iWork($$)
             $buffPt = \$index;
         } else {
             ($buff, $status) = $zip->contents($member);
-            $status and $exifTool->Warn("Error extracting $file"), next;
+            $status and $et->Warn("Error extracting $file"), next;
             $buffPt = \$buff;
         }
         # extract JPEG as PreviewImage (should only be QuickLook/Thumbnail.jpg)
         if ($file =~ /\.jpg$/) {
-            $exifTool->FoundTag('PreviewImage', $buffPt);
+            $et->FoundTag('PreviewImage', $buffPt);
             next;
         }
         # process "metadata" section of XML index file
@@ -182,10 +182,10 @@ sub Process_iWork($$)
             },
         );
         my $tagTablePtr = GetTagTable('Image::ExifTool::iWork::Main');
-        $exifTool->ProcessDirectory(\%dirInfo, $tagTablePtr);
+        $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
         undef $$buffPt; # (free memory now)
     }
-    delete $$exifTool{DOC_NUM};
+    delete $$et{DOC_NUM};
     return 1;
 }
 

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 9.37
+Version: 9.41
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl
@@ -22,38 +22,38 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  3G2   r     | ERF   r/w   | M4A/V r     | PBM   r/w   | RM    r
-  3GP   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
-  ACR   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
-  AFM   r     | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
-  AI    r/w   | F4A/V r     | MKA   r     | PFA   r     | SRW   r/w
-  AIFF  r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
-  APE   r     | FLA   r     | MKV   r     | PFM   r     | SWF   r
-  ARW   r/w   | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
-  ASF   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
-  AVI   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
-  BMP   r     | FPX   r     | MOV   r     | PICT  r     | TTC   r
-  BTF   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
-  CHM   r     | GZ    r     | MP4   r     | PNG   r/w   | VRD   r/w/c
-  COS   r     | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
-  CR2   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
-  CRW   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
-  CS1   r/w   | ICC   r/w/c | MQV   r     | PS    r/w   | WEBP  r
-  DCM   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
-  DCP   r/w   | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
-  DCR   r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
-  DFONT r     | INX   r     | NRW   r/w   | QTIF  r     | WV    r
-  DIVX  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
-  DJVU  r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
-  DLL   r     | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
-  DNG   r/w   | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
-  DOC   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
-  DOCX  r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
+  3FR   r     | EIP   r     | LNK   r     | PAC   r     | RWL   r/w
+  3G2   r/w   | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
+  3GP   r/w   | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
+  ACR   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
+  AFM   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
+  AI    r/w   | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
+  AIFF  r     | F4A/V r/w   | MKA   r     | PFA   r     | SRW   r/w
+  APE   r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
+  ARW   r/w   | FLA   r     | MKV   r     | PFM   r     | SWF   r
+  ASF   r     | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
+  AVI   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
+  BMP   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
+  BTF   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r
+  CHM   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
+  COS   r     | GZ    r     | MP4   r/w   | PNG   r/w   | VRD   r/w/c
+  CR2   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
+  CRW   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
+  CS1   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
+  DCM   r     | ICC   r/w/c | MQV   r/w   | PS    r/w   | WEBP  r
+  DCP   r/w   | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
+  DCR   r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
+  DFONT r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
+  DIVX  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WV    r
+  DJVU  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
+  DLL   r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
+  DNG   r/w   | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
+  DOC   r     | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
+  DOCX  r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
+  DPX   r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
   DV    r     | KDC   r     | OGV   r     | RSRC  r     |
-  DVB   r     | KEY   r     | ORF   r/w   | RTF   r     |
+  DVB   r/w   | KEY   r     | ORF   r/w   | RTF   r     |
   DYLIB r     | LA    r     | OTF   r     | RW2   r/w   |
-  EIP   r     | LNK   r     | PAC   r     | RWL   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/t/CanonRaw_4.out

@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.32
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.40
 [File, System, Image] FileName - File Name: CanonRaw_4_failed.crw
 [File, System, Image] Directory - Directory: t
 [File, System, Image] FileSize - File Size: 12 kB
-[File, System, Time] FileModifyDate - File Modification Date/Time: 2013:06:12 12:34:40-04:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2013:06:12 12:34:40-04:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2013:06:12 12:34:40-04:00
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2013:10:27 14:58:47-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2013:10:27 14:58:47-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2013:10:27 14:58:47-04:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: CRW
 [File, File, Image] MIMEType - MIME Type: image/x-canon-crw
@@ -140,10 +140,8 @@
 [MakerNotes, CanonRaw, Image] 3 - Raw Jpg Width: 2048
 [MakerNotes, CanonRaw, Image] 4 - Raw Jpg Height: 1360
 [MakerNotes, CanonRaw, Camera] 6203 - Serial Number Format: Format 1
-[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 9.32
+[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 9.40
 [XMP, XMP-aux, Camera] Lens - Lens: 18.0 - 55.0 mm
-[XMP, XMP-aux, Camera] OwnerName - Owner Name: Phil Harvey
-[XMP, XMP-aux, Camera] SerialNumber - Serial Number: 1234
 [XMP, XMP-dc, Image] description - Description: CRW with embedded XMP
 [XMP, XMP-exif, Image] ApertureValue - Aperture Value: 14.0
 [XMP, XMP-exif, Image] ColorSpace - Color Space: sRGB

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/t/Canon_2.out

@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.07
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.41
 [File, System, Image] FileName - File Name: Canon1DmkIII.jpg
 [File, System, Image] Directory - Directory: t/images
 [File, System, Image] FileSize - File Size: 8.1 kB
 [File, System, Time] FileModifyDate - File Modification Date/Time: 2008:01:18 14:10:05-05:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2012:11:20 07:47:34-05:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2012:11:17 09:18:25-05:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2013:11:14 08:40:57-05:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2013:11:11 12:05:21-05:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: JPEG
 [File, File, Image] MIMEType - MIME Type: image/jpeg
@@ -320,6 +320,7 @@
 [MakerNotes, Canon, Camera] 49 - Color Temp Kelvin: 5210
 [MakerNotes, Canon, Camera] 50 - WB RGGB Levels Flash: 2422 1024 1024 1295
 [MakerNotes, Canon, Camera] 54 - Color Temp Flash: 6777
+[MakerNotes, Canon, Camera] 231 - Average Black Level: 1024 1024 1024 1024
 [MakerNotes, Canon, Camera] 640 - Raw Measured RGGB: 294111 455756 464315 279659
 [MakerNotes, Canon, Camera] 16400 - Custom Picture Style File Name: 
 [MakerNotes, Canon, Camera] 1 - AF Micro Adj Mode: Disable

data/bin/Image-ExifTool-9.41/t/DPX.t

@@ -0,0 +1,28 @@
+# Before "make install", this script should be runnable with "make test".
+# After "make install" it should work as "perl t/DPX.t".
+
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+END {print "not ok 1\n" unless $loaded;}
+
+# test 1: Load the module(s)
+use Image::ExifTool 'ImageInfo';
+use Image::ExifTool::DPX;
+$loaded = 1;
+print "ok 1\n";
+
+use t::TestLib;
+
+my $testname = 'DPX';
+my $testnum = 1;
+
+# test 2: Extract information from DPX.dpx
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    my $info = $exifTool->ImageInfo('t/images/DPX.dpx');
+    print 'not ' unless check($exifTool, $info, $testname, $testnum);
+    print "ok $testnum\n";
+}
+
+
+# end

data/bin/Image-ExifTool-9.41/t/DPX_2.out

@@ -0,0 +1,35 @@
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.38
+[File, System, Image] FileName - File Name: DPX.dpx
+[File, System, Image] Directory - Directory: t/images
+[File, System, Image] FileSize - File Size: 2.0 kB
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2013:09:20 08:49:38-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2013:09:20 20:36:32-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2013:09:20 20:36:32-04:00
+[File, System, Image] FilePermissions - File Permissions: rw-r--r--
+[File, File, Image] FileType - File Type: DPX
+[File, File, Image] MIMEType - MIME Type: image/x-dpx
+[File, File, Image] 0 - Byte Order: Big-endian
+[File, File, Image] 8 - Header Version: V1.0
+[File, File, Image] 16 - DPX File Size: 12812288
+[File, File, Image] 20 - Ditto Key: New
+[File, File, Image] 36 - Image File Name: Image filename         
+[File, File, Time] 136 - Create Date: 2010:08:03 08:38:16
+[File, File, Author] 160 - Creator: Creator                
+[File, File, Image] 260 - Project: Project name           
+[File, File, Author] 460 - Copyright: Copyright info         
+[File, File, Image] 660 - Encryption Key: ffffffff
+[File, File, Image] 768 - Orientation: Horizontal (normal)
+[File, File, Image] 770 - Image Elements: 1
+[File, File, Image] 772 - Image Width: 2048
+[File, File, Image] 776 - Image Height: 1556
+[File, File, Image] 780 - Data Sign: Unsigned
+[File, File, Image] 803 - Bit Depth: 10
+[File, File, Image] 820 - Image Description: CPD
+[File, File, Image] 1432 - Source File Name: 
+[File, File, Image] 1532 - Source Create Date: 
+[File, File, Image] 1556 - Input Device Name: SPIRIT-4K DATACINE 
+[File, File, Image] 1588 - Input Device Serial Number: 01018
+[File, File, Image] 1732 - Frame ID: 
+[File, File, Image] 1764 - Slate Information: 
+[File, File, Image] 2048 - User ID: Thomson BTS        
+[Composite, Composite, Image] ImageSize - Image Size: 2048x1556