exiftool_vendored 12.16.0 → 12.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e5f50165965c391eee5f2088b8220f437030d2c6f03f3f1af04df861f962f24
-  data.tar.gz: e9c7f8127928dfc92efcbe0e851dffeea05f6a97282497ff7a1e456c4802c9b6
+  metadata.gz: 282998369bb9233d2f181df0f59f292915623e97fba11993c01c310e533eb29f
+  data.tar.gz: fd371cfbcd5c85f4a8ab489cd9ee53f0a24dd3ac69a598d5d0a35a47a05853a9
 SHA512:
-  metadata.gz: 54b390d7d5dd0b4e8420b747301442137dba8efea7fb6fb3b509634560ac1f5845f5d8dfae09b35c8ce6793a13cdd88e8620068464437d97632f19fb567da837
-  data.tar.gz: c2f4c386d46378f95d080c67e9a06d8c0b4a8e48038aff3dda4dc3da32cfa280dd79f39ac85c15174dd6186a24e8093157ec2529944a72d19312f4a569806f77
+  metadata.gz: 0347af9fa9e87b8a4de28e8274cd5f00bbd75d78ffc0a340624da063681eae24385a46928848248b92a53ec3549010b269bd2216e5a8390f8da4bf727223ba86
+  data.tar.gz: becbc52e82c10df8e11c73460e711926d3e422d8e42af2c81bf94b4f1f511a7e68037e9e1601cda42964fe995bb8c54d79ecd2196a583a85941d748d749d18be

data/bin/Changes

@@ -7,6 +7,26 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.16. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Feb. 3, 2021 - Version 12.17
+
+  - Added a new Canon FocusMode value
+  - Added a new FujiFilm FilmMode value
+  - Added a number of new XMP-crs tags (thanks Herb)
+  - Decode a new H264 MDPM tag
+  - Allow non-conforming lower-case XMP boolean "true" and "false" values to be
+    written, but only when print conversion is disabled
+  - Improved Validate option to warn about non-capitalized boolean XMP values
+  - Improved logic for setting GPSLatitude/LongitudeRef values when writing
+  - Changed -json and -php options so the -a option is implied even without the
+    -g option
+  - Avoid extracting audio/video data from AVI videos when -ee -u is used
+  - Patched decoding of Canon ContinuousShootingSpeed for newer firmware
+    versions of the EOS-1DXmkIII
+  - Re-worked LensID patch of version 12.00 (github issue #51)
+  - Fixed a few typos in newly-added NikonSettings tags (thanks Herb)
+  - Fixed problem where group could not be specified for PNG-pHYs tags when
+    writing
+
 Jan. 21, 2021 - Version 12.16 (production release)
 
   - Extract another form of video subtitle text
@@ -14,6 +34,8 @@ Jan. 21, 2021 - Version 12.16 (production release)
     stream in MP4 files
   - Changed a Nikon FlashMode value
   - Fixed problem that caused a failed DPX test on Strawberry Perl
+  - API Changes:
+      - Enhanced ExtractEmbedded option
 
 Jan. 18, 2021 - Version 12.15 (production release)
 
@@ -220,7 +242,7 @@ July 27, 2020 - Version 12.02
   - Improved decoding of some Canon EOS 1DXmkIII custom functions
   - Allow integer QuickTime TrackNumber and DiskNumber values
   - Relax validity check of QuickTime:ContentCreateDate when writing with -n
-  - Removed "Com" from the start of some unknown ItemList tag names
+  - Removed "Com" from the start of some unknown QuickTime ItemList tag names
   - Patched CanonCustom decoding for bug in Canon EOS-1DX firmware
   - Changed QuickTime CleanAperture tags decode as signed rationals
 

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.16"
+   "version" : "12.17"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.16
+version: 12.17

data/bin/README

@@ -106,8 +106,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.16.tar.gz | tar -xf -
-  cd Image-ExifTool-12.16
+  gzip -dc Image-ExifTool-12.17.tar.gz | tar -xf -
+  cd Image-ExifTool-12.17
   ./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.16';
+my $version = '12.17';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -1264,7 +1264,7 @@ for (;;) {
     if (/^php$/i) {
         $json = 2;
         $html = $xml = 0;
-        $mt->Options(Duplicates=>1);
+        $mt->Options(Duplicates => 1);
         next;
     }
     if (/^z(ip)?$/i) {
@@ -1505,7 +1505,6 @@ if ($xml) {
         require Image::ExifTool::XMP if $json == 1;  # (for EncodeBase64)
     }
     $mt->Options(List => 1) unless $joinLists;
-    $mt->Options(Duplicates => 0) unless defined $showGroup;
     $showTagID = 'D' if $tabFormat and not $showTagID;
 } elsif ($structOpt) {
     $mt->Options(List => 1);
@@ -2304,7 +2303,7 @@ TAG:    foreach $tag (@foundTags) {
                 $group = $et->GetGroup($tag, $showGroup);
                 # look ahead to see if this tag may suppress a priority tag in
                 # the same group, and if so suppress this tag instead
-                next if $noDups and $tag =~ /^(.*?) ?\(/ and defined $$info{$1} and
+                next if $noDups and $tag =~ /^(.*?) \(/ and defined $$info{$1} and
                         $group eq $et->GetGroup($1, $showGroup);
                 $group = 'Unknown' if not $group and ($xml or $json or $csv);
                 if ($fp and not ($allGroup or $csv)) {
@@ -2327,6 +2326,9 @@ TAG:    foreach $tag (@foundTags) {
                     }
                     undef $group;   # undefine so we don't print it below
                 }
+            } elsif ($noDups) {
+                # don't allow duplicates, but avoid suppressing the priority tag
+                next if $tag =~ /^(.*?) \(/ and defined $$info{$1};
             }
 
             ++$lineCount;           # we are printing something meaningful
@@ -4917,7 +4919,7 @@ and the value is written to all possible groups/tags.  For example, the
 string form must be used in the following command since the intent is to set
 the value of all existing date/time tags from C<CreateDate>:
 
-    exiftool "-time:all<$createdate" -wm w FILE
+    exiftool '-time:all<$createdate' -wm w FILE
 
 =item B<-x> I<TAG> (B<-exclude>)
 
@@ -4943,7 +4945,7 @@ between images, but allows the metadata to be altered by editing the
 intermediate file (C<out.args> in this example):
 
     exiftool -args -G1 --filename --directory src.jpg > out.args
-    exiftool -@ out.args -sep ", " dst.jpg
+    exiftool -@ out.args -sep ', ' dst.jpg
 
 Note:  Be careful when copying information with this technique since it is
 easy to write tags which are normally considered "unsafe".  For instance,
@@ -5207,18 +5209,18 @@ JSON arrays unless B<-sep> is used.  By default XMP structures are flattened
 into individual tags in the JSON output, but the original structure may be
 preserved with the B<-struct> option (this also causes all list-type XMP
 tags to be output as JSON arrays, otherwise single-item lists would be
-output as simple strings).  The B<-a> option is implied if the B<-g> or
-B<-G> options are used, otherwise it is ignored and tags with identical
-JSON names are suppressed. (B<-g4> may be used to ensure that all tags have
-unique JSON names.)  Adding the B<-D> or B<-H> option changes tag values to
-JSON objects with "val" and "id" fields, and adding B<-l> adds a "desc"
-field, and a "num" field if the numerical value is different from the
-converted "val".  The B<-b> option may be added to output binary data,
-encoded in base64 if necessary (indicated by ASCII "base64:" as the first 7
-bytes of the value), and B<-t> may be added to include tag table information
-(see B<-t> for details).  The JSON output is UTF-8 regardless of any B<-L>
-or B<-charset> option setting, but the UTF-8 validation is disabled if a
-character set other than UTF-8 is specified.
+output as simple strings).  The B<-a> option is implied when B<-json> is
+used, but entries with identical JSON names are suppressed in the output. 
+(B<-G4> may be used to ensure that all tags have unique JSON names.)  Adding
+the B<-D> or B<-H> option changes tag values to JSON objects with "val" and
+"id" fields, and adding B<-l> adds a "desc" field, and a "num" field if the
+numerical value is different from the converted "val".  The B<-b> option may
+be added to output binary data, encoded in base64 if necessary (indicated by
+ASCII "base64:" as the first 7 bytes of the value), and B<-t> may be added
+to include tag table information (see B<-t> for details).  The JSON output
+is UTF-8 regardless of any B<-L> or B<-charset> option setting, but the
+UTF-8 validation is disabled if a character set other than UTF-8 is
+specified.
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
@@ -5367,7 +5369,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.16 --
+    -- Generated by ExifTool 12.17 --
     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
@@ -5527,18 +5529,18 @@ Notes:
 argument like C<%d%f.txt> is written as C<%%d%%f.txt>.
 
 2) If the argument for B<-w> does not contain a valid format code (eg. %f),
-then it is interpreted as a file extension.  It is not possible to specify a
-simple filename as an argument -- creating a single output file from
-multiple source files is typically done by shell redirection, ie)
+then it is interpreted as a file extension, but there are three different
+ways to create a single output file from multiple source files:
 
+    # 1. Shell redirection
     exiftool FILE1 FILE2 ... > out.txt
 
-But if necessary, an empty format code may be used to force the argument to
-be interpreted as a format string, and the same result may be obtained
-without the use of shell redirection:
-
+    # 2. With the -w option and a zero-width format code
     exiftool -w+! %0fout.txt FILE1 FILE2 ...
 
+    # 3. With the -W option (see the -W option below)
+    exiftool -W+! out.txt FILE1 FILE2 ...
+
 Advanced features:
 
 A substring of the original file name, directory or extension may be taken

data/bin/lib/Image/ExifTool.pm

@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '12.16';
+$VERSION = '12.17';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

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

@@ -310,9 +310,10 @@ C<integer> is a string of digits (possibly beginning with a '+' or '-'),
 C<real> is a floating point number, C<rational> is entered as a floating
 point number but stored as two C<integer> strings separated by a '/'
 character, C<date> is a date/time string entered in the format "YYYY:mm:dd
-HH:MM:SS[.ss][+/-HH:MM]", C<boolean> is either "True" or "False", C<struct>
-indicates a structured tag, and C<lang-alt> is a tag that supports alternate
-languages.
+HH:MM:SS[.ss][+/-HH:MM]", C<boolean> is either "True" or "False" (but "true"
+and "false" may be written as a ValueConv value for compatibility with
+non-conforming applications), C<struct> indicates a structured tag, and
+C<lang-alt> is a tag that supports alternate languages.
 
 When reading, C<struct> tags are extracted only if the L<Struct|../ExifTool.html#Struct> (-struct)
 option is used.  Otherwise the corresponding I<Flattened> tags, indicated by

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.42';
+$VERSION = '4.43';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -2128,6 +2128,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
            16 => 'Pan Focus', #PH
            # 137 - Single?
            256 => 'AF + MF', #PH (NC, EOS M)
+           257 => 'Live View', #forum12082
            512 => 'Movie Snap Focus', #48
            519 => 'Movie Servo AF', #PH (NC, EOS M)
         },

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

@@ -19,7 +19,7 @@ use Image::ExifTool qw(:DataAccess);
 use Image::ExifTool::Canon;
 use Image::ExifTool::Exif;
 
-$VERSION = '1.57';
+$VERSION = '1.58';
 
 sub ProcessCanonCustom($$$);
 sub ProcessCanonCustom2($$$);
@@ -2098,6 +2098,24 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
             '$val=~/(\d+)/ ? $1 : 0',
             '$val=~/(\d+)/ ? $1 : 0',
         ],
+    },{ # (1DXmkIII firmware 1.3)
+        Name => 'ContinuousShootingSpeed',
+        Condition => '$count == 5',
+        Count => 5,
+        PrintConv => [
+            '"Hi $val"',
+            '"Cont $val"',
+            '"Lo $val"',
+            '"Soft $val"',
+            '"Soft LS $val"',
+        ],
+        PrintConvInv => [
+            '$val=~/(\d+)/ ? $1 : 0',
+            '$val=~/(\d+)/ ? $1 : 0',
+            '$val=~/(\d+)/ ? $1 : 0',
+            '$val=~/(\d+)/ ? $1 : 0',
+            '$val=~/(\d+)/ ? $1 : 0',
+        ],
     },{ # others
         Name => 'ContinuousShootingSpeed',
         Count => 3,

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

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.31';
+$VERSION = '4.32';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -2560,6 +2560,7 @@ my %opcodeInfo = (
             5 => 'Color sequential area',
             7 => 'Trilinear',
             8 => 'Color sequential linear',
+            # 15 - used by DJI XT2
         },
     },
     0xa300 => {
@@ -4728,8 +4729,8 @@ my %subSecConv = (
     },
     LensID => {
         Groups => { 2 => 'Camera' },
+        Require => 'LensType',
         Desire => {
-            0 => 'LensType',
             1 => 'FocalLength',
             2 => 'MaxAperture',
             3 => 'MaxApertureValue',
@@ -4748,25 +4749,16 @@ my %subSecConv = (
             Applies only to LensType values with a lookup table.  May be configured
             by adding user-defined lenses
         },
-        # this LensID is only valid if the LensType has a PrintConv,
-        # or LensType or LensModel are the model name
+        # this LensID is only valid if the LensType has a PrintConv or is a model name
         RawConv => q{
             my $printConv = $$self{TAG_INFO}{LensType}{PrintConv};
-            return $val if ref $printConv eq 'HASH' or
-                (ref $printConv eq 'ARRAY' and ref $$printConv[0] eq 'HASH') or
-                (defined $val[0] and $val[0] =~ /(mm|\d\/F)/) or
-                (defined $val[6] and $val[6] =~ /(mm|\d\/F)/);
+            return $val if ref $printConv eq 'HASH' or (ref $printConv eq 'ARRAY' and
+                ref $$printConv[0] eq 'HASH') or $val[0] =~ /(mm|\d\/F)/;
             return undef;
         },
-        ValueConv => '$val[0] || $val[6]',
+        ValueConv => '$val',
         PrintConv => q{
             my $pcv;
-            # use LensModel ([6]) if LensType ([0]) is not populated
-            # (iPhone populates LensModel but not LensType)
-            if (not defined $val[0] and defined $val[6]) {
-                $val[0] = $val[6];
-                $prt[0] = $prt[6];
-            }
             # use LensType2 instead of LensType if available and valid (Sony E-mount lenses)
             # (0x8000 or greater; 0 for several older/3rd-party E-mount lenses)
             if (defined $val[9] and ($val[9] & 0x8000 or $val[9] == 0)) {
@@ -4794,6 +4786,30 @@ my %subSecConv = (
             return $lens;
         },
     },
+    'LensID-2' => {
+        Name => 'LensID',
+        Groups => { 2 => 'Camera' },
+        Desire => {
+            0 => 'LensModel',
+            1 => 'Lens',
+            2 => 'XMP-aux:LensID',
+            3 => 'Make',
+        },
+        Inhibit => {
+            4 => 'Composite:LensID',
+        },
+        RawConv => q{
+            return undef if defined $val[2] and defined $val[3];
+            return $val if defined $val[0] and $val[0] =~ /(mm|\d\/F)/;
+            return $val if defined $val[1] and $val[1] =~ /(mm|\d\/F)/;
+            return undef;
+        },
+        ValueConv => q{
+            return $val[0] if defined $val[0] and $val[0] =~ /(mm|\d\/F)/;
+            return $val[1];
+        },
+        PrintConv => '$_=$val; s/(\d)\/F/$1mm F/; s/mmF/mm F/; s/(\d) mm/${1}mm/; s/ - /-/; $_',
+    },
 );
 
 # table for unknown IFD entries

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.78';
+$VERSION = '1.79';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -623,6 +623,7 @@ my %faceCategories = (
             0x700 => 'Eterna', #12
             0x800 => 'Classic Negative', #forum10536
             0x900 => 'Bleach Bypass', #forum10890
+            0xa00 => 'Nostalgic Neg', #forum12085
         },
     },
     0x1402 => { #2

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.51';
+$VERSION = '1.52';
 
 my %coordConv = (
     ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
@@ -50,8 +50,8 @@ my %coordConv = (
             OTHER => sub {
                 my ($val, $inv) = @_;
                 return undef unless $inv;
-                return uc $1 if $val =~ /\b([NS])$/i;
-                return $1 eq '-' ? 'S' : 'N' if $val =~ /^([-+]?)\d+(\.\d*)?$/;
+                return uc $1 if $val =~ /\b([NS])\b/i;
+                return $1 eq '-' ? 'S' : 'N' if $val =~ /([-+]?)\d+/;
                 return undef;
             },
             N => 'North',
@@ -78,8 +78,8 @@ my %coordConv = (
             OTHER => sub {
                 my ($val, $inv) = @_;
                 return undef unless $inv;
-                return uc $1 if $val =~ /\b([EW])$/i;
-                return $1 eq '-' ? 'W' : 'E' if $val =~ /^([-+]?)\d+(\.\d*)?$/;
+                return uc $1 if $val =~ /\b([EW])\b/i;
+                return $1 eq '-' ? 'W' : 'E' if $val =~ /([-+]?)\d+/;
                 return undef;
             },
             E => 'East',

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

@@ -89,7 +89,7 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         Notes => 'hours:minutes:seconds:frames',
         ValueConv => 'sprintf("%.2x:%.2x:%.2x:%.2x",reverse unpack("C*",$val))',
     },
-    # 0x14 - TitleBinaryGroup
+    # 0x14 - TitleBinaryGroup - val: 0x00000000,0x14200130
     # 0x15 - TitleCassetteNo (ref 7)
     # 0x16-0x17 - TitleSoftID (ref 7)
     # (0x18,0x19 listed as TitleTextHeader/TitleText by ref 7)
@@ -134,8 +134,8 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         Name => 'Camera2',
         SubDirectory => { TagTable => 'Image::ExifTool::H264::Camera2' },
     },
-    # 0x73 Lens - val: 0x75ffffd3,0x0effffd3,0x59ffffd3,0x79ffffd3,0xffffffd3...
-    # 0x74 Gain
+    # 0x73 Lens - val: 0x04ffffd3,0x0effffd3,0x15ffffd3,0x41ffffd3,0x52ffffd3,0x59ffffd3,0x65ffffd3,0x71ffffd3,0x75ffffd3,0x79ffffd3,0x7fffffd3,0xffffffd3...
+    # 0x74 Gain - val: 0xb8ffff0f
     # 0x75 Pedestal
     # 0x76 Gamma
     # 0x77 Detail
@@ -376,34 +376,49 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         Notes => 'combined with tag 0xc8',
     },
     # 0xc9-0xcf - GPSOption
+    # 0xc9 - val: 0x001d0203
+    0xca => { #PH (Sony DSC-HX7V)
+        Name => 'GPSDateStamp',
+        Format => 'string',
+        Groups => { 1 => 'GPS', 2 => 'Time' },
+        Combine => 2,    # the next 2 tags contain the rest of the string
+        Notes => 'combined with tags 0xcb and 0xcc',
+        ValueConv => 'Image::ExifTool::Exif::ExifDate($val)',
+    },
     0xe0 => {
         Name => 'MakeModel',
         SubDirectory => { TagTable => 'Image::ExifTool::H264::MakeModel' },
     },
     # 0xe1-0xef - MakerOption
     # 0xe1 - val: 0x01000670,0x01000678,0x06ffffff,0x01ffffff,0x01000020,0x01000400...
-    # 0xe2-0xe8 - val: 0x00000000 in many samples
     0xe1 => { #6
         Name => 'RecInfo',
         Condition => '$$self{Make} eq "Canon"',
         Notes => 'Canon only',
         SubDirectory => { TagTable => 'Image::ExifTool::H264::RecInfo' },
     },
+    # 0xe2-0xe8 - val: 0x00000000 in many samples
+    # 0xe2 - val: 0x00000000,0x01000000,0x01010000,0x8080900c,0x8080a074
+    # 0xe3 - val: 0x00801f89,0x00801f8b,0x00c01f89,0xc9c01f80
     0xe4 => { #PH
         Name => 'Model',
         Condition => '$$self{Make} eq "Sony"', # (possibly also Canon models?)
         Description => 'Camera Model Name',
-        Notes => 'Sony cameras only, combined with tags 0xe5 and 0xe6',
+        Notes => 'Sony only, combined with tags 0xe5 and 0xe6',
         Format => 'string',
         Combine => 2, # (not sure about 0xe6, but include it just in case)
         RawConv => '$val eq "" ? undef : $val',
     },
+    # 0xeb - val: 0x008a0a00,0x0a300000,0x508a0a00,0x52880a00,0x528a0a00
+    # 0xec - val: 0x0b700000
+    # 0xed - val: 0x0ce0f819
     0xee => { #6 (HFS200)
         Name => 'FrameInfo',
         Condition => '$$self{Make} eq "Canon"',
         Notes => 'Canon only',
         SubDirectory => { TagTable => 'Image::ExifTool::H264::FrameInfo' },
     },
+    # 0xef - val: 0x01c00000,0x0e00000c
 );
 
 # ConsumerCamera1 information (ref PH)