exiftool_vendored 12.37.0 → 12.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b6a0d2fdfef75ff151b28b383281cd0e5cbff7b324c7529b5972eea00fa2ab
-  data.tar.gz: 15f2d5ff22bb9eebdbe7e843d61c8e60ae3cc17d50d212c59e05411baa221937
+  metadata.gz: 11f1787f2c127a865c214cd1180708242a072c13219978b737518a30ff123c88
+  data.tar.gz: 85f5ca776ddb9b2c60171ef608fe574a5eb94a5b723c5ab62ed50046b4f051d8
 SHA512:
-  metadata.gz: '05955adc090e482158e1c5e55f4aa6205434c9433e8b5369c45f4c030f59088e8efe5e91df54cf6cd44f973ad845e8436a958948ca2baa25bc1aea371a311d74'
-  data.tar.gz: 7a6c12e5f45dcd7efed082469de08ddb6e4eb21596f73f3c6abde5f6faf5318be5fe53e0f6aa6a88391f9e088d68c06682e042cd94f3f4f08656a6a2d76fa404
+  metadata.gz: 526d5db616ff1f9b5f42fece2a56b670810b0a0865ebf7161ac55f5567dab893f137fef4226475776280b17272a8fde9689c06c3057517f417e5accaa925b39c
+  data.tar.gz: 2345cf3345e75e7fbace25c2293ffecdc503c5b744c85b794febccc24322aac3a8c2f052d07dd50b921cceca67ad9c197c5e4ce87eccea4efeb99ab200919f41

data/bin/Changes

@@ -7,6 +7,17 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.30. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Dec. 20, 2021 - Version 12.38
+
+  - Decode a number of new tags for the Nikon Z9 (thanks Warren Hatch)
+  - Patched incorrect decoding of AEBShotCount for the Canon EOS 90D
+  - Patched EXR reader to support long tag names
+  - Patched security issue (thanks Joe Lothan)
+  - Fixed an incorrect tag ID for a new Nikon MakerNote tag (github #108)
+  - Fixed XMP-exif:GPSMeasureMode conversions to match EXIF
+  - Fixed problem where some namespaces may be undeclared in the -X output when
+    using the -struct option
+
 Dec. 8, 2021 - Version 12.37
 
   - Decode timed GPS from Vantrue S1 dashcam MP4 videos

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.37"
+   "version" : "12.38"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.37
+version: 12.38

data/bin/README

@@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.37.tar.gz | tar -xf -
-  cd Image-ExifTool-12.37
+  gzip -dc Image-ExifTool-12.38.tar.gz | tar -xf -
+  cd Image-ExifTool-12.38
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.37';
+my $version = '12.38';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -1969,6 +1969,7 @@ sub GetImageInfo($$)
             } else {
                 $pipe = qq{bzip2 -dc "$file" |};
             }
+            $$et{TRUST_PIPE} = 1;
         }
     }
     # evaluate -if expression for conditional processing
@@ -2239,12 +2240,13 @@ sub GetImageInfo($$)
                         next unless defined $forcePrint;
                         $grp0 = $grp1 = 'Unknown';
                     }
+                    # add groups from structure fields
+                    AddGroups($$info{$tag}, $grp0, \%groups, \@groups) if ref $$info{$tag};
                     next if $groups{$grp1};
                     # include family 0 and 1 groups in URI except for internal tags
                     # (this will put internal tags in the "XML" group on readback)
                     $groups{$grp1} = $grp0;
                     push @groups, $grp1;
-                    AddGroups($$info{$tag}, $grp0, \%groups, \@groups) if ref $$info{$tag};
                 }
                 foreach $grp1 (@groups) {
                     my $grp = $groups{$grp1};
@@ -5434,7 +5436,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.37 --
+    -- Generated by ExifTool 12.38 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -5716,7 +5718,7 @@ example, the following pairs of commands give the same result:
 4) Adding the B<-v> option to B<-W> sends a list of the tags and output file
 names to the console instead of giving a verbose dump of the entire file. 
 (Unless appending all output to one file for each source file by using
-B<-W+> with an output file I<FMT> that does not contain %t, $g, %s or %o.)
+B<-W+> with an output file I<FMT> that does not contain %t, %g, %s or %o.)
 
 5) Individual list items are stored in separate files when B<-W> is combined
 with B<-b>, but note that for separate files to be created %c or %C must be

data/bin/lib/Image/ExifTool/CanonCustom.pm

@@ -1290,9 +1290,19 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
         },
     },
     0x0106 => [{
+        Name => 'AEBShotCount',
+        Condition => '$$self{Model} =~ /\b90D\b/',
+        Notes => 'EOS 90D', # (and who knows what others?)
+        PrintConv => {
+            2 => '2 shots',
+            3 => '3 shots',
+            5 => '5 shots',
+            7 => '7 shots',
+        },
+    },{
         Name => 'AEBShotCount',
         Condition => '$count == 1',
-        Notes => 'one value for some models...',
+        Notes => 'other models storing a single value',
         PrintConv => {
             0 => '3 shots',
             1 => '2 shots',
@@ -1302,7 +1312,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
     },{
         Name => 'AEBShotCount',
         Count => 2,
-        Notes => 'two values for others',
+        Notes => 'models storing two values',
         PrintConv => {
             '3 0' => '3 shots',
             '2 1' => '2 shots',

data/bin/lib/Image/ExifTool/Nikon.pm

@@ -62,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '4.02';
+$VERSION = '4.03';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1067,6 +1067,21 @@ my %flashGroupOptionsMode = (
     3 => 'Off',
 );
 
+my %nefCompression = (   #28 relocated to MakerNotes_0x51 at offset x'0a (Z9)
+    1 => 'Lossy (type 1)', # (older models)
+    2 => 'Uncompressed', #JD - D100 (even though TIFF compression is set!)
+    3 => 'Lossless',
+    4 => 'Lossy (type 2)',
+    5 => 'Striped packed 12 bits', #IB
+    6 => 'Uncompressed (reduced to 12 bit)', #IB
+    7 => 'Unpacked 12 bits', #IB (padded to 16)
+    8 => 'Small', #IB
+    9 => 'Packed 12 bits', #IB (2 pixels in 3 bytes)
+    10 => 'Packed 14 bits', #28 (4 pixels in 7 bytes, eg. D6 uncompressed 14 bit)
+    13 => 'High Efficiency', #28
+    14 => 'High Efficiency*', #28
+);
+
 my %noYes = ( 0 => 'No' , 1 => 'Yes', );
 my %offOn = ( 0 => 'Off', 1 => 'On' );
 my %onOff = ( 0 => 'On',  1 => 'Off' );
@@ -1476,6 +1491,14 @@ my %binaryDataAttrs = (
         Name => 'ColorTemperatureAuto',
         Writable => 'int16u',
     },
+    0x0051 => { #28 (Z9)
+        Name => 'MakerNotes0x51',
+        Writable => 'undef',
+        Hidden => 1,
+        Permanent => 0,
+        Flags => [ 'Binary', 'Protected' ],
+        SubDirectory => { TagTable => 'Image::ExifTool::Nikon::MakerNotes0x51' },
+    },
     #0x0053 #28 possibly a secondary DistortionControl block (in addition to DistortInfo)?  Certainly offset 0x04 within block contains tag AutoDistortionControl for Z72 and D6  (1=>On; 2=> Off)
     #0x005e #28 possibly DiffractionCompensation block?  Certainly offset 0x04 within block contains tag DiffractionCompensation
     0x0080 => { Name => 'ImageAdjustment',  Writable => 'string' },
@@ -1900,6 +1923,16 @@ my %binaryDataAttrs = (
                 ByteOrder => 'LittleEndian',
             },
         },
+        { # (Z9 firmware version 1.00 ref 28)
+            Condition => '$$valPt =~ /^0805/',
+            Name => 'ShotInfoZ9',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ShotInfoZ9',
+                DecryptStart => 4,
+                DecryptLen => 0xeb5b + 1050,   # thru decoded parts of Offset27
+                ByteOrder => 'LittleEndian',
+            },
+        },
         { # D7100=0227, Z6/Z7=0800
             Condition => '$$valPt =~ /^0[28]/',
             Name => 'ShotInfo02xx',
@@ -1929,18 +1962,8 @@ my %binaryDataAttrs = (
     0x0093 => { #21
         Name => 'NEFCompression',
         Writable => 'int16u',
-        PrintConv => {
-            1 => 'Lossy (type 1)', # (older models)
-            2 => 'Uncompressed', #JD - D100 (even though TIFF compression is set!)
-            3 => 'Lossless',
-            4 => 'Lossy (type 2)',
-            5 => 'Striped packed 12 bits', #IB
-            6 => 'Uncompressed (reduced to 12 bit)', #IB
-            7 => 'Unpacked 12 bits', #IB (padded to 16)
-            8 => 'Small', #IB
-            9 => 'Packed 12 bits', #IB (2 pixels in 3 bytes)
-            10 => 'Packed 14 bits', #28 (4 pixels in 7 bytes, eg. D6 uncompressed 14 bit)
-        },
+        SeparateTable => 'NEFCompression',
+        PrintConv => \%nefCompression,
     },
     0x0094 => { Name => 'SaturationAdj',    Writable => 'int16s' },
     0x0095 => { Name => 'NoiseReduction',   Writable => 'string' }, # ("Off" or "FPNR"=long exposure NR)
@@ -7756,6 +7779,97 @@ my %nikonFocalConversions = (
     # note: DecryptLen currently set to 0xcea6 + 1050
 );
 
+# shot information for the Z9 firmware 1.00 (encrypted) - ref 28
+%Image::ExifTool::Nikon::ShotInfoZ9 = (
+    PROCESS_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+    WRITE_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    VARS => { ID_LABEL => 'Index' },
+    DATAMEMBER => [ 0x04, 0x0e, 0x18, 0x84, 0xeaea],
+    WRITABLE => 1,
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'These tags are extracted from encrypted data in images from the Z9.',
+    0x00 => {
+        Name => 'ShotInfoVersion',
+        Format => 'string[4]',
+        Writable => 0,
+    },
+    0x04 => {
+        Name => 'FirmwareVersion',
+        DataMember => 'FirmwareVersion',
+        Format => 'string[8]',
+        Writable => 0,
+        RawConv => '$$self{FirmwareVersion} = $val',
+    },
+    0x0e => {
+        Name => 'FirmwareVersion2',
+        Format => 'string[8]',
+        Writable => 0,
+        RawConv => '$$self{FirmwareVersion2} = $val',
+        Hidden => 1,
+    },
+    0x18 => {
+        Name => 'FirmwareVersion3',
+        Format => 'string[8]',
+        Writable => 0,
+        RawConv => '$$self{FirmwareVersion3} = $val',
+        Hidden => 1,
+    },
+    0x24 => {
+        Name => 'NumberOffsets', # number of entries in offset table.  offsets are from start of ShotInfo data.
+        DataMember => 'NumberOffsets',
+        Format => 'int32u',
+        Writable => 0,
+        Hidden => 1,
+    },
+    0x84 => {
+        Name => 'OrientationOffset',   #offset24 - length 108
+        DataMember => 'OrientationOffset',
+        Format => 'int32u',
+        Writable => 0,
+        Hidden => 1,
+        RawConv => '$$self{OrientationOffset} = $val || 0x10000000; undef', # (ignore if 0)
+    },
+    ### 0xce32 - OrientationInfo start (Z9 firmware 1.00)
+    0xeaea => {
+        Name => 'Hook1',
+        Hidden => 1,
+        RawConv => 'undef',
+        # account for variable location of OrientationInfo data
+        Hook => '$varSize = $$self{OrientationOffset} - 0xeaeb',
+    },
+
+    0xeaeb => {
+        Name => 'RollAngle',
+        Format => 'fixed32u',
+        Notes => 'converted to degrees of clockwise camera roll',
+        ValueConv => '$val <= 180 ? $val : $val - 360',
+        ValueConvInv => '$val >= 0 ? $val : $val + 360',
+        PrintConv => 'sprintf("%.1f", $val)',
+        PrintConvInv => '$val',
+    },
+    0xeaef => {
+        Name => 'PitchAngle',
+        Format => 'fixed32u',
+        Notes => 'converted to degrees of upward camera tilt',
+        ValueConv => '$val <= 180 ? $val : $val - 360',
+        ValueConvInv => '$val >= 0 ? $val : $val + 360',
+        PrintConv => 'sprintf("%.1f", $val)',
+        PrintConvInv => '$val',
+    },
+    0xeaf3 => {
+        Name => 'YawAngle',
+        Format => 'fixed32u',
+        Notes => 'the camera yaw angle when shooting in portrait orientation',
+        ValueConv => '$val <= 180 ? $val : $val - 360',
+        ValueConvInv => '$val >= 0 ? $val : $val + 360',
+        PrintConv => 'sprintf("%.1f", $val)',
+        PrintConvInv => '$val',
+    },
+    # note: DecryptLen currently set to 0xeb5b + 1050
+);
+
 %Image::ExifTool::Nikon::ZMenuSettings  = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8040,8 +8154,8 @@ my %nikonFocalConversions = (
         Unknown => 1,
         PrintConv => \%noYes
     },
-    5771 => {
-        Name => 'MovieDiffrationCompensation',
+    577 => {
+        Name => 'MovieDiffractionCompensation',
         Unknown => 1,
         PrintConv => \%offOn
     },
@@ -9466,6 +9580,25 @@ my %nikonFocalConversions = (
     },
 );
 
+# MakerNotes0x51 - compression info for Z9
+%Image::ExifTool::Nikon::MakerNotes0x51 = (
+    %binaryDataAttrs,
+    DATAMEMBER => [ 0 ],
+    GROUPS => { 0 => 'MakerNotes' },
+    0 => {
+        Name => 'FirmwareVersion',
+        Format => 'string[8]',
+        Writable => 0,
+        RawConv => '$$self{FirmwareVersion} = $val',
+    },
+    10 => {
+        Name => 'NEFCompression',
+        Writable => 'int16u',
+        SeparateTable => 'NEFCompression',
+        PrintConv => \%nefCompression,
+    },
+);
+
 # extra info found in IFD0 of NEF files (ref PH, Z6/Z7)
 %Image::ExifTool::Nikon::NEFInfo = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },

data/bin/lib/Image/ExifTool/OpenEXR.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -172,12 +172,13 @@ sub ProcessEXR($$)
     my $ver = unpack('x4V', $buff);
     $et->HandleTag($tagTablePtr, '_ver', $ver & 0xff);
     $et->HandleTag($tagTablePtr, '_lay', $ver & 0x200);
+    my $maxLen = ($ver & 0x400) ? 255 : 31;
 
     # extract attributes
     for (;;) {
         $raf->Read($buff, 68) or last;
         last if $buff =~ /^\0/;
-        unless ($buff =~ /^([^\0]{1,31})\0([^\0]{1,31})\0(.{4})/sg) {
+        unless ($buff =~ /^([^\0]{1,$maxLen})\0([^\0]{1,$maxLen})\0(.{4})/sg) {
             $et->Warn('EXR format error');
             last;
         }
@@ -189,6 +190,7 @@ sub ProcessEXR($$)
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
         unless ($tagInfo) {
             my $name = ucfirst $tag;
+            $name =~ s/([^a-zA-Z])([a-z])/$1\U$2/g; # capitalize first letter of each word
             $name =~ tr/-_a-zA-Z0-9//dc;
             if (length $name <= 1) {
                 if (length $name) {