exiftool-vendored.pl 12.33.0 → 12.34.0

package/bin/Changes

@@ -7,6 +7,24 @@ 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.)
 
+Oct. 27, 2021 - Version 12.34
+
+  - Added support for ICC.2:2019 (Profile version 5.0.0 - iccMAX) color profiles
+  - Added ability to detect/delete a Windows Zone.Identifier alternate data
+    stream (ADS) via the new ZoneIdentifier tag
+  - Added support for the Sony ILCE-7M4 (thanks Jos Roost)
+  - Added a new Sony lens (thanks LibRaw and Jos Roost)
+  - Added a new SonyModelID (thanks LibRaw)
+  - Added a new Canon RF lens (thanks Norbert Wasser)
+  - Improved handling of some SVG files
+  - Patched -overwrite_original_in_place option to open the output file in
+    update mode rather than write mode (to allow some write optimizations on
+    certain filesystems)
+  - Fixed case of tag ID for new XMP-iptcExt:EventID (thanks Michael Steidl)
+  - Fixed problem extracting ICC_Profile information from some PDF files
+  - API Changes:
+      - Added QuickTimePad option
+
 Oct. 16, 2021 - Version 12.33
 
   - Added support for DNG version 1.6.0.0

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.33",
+   "version" : "12.34",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.33
+version: 12.34
 x_serialization_backend: 'JSON::PP version 4.02'

package/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.33.tar.gz | tar -xf -
-  cd Image-ExifTool-12.33
+  gzip -dc Image-ExifTool-12.34.tar.gz | tar -xf -
+  cd Image-ExifTool-12.34
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.33';
+my $version = '12.34';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -3061,12 +3061,14 @@ sub SetImageInfo($$$)
                         # temporarily disable CTRL-C during this critical operation
                         $critical = 1;
                         undef $tmpFile;     # handle deletion of temporary file ourself
-                        if ($et->Open(\*ORIG_FILE, $file, '>')) {
+                        if ($et->Open(\*ORIG_FILE, $file, '+<')) {
                             binmode(ORIG_FILE);
                             while (read(NEW_FILE, $buff, 65536)) {
                                 print ORIG_FILE $buff or $err = 1;
                             }
                             close(NEW_FILE);
+                            # Handle files being shorter than the original
+                            eval { truncate(ORIG_FILE, tell(ORIG_FILE)) } or $err = 1;
                             close(ORIG_FILE) or $err = 1;
                             if ($err) {
                                 Warn "Couldn't overwrite in place - $file\n";
@@ -5408,7 +5410,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.33 --
+    -- Generated by ExifTool 12.34 --
     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

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.45';
+$VERSION = '3.46';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -469,6 +469,11 @@ the PrintConv option is enabled and no time zone is specified.  This is
 because Apple software may display crazy values if the time zone is missing
 for some tags.
 
+By default ExifTool will remove null padding from some QuickTime containers
+in Canon CR3 files when writing, but the
+L<QuickTimePad|../ExifTool.html#QuickTimePad> option may be used to preserve
+the original size by padding with nulls if necessary.
+
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
 for the official specification.

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.52';
+$VERSION = '4.53';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -595,7 +595,10 @@ $VERSION = '4.52';
    '61182.21' => 'Canon RF 70-200mm F4L IS USM', #42
    '61182.22' => 'Canon RF 50mm F1.8 STM', #42
    '61182.23' => 'Canon RF 14-35mm F4L IS USM', #IB
-   '61182.24' => 'Canon RF 16mm F2.8 STM', #42
+   '61182.24' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
+   '61182.25' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
+   '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+   '61182.27' => 'Canon RF 16mm F2.8 STM', #42
   #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
@@ -6776,6 +6779,9 @@ my %ciMaxFocal = (
             278 => 'Canon RF 70-200mm F4L IS USM', #42
             280 => 'Canon RF 50mm F1.8 STM', #42
             281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
+            283 => 'Canon RF 100-400mm F5.6-8 IS USM', #42
+            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
+            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
             288 => 'Canon RF 16mm F2.8 STM', #42
            #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
@@ -8752,6 +8758,7 @@ my %filterConv = (
     #        --> ignored when reading, but offsets are updated when writing
     CMT1 => { # (CR3 files)
         Name => 'IFD0',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8760,6 +8767,7 @@ my %filterConv = (
     },
     CMT2 => { # (CR3 files)
         Name => 'ExifIFD',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8768,6 +8776,7 @@ my %filterConv = (
     },
     CMT3 => { # (CR3 files)
         Name => 'MakerNoteCanon',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
             ProcessProc => \&ProcessCMT3,
@@ -8776,6 +8785,7 @@ my %filterConv = (
     },
     CMT4 => { # (CR3 files)
         Name => 'GPSInfo',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::GPS::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8786,6 +8796,7 @@ my %filterConv = (
     THMB => {
         Name => 'ThumbnailImage',
         Groups => { 2 => 'Preview' },
+        PreservePadding => 1,
         RawConv => 'substr($val, 16)',
         Binary => 1,
     },
@@ -8800,6 +8811,7 @@ my %filterConv = (
     WRITE_PROC => 'Image::ExifTool::QuickTime::WriteQuickTime',
     CNOP => {
         Name => 'CanonVRD',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::CanonVRD::Main',
             WriteProc => 'Image::ExifTool::CanonVRD::WriteCanonDR4',

package/bin/lib/Image/ExifTool/Charset.pm

@@ -6,6 +6,8 @@
 # Revisions:    2009/08/28 - P. Harvey created
 #               2010/01/20 - P. Harvey complete re-write
 #               2010/07/16 - P. Harvey added UTF-16 support
+#
+# Notes:        Charset lookups are generated using my convertCharset script
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Charset;

package/bin/lib/Image/ExifTool/ICC_Profile.pm

@@ -11,6 +11,7 @@
 #               4) http://www.color.org/privatetag2007-01.pdf
 #               5) http://www.color.org/icc_specs2.xalter (approved revisions, 2010-07-16)
 #               6) Eef Vreeland private communication
+#               7) https://color.org/specification/ICC.2-2019.pdf
 #
 # Notes:        The ICC profile information is different: the format of each
 #               tag is embedded in the information instead of in the directory
@@ -24,7 +25,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.36';
+$VERSION = '1.37';
 
 sub ProcessICC($$);
 sub ProcessICC_Profile($$$);
@@ -52,6 +53,11 @@ my %profileClass = (
     abst => 'Abstract Profile',
     nmcl => 'NamedColor Profile',
     nkpf => 'Nikon Input Device Profile (NON-STANDARD!)', # (written by Nikon utilities)
+    # additions in v5 (ref 7)
+    cenc => 'ColorEncodingSpace Profile',
+   'mid '=> 'MultiplexIdentification Profile',
+    mlnk => 'MultiplexLink Profile',
+    mvis => 'MultiplexVisualization Profile',
 );
 my %manuSig = ( #6
     'NONE' => 'none',
@@ -539,6 +545,90 @@ my %manuSig = ( #6
         Binary => 1, # (NC)
     },
 
+    # new tags in v5 (ref 7)
+    A2B3 => 'AToB3',
+    A2M0 => 'AToM0',
+    B2A3 => 'BToA3',
+    bcp0 => 'BRDFColorimetricParameter3Tag',
+    bcp1 => 'BRDFColorimetricParam1',
+    bcp2 => 'BRDFColorimetricParam2',
+    bcp3 => 'BRDFColorimetricParam3',
+    bsp0 => 'BRDFSpectralParam0',
+    bsp1 => 'BRDFSpectralParam1',
+    bsp2 => 'BRDFSpectralParam2',
+    bsp3 => 'BRDFSpectralParam3',
+    bAB0 => 'BRDFAToB0',
+    bAB1 => 'BRDFAToB1',
+    bAB2 => 'BRDFAToB2',
+    bAB3 => 'BRDFAToB3',
+    bBA0 => 'BRDFBToA0',
+    bBA1 => 'BRDFBToA1',
+    bBA2 => 'BRDFBToA2',
+    bBA3 => 'BRDFBToA3',
+    bBD0 => 'BRDFBToD0',
+    bBD1 => 'BRDFBToD1',
+    bBD2 => 'BRDFBToD2',
+    bBD3 => 'BRDFBToD3',
+    bDB0 => 'BRDFDToB0',
+    bDB1 => 'BRDFDToB1',
+    bDB2 => 'BRDFDToB2',
+    bDB3 => 'BRDFDToB3',
+    bMB0 => 'BRDFMToB0',
+    bMB1 => 'BRDFMToB1',
+    bMB2 => 'BRDFMToB2',
+    bMB3 => 'BRDFMToB3',
+    bMS0 => 'BRDFMToS0',
+    bMS1 => 'BRDFMToS1',
+    bMS2 => 'BRDFMToS2',
+    bMS3 => 'BRDFMToS3',
+    dAB0 => 'DirectionalAToB0',
+    dAB1 => 'DirectionalAToB1',
+    dAB2 => 'DirectionalAToB2',
+    dAB3 => 'DirectionalAToB3',
+    dBA0 => 'DirectionalBToA0',
+    dBA1 => 'DirectionalBToA1',
+    dBA2 => 'DirectionalBToA2',
+    dBA3 => 'DirectionalBToA3',
+    dBD0 => 'DirectionalBToD0',
+    dBD1 => 'DirectionalBToD1',
+    dBD2 => 'DirectionalBToD2',
+    dBD3 => 'DirectionalBToD3',
+    dDB0 => 'DirectionalDToB0',
+    dDB1 => 'DirectionalDToB1',
+    dDB2 => 'DirectionalDToB2',
+    dDB3 => 'DirectionalDToB3',
+    gdb0 => 'GamutBoundaryDescription0',
+    gdb1 => 'GamutBoundaryDescription1',
+    gdb2 => 'GamutBoundaryDescription2',
+    gdb3 => 'GamutBoundaryDescription3',
+   'mdv '=> 'MultiplexDefaultValues',
+    mcta => 'MultiplixTypeArray',
+    minf => 'MeasurementInfo',
+    miin => 'MeasurementInputInfo',
+    M2A0 => 'MToA0',
+    M2B0 => 'MToB0',
+    M2B1 => 'MToB1',
+    M2B2 => 'MToB2',
+    M2B3 => 'MToB3',
+    M2S0 => 'MToS0',
+    M2S1 => 'MToS1',
+    M2S2 => 'MToS2',
+    M2S3 => 'MToS3',
+    cept => 'ColorEncodingParams',
+    csnm => 'ColorSpaceName',
+    cloo => 'ColorantOrderOut',
+    clio => 'ColorantInfoOut',
+    c2sp => 'CustomToStandardPcc',
+   'CxF '=> 'CXF',
+    nmcl => 'NamedColor',
+    psin => 'ProfileSequenceInfo',
+    rfnm => 'ReferenceName',
+    svcn => 'SpectralViewingConditions',
+    swpt => 'SpectralWhitePoint',
+    s2cp => 'StandardToCustomPcc',
+    smap => 'SurfaceMap',
+    # smwp ? (seen in some v5 samples)
+
     # the following entry represents the ICC profile header, and doesn't
     # exist as a tag in the directory.  It is only in this table to provide
     # a link so ExifTool can locate the header tags
@@ -850,7 +940,7 @@ sub FormatICCTag($$$)
     # dataType
     if ($type eq 'data' and $size >= 12) {
         my $form = Get32u($dataPt, $offset+8);
-        # format 0 is ASCII data
+        # format 0 is UTF-8 data
         $form == 0 and return substr($$dataPt, $offset+12, $size-12);
         # binary data and other data types treat as binary (ie. don't format)
     }
@@ -1022,7 +1112,7 @@ sub ValidateICC($)
     $profileClass{substr($$valPtr, 12, 4)} or $err = 'profile class';
     my $col = substr($$valPtr, 16, 4); # ColorSpaceData
     my $con = substr($$valPtr, 20, 4); # ConnectionSpace
-    my $match = '(XYZ |Lab |Luv |YCbr|Yxy |RGB |GRAY|HSV |HLS |CMYK|CMY |[2-9A-F]CLR)';
+    my $match = '(XYZ |Lab |Luv |YCbr|Yxy |RGB |GRAY|HSV |HLS |CMYK|CMY |[2-9A-F]CLR|nc..|\0{4})';
     $col =~ /$match/ or $err = 'color space';
     $con =~ /$match/ or $err = 'connection space';
     return $err ? "Invalid ICC profile (bad $err)" : undef;
@@ -1134,7 +1224,7 @@ sub ProcessICC_Profile($$$)
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
         # unknown tags aren't generated automatically by GetTagInfo()
         # if the tagID's aren't numeric, so we must do this manually:
-        if (not $tagInfo and $$et{OPTIONS}{Unknown}) {
+        if (not $tagInfo and ($$et{OPTIONS}{Unknown} or $verbose)) {
             $tagInfo = { Unknown => 1 };
             AddTagToTable($tagTablePtr, $tagID, $tagInfo);
         }
@@ -1277,6 +1367,8 @@ under the same terms as Perl itself.
 
 =item L<http://developer.apple.com/documentation/GraphicsImaging/Reference/ColorSync_Manager/ColorSync_Manager.pdf>
 
+=item L<https://color.org/specification/ICC.2-2019.pdf>
+
 =back
 
 =head1 SEE ALSO

package/bin/lib/Image/ExifTool/PDF.pm

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.53';
+$VERSION = '1.54';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -280,10 +280,12 @@ my %supportedFilter = (
         ConvertToDict => 1,
     },
     Cs1 => {
-        SubDirectory => { TagTable => 'Image::ExifTool::PDF::ICCBased' },
+        SubDirectory => { TagTable => 'Image::ExifTool::PDF::DefaultRGB' },
+        ConvertToDict => 1, # (just in case)
     },
     CS0 => {
-        SubDirectory => { TagTable => 'Image::ExifTool::PDF::ICCBased' },
+        SubDirectory => { TagTable => 'Image::ExifTool::PDF::DefaultRGB' },
+        ConvertToDict => 1, # (just in case)
     },
 );
 

package/bin/lib/Image/ExifTool/QuickTime.pm

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.70';
+$VERSION = '2.71';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -558,6 +558,7 @@ my %eeBox2 = (
             # *** this is where ExifTool writes XMP in MP4 videos (as per XMP spec) ***
             Condition => '$$valPt=~/^\xbe\x7a\xcf\xcb\x97\xa9\x42\xe8\x9c\x71\x99\x94\x91\xe3\xaf\xac/',
             WriteGroup => 'XMP',    # (write main XMP tags here)
+            PreservePadding => 1,
             SubDirectory => {
                 TagTable => 'Image::ExifTool::XMP::Main',
                 Start => 16,
@@ -607,6 +608,7 @@ my %eeBox2 = (
             Name => 'PreviewImage',
             Condition => '$$valPt=~/^\xea\xf4\x2b\x5e\x1c\x98\x4b\x88\xb9\xfb\xb7\xdc\x40\x6e\x4d\x16/',
             Groups => { 2 => 'Preview' },
+            PreservePadding => 1,
             # 0x00 - undef[16]: UUID
             # 0x10 - int32u[2]: "0 1" (version and/or item count?)
             # 0x18 - int32u: PRVW atom size
@@ -9425,7 +9427,7 @@ ItemID:         foreach $id (keys %$items) {
                     for (;;) {
                         last if $pos + 16 > $size;
                         my ($len, $type, $flags, $ctry, $lang) = unpack("x${pos}Na4Nnn", $val);
-                        last if $pos + $len > $size;
+                        last if $pos + $len > $size or not $len;
                         my ($value, $langInfo, $oldDir);
                         my $format = $$tagInfo{Format};
                         if ($type eq 'data' and $len >= 16) {

package/bin/lib/Image/ExifTool/README

@@ -450,6 +450,10 @@ numerical, and generated automatically otherwise.
                   may be written if the tag already exists.  By default, all
                   MakerNotes tags are permanent unless otherwise specified.
 
+                  'PreservePadding' - [QuickTime only] flag to preserve the
+                  original size of the QuickTime atom by padding with nulls when
+                  writing with the QuickTimePad option.
+
                   'PrintHex' - specifies that unknown PrintConv values should
                   be printed in hex (eg. 'Unknown (0x1)').  Also causes
                   numerical tag values to be printed in hex in the HTML tag name

package/bin/lib/Image/ExifTool/Sony.pm

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.46';
+$VERSION = '3.47';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -241,7 +241,8 @@ sub PrintInvLensSpec($;$$);
     50528 => 'Sigma 35mm F1.4 DG DN | A', #IB/JR (021)
     50529 => 'Sigma 90mm F2.8 DG DN | C', #JR (021)
     50530 => 'Sigma 24mm F2 DG DN | C', #JR (021)
-
+    50531 => 'Sigma 18-50mm F2.8 DC DN | C', #IB/JR (021)
+ 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
     50994 => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB
@@ -1580,6 +1581,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             65535 => 'n/a',
         },
     },
+# 0x203a - 0x2041: first seen October 2021 for ILCE-7M4
     0x3000 => {
         Name => 'ShotInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::ShotInfo' },
@@ -1608,7 +1610,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     # from mid-2015: ILCE-7RM2/7SM2/6300 and newer models use different offsets
     {
         Name => 'Tag9050a',
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(1|6100|6300|6400|6500|6600|7C|7M3|7RM2|7RM3A?|7RM4A?|7SM2|7SM3|9|9M2)|ILCA-99M2|ILME-FX3|ZV-)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(1|6100|6300|6400|6500|6600|7C|7M3|7M4|7RM2|7RM3A?|7RM4A?|7SM2|7SM3|9|9M2)|ILCA-99M2|ILME-FX3|ZV-)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050a',
             ByteOrder => 'LittleEndian',
@@ -1622,7 +1624,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         },
     },{
         Name => 'Tag9050c',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050c',
             ByteOrder => 'LittleEndian',
@@ -2032,6 +2034,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             385 => 'ILME-FX3', #JR
             386 => 'ILCE-7RM3A', #JR
             387 => 'ILCE-7RM4A', #forum12542
+            388 => 'ILCE-7M4', #IB/JR
         },
     },
     0xb020 => { #2
@@ -7954,7 +7957,7 @@ my %isoSetting2010 = (
     },
     0x0088 => {
         Name => 'InternalSerialNumber', #(NC)
-        Condition => '$$self{Model} =~ /^(ILCE-7SM3|ILME-FX3)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7M4|7SM3)|ILME-FX3)/',
         Format => 'int8u[6]',
         PrintConv => 'unpack "H*", pack "C*", split " ", $val',
     },
@@ -8192,7 +8195,7 @@ my %isoSetting2010 = (
     },
     0x002a => [{
         Name => 'Quality2',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
         PrintConv => {
             0 => 'JPEG',
             1 => 'RAW',
@@ -8201,7 +8204,7 @@ my %isoSetting2010 = (
         },
     },{
         Name => 'Quality2',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
         PrintConv => {
             1 => 'JPEG',
             2 => 'RAW',
@@ -8212,13 +8215,13 @@ my %isoSetting2010 = (
     }],
     0x0047 => {
         Name => 'SonyImageHeight',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
         Format => 'int16u',
         PrintConv => '$val > 0 ? 8*$val : "n.a."',
     },
     0x0053 => {
         Name => 'ModelReleaseYear',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
         Format => 'int8u',
         PrintConv => 'sprintf("20%.2d", $val)',
     },
@@ -8233,10 +8236,11 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x0498, 0x04a1, 0x04a2, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x0498, 0x049d, 0x04a1, 0x04a2, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x04a2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(152|154|155)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x059d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(144|146)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
@@ -9505,7 +9509,7 @@ my %isoSetting2010 = (
     WRITE_PROC => \&WriteEnciphered,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
-    NOTES => 'Valid for the ILCE-1/7SM3, ILME-FX3.',
+    NOTES => 'Valid for the ILCE-1/7M4/7SM3, ILME-FX3.',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0000 => { Name => 'Tag9416_0000', PrintConv => 'sprintf("%3d",$val)', RawConv => '$$self{TagVersion} = $val' },
@@ -9632,10 +9636,22 @@ my %isoSetting2010 = (
     },
     0x088f => {
         Name => 'VignettingCorrParams',
+        Condition => '$$self{Model} !~ /^(ILCE-7M4)/',
+        Format => 'int16s[16]',
+    },
+    0x0891 => {
+        Name => 'VignettingCorrParams',
+        Condition => '$$self{Model} =~ /^(ILCE-7M4)/',
         Format => 'int16s[16]',
     },
     0x0914 => {
         Name => 'ChromaticAberrationCorrParams',
+        Condition => '$$self{Model} !~ /^(ILCE-7M4)/',
+        Format => 'int16s[32]',
+    },
+    0x0916 => {
+        Name => 'ChromaticAberrationCorrParams',
+        Condition => '$$self{Model} =~ /^(ILCE-7M4)/',
         Format => 'int16s[32]',
     },
 );

package/bin/lib/Image/ExifTool/TagLookup.pm

@@ -2345,7 +2345,7 @@ my %tagLookup = (
 	'eventfieldnotes' => { 116 => [\'Event','EventFieldNotes'] },
 	'eventfieldnumber' => { 116 => [\'Event','EventFieldNumber'] },
 	'eventhabitat' => { 116 => [\'Event','EventHabitat'] },
-	'eventid' => { 116 => [\'Event','EventEventID'], 480 => 'EventID' },
+	'eventid' => { 116 => [\'Event','EventEventID'], 480 => 'EventId' },
 	'eventlatestdate' => { 116 => [\'Event','EventLatestDate'] },
 	'eventmonth' => { 116 => [\'Event','EventMonth'] },
 	'eventnumber' => { 372 => 0x9, 373 => 0x37, 374 => 0x3a },
@@ -6431,6 +6431,7 @@ my %tagLookup = (
 	'yield' => { 486 => 'yield' },
 	'yposition' => { 117 => 0x11f },
 	'yresolution' => { 117 => 0x11b, 132 => 0x5, 361 => 0x4, 490 => 'YResolution' },
+	'zoneidentifier' => { 118 => 'ZoneIdentifier' },
 	'zonematching' => { 183 => 0x10a, 186 => [0x3a,0x4a], 411 => 0xb024 },
 	'zonematchingmode' => { 181 => 0x14 },
 	'zonematchingon' => { 180 => 0x75 },
@@ -6657,6 +6658,8 @@ my %tagExists = (
 	'atob0' => 1,
 	'atob1' => 1,
 	'atob2' => 1,
+	'atob3' => 1,
+	'atom0' => 1,
 	'atsccontent' => 1,
 	'attachments' => 1,
 	'attitude' => 1,
@@ -6896,6 +6899,38 @@ my %tagExists = (
 	'brain' => 1,
 	'brandingimageid' => 1,
 	'brandingname' => 1,
+	'brdfatob0' => 1,
+	'brdfatob1' => 1,
+	'brdfatob2' => 1,
+	'brdfatob3' => 1,
+	'brdfbtoa0' => 1,
+	'brdfbtoa1' => 1,
+	'brdfbtoa2' => 1,
+	'brdfbtoa3' => 1,
+	'brdfbtod0' => 1,
+	'brdfbtod1' => 1,
+	'brdfbtod2' => 1,
+	'brdfbtod3' => 1,
+	'brdfcolorimetricparam1' => 1,
+	'brdfcolorimetricparam2' => 1,
+	'brdfcolorimetricparam3' => 1,
+	'brdfcolorimetricparameter3tag' => 1,
+	'brdfdtob0' => 1,
+	'brdfdtob1' => 1,
+	'brdfdtob2' => 1,
+	'brdfdtob3' => 1,
+	'brdfmtob0' => 1,
+	'brdfmtob1' => 1,
+	'brdfmtob2' => 1,
+	'brdfmtob3' => 1,
+	'brdfmtos0' => 1,
+	'brdfmtos1' => 1,
+	'brdfmtos2' => 1,
+	'brdfmtos3' => 1,
+	'brdfspectralparam0' => 1,
+	'brdfspectralparam1' => 1,
+	'brdfspectralparam2' => 1,
+	'brdfspectralparam3' => 1,
 	'breakchar' => 1,
 	'brightdefectintegrationms' => 1,
 	'brightdefectisocode' => 1,
@@ -6908,6 +6943,7 @@ my %tagExists = (
 	'btoa0' => 1,
 	'btoa1' => 1,
 	'btoa2' => 1,
+	'btoa3' => 1,
 	'btod0' => 1,
 	'btod1' => 1,
 	'btod2' => 1,
@@ -7241,7 +7277,9 @@ my %tagExists = (
 	'colorant3coordinates' => 1,
 	'colorant3name' => 1,
 	'colorantcount' => 1,
+	'colorantinfoout' => 1,
 	'colorantorder' => 1,
+	'colorantorderout' => 1,
 	'coloranttable' => 1,
 	'coloranttableout' => 1,
 	'coloraverages' => 1,
@@ -7280,6 +7318,7 @@ my %tagExists = (
 	'colordata8' => 1,
 	'colordata9' => 1,
 	'colordataunknown' => 1,
+	'colorencodingparams' => 1,
 	'colorgroup' => 1,
 	'colorhalftoninginfo' => 1,
 	'colorimetricintentimagestate' => 1,
@@ -7301,6 +7340,7 @@ my %tagExists = (
 	'colorsamplersresource2' => 1,
 	'colorsetup' => 1,
 	'colorspacedata' => 1,
+	'colorspacename' => 1,
 	'colorspecapproximation' => 1,
 	'colorspecdata' => 1,
 	'colorspecification' => 1,
@@ -7518,6 +7558,8 @@ my %tagExists = (
 	'customsettingsd810' => 1,
 	'customsettingsd850' => 1,
 	'customsettingsd90' => 1,
+	'customtostandardpcc' => 1,
+	'cxf' => 1,
 	'd-lightinghqdata' => 1,
 	'd-lightinghsdata' => 1,
 	'd2' => 1,
@@ -7681,6 +7723,22 @@ my %tagExists = (
 	'digitalimagebroker' => 1,
 	'digitalsignature' => 1,
 	'dimensions' => 1,
+	'directionalatob0' => 1,
+	'directionalatob1' => 1,
+	'directionalatob2' => 1,
+	'directionalatob3' => 1,
+	'directionalbtoa0' => 1,
+	'directionalbtoa1' => 1,
+	'directionalbtoa2' => 1,
+	'directionalbtoa3' => 1,
+	'directionalbtod0' => 1,
+	'directionalbtod1' => 1,
+	'directionalbtod2' => 1,
+	'directionalbtod3' => 1,
+	'directionaldtob0' => 1,
+	'directionaldtob1' => 1,
+	'directionaldtob2' => 1,
+	'directionaldtob3' => 1,
 	'directors' => 1,
 	'disableflagspresent' => 1,
 	'discardobjects' => 1,
@@ -8250,6 +8308,10 @@ my %tagExists = (
 	'gammared' => 1,
 	'gammatable' => 1,
 	'gamut' => 1,
+	'gamutboundarydescription0' => 1,
+	'gamutboundarydescription1' => 1,
+	'gamutboundarydescription2' => 1,
+	'gamutboundarydescription3' => 1,
 	'gapless' => 1,
 	'gaudio' => 1,
 	'gaussianweights' => 1,
@@ -9239,6 +9301,7 @@ my %tagExists = (
 	'measurementgeometry' => 1,
 	'measurementilluminant' => 1,
 	'measurementinfo' => 1,
+	'measurementinputinfo' => 1,
 	'measurementobserver' => 1,
 	'measurementscale' => 1,
 	'mebx' => 1,
@@ -9420,9 +9483,20 @@ my %tagExists = (
 	'msdocumenttextposition' => 1,
 	'mspropertysetstorage' => 1,
 	'msstereo' => 1,
+	'mtoa0' => 1,
+	'mtob0' => 1,
+	'mtob1' => 1,
+	'mtob2' => 1,
+	'mtob3' => 1,
+	'mtos0' => 1,
+	'mtos1' => 1,
+	'mtos2' => 1,
+	'mtos3' => 1,
 	'multiexp' => 1,
 	'multiexposureversion' => 1,
 	'multimediatype' => 1,
+	'multiplexdefaultvalues' => 1,
+	'multiplixtypearray' => 1,
 	'multiprofiles' => 1,
 	'multiquality' => 1,
 	'multishoton' => 1,
@@ -9991,6 +10065,7 @@ my %tagExists = (
 	'profileifd' => 1,
 	'profilesequencedesc' => 1,
 	'profilesequenceidentifier' => 1,
+	'profilesequenceinfo' => 1,
 	'profilesize' => 1,
 	'profileversion' => 1,
 	'progid' => 1,
@@ -10195,6 +10270,7 @@ my %tagExists = (
 	'reelnumber' => 1,
 	'reeltimecode' => 1,
 	'reference' => 1,
+	'referencename' => 1,
 	'referencetemperature' => 1,
 	'reflectedapparenttemperature' => 1,
 	'reflection' => 1,
@@ -10632,6 +10708,8 @@ my %tagExists = (
 	'specialeffectsopticalfilter' => 1,
 	'specialfolderdata' => 1,
 	'specificationversion' => 1,
+	'spectralviewingconditions' => 1,
+	'spectralwhitepoint' => 1,
 	'speed' => 1,
 	'sphericalvideo' => 1,
 	'sphericalvideoxml' => 1,
@@ -10652,6 +10730,7 @@ my %tagExists = (
 	'srgbrendering' => 1,
 	'stampinfo' => 1,
 	'stamptoolcount' => 1,
+	'standardtocustompcc' => 1,
 	'standbymonitorofftime' => 1,
 	'starring' => 1,
 	'startdate' => 1,
@@ -10775,6 +10854,7 @@ my %tagExists = (
 	'suggestedpalette' => 1,
 	'summary' => 1,
 	'summaryinfo' => 1,
+	'surfacemap' => 1,
 	'surroundmode' => 1,
 	'surroundshotvideo' => 1,
 	'surroundshotvideoname' => 1,

package/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 24363 tags, with 15798 unique tag names.
+They contain a total of 24447 tags, with 15878 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -3161,8 +3161,8 @@ These tags belong to the ExifTool XMP-exif family 1 group.
 
 =head3 XMP exifEX Tags
 
-EXIF tags added by the EXIF 2.31 for XMP specification (see
-L<http://www.cipa.jp/std/documents/e/DC-X010-2017.pdf>).
+EXIF tags added by the EXIF 2.32 for XMP specification (see
+L<https://cipa.jp/std/documents/download_e.html?DC-010-2020_E>).
 
 These tags belong to the ExifTool XMP-exifEX family 1 group.
 
@@ -5569,32 +5569,98 @@ specification.
   'A2B0'   AToB0                                no
   'A2B1'   AToB1                                no
   'A2B2'   AToB2                                no
+  'A2B3'   AToB3                                no
+  'A2M0'   AToM0                                no
   'B2A0'   BToA0                                no
   'B2A1'   BToA1                                no
   'B2A2'   BToA2                                no
+  'B2A3'   BToA3                                no
   'B2D0'   BToD0                                no
   'B2D1'   BToD1                                no
   'B2D2'   BToD2                                no
   'B2D3'   BToD3                                no
+  'CxF '   CXF                                  no
   'D2B0'   DToB0                                no
   'D2B1'   DToB1                                no
   'D2B2'   DToB2                                no
   'D2B3'   DToB3                                no
   'Header' ProfileHeader                        ICC_Profile Header
+  'M2A0'   MToA0                                no
+  'M2B0'   MToB0                                no
+  'M2B1'   MToB1                                no
+  'M2B2'   MToB2                                no
+  'M2B3'   MToB3                                no
+  'M2S0'   MToS0                                no
+  'M2S1'   MToS1                                no
+  'M2S2'   MToS2                                no
+  'M2S3'   MToS3                                no
   'MS00'   WCSProfiles                          no
+  'bAB0'   BRDFAToB0                            no
+  'bAB1'   BRDFAToB1                            no
+  'bAB2'   BRDFAToB2                            no
+  'bAB3'   BRDFAToB3                            no
+  'bBA0'   BRDFBToA0                            no
+  'bBA1'   BRDFBToA1                            no
+  'bBA2'   BRDFBToA2                            no
+  'bBA3'   BRDFBToA3                            no
+  'bBD0'   BRDFBToD0                            no
+  'bBD1'   BRDFBToD1                            no
+  'bBD2'   BRDFBToD2                            no
+  'bBD3'   BRDFBToD3                            no
+  'bDB0'   BRDFDToB0                            no
+  'bDB1'   BRDFDToB1                            no
+  'bDB2'   BRDFDToB2                            no
+  'bDB3'   BRDFDToB3                            no
+  'bMB0'   BRDFMToB0                            no
+  'bMB1'   BRDFMToB1                            no
+  'bMB2'   BRDFMToB2                            no
+  'bMB3'   BRDFMToB3                            no
+  'bMS0'   BRDFMToS0                            no
+  'bMS1'   BRDFMToS1                            no
+  'bMS2'   BRDFMToS2                            no
+  'bMS3'   BRDFMToS3                            no
   'bTRC'   BlueTRC                              no
   'bXYZ'   BlueMatrixColumn                     no
+  'bcp0'   BRDFColorimetricParameter3Tag        no
+  'bcp1'   BRDFColorimetricParam1               no
+  'bcp2'   BRDFColorimetricParam2               no
+  'bcp3'   BRDFColorimetricParam3               no
   'bfd '   UCRBG                                no
   'bkpt'   MediaBlackPoint                      no
+  'bsp0'   BRDFSpectralParam0                   no
+  'bsp1'   BRDFSpectralParam1                   no
+  'bsp2'   BRDFSpectralParam2                   no
+  'bsp3'   BRDFSpectralParam3                   no
+  'c2sp'   CustomToStandardPcc                  no
   'calt'   CalibrationDateTime                  no
+  'cept'   ColorEncodingParams                  no
   'chad'   ChromaticAdaptation                  no
   'chrm'   Chromaticity                         ICC_Profile Chromaticity
   'ciis'   ColorimetricIntentImageState         no
+  'clio'   ColorantInfoOut                      no
+  'cloo'   ColorantOrderOut                     no
   'clot'   ColorantTableOut                     no
   'clro'   ColorantOrder                        no
   'clrt'   ColorantTable                        ICC_Profile ColorantTable
   'cprt'   ProfileCopyright                     no
   'crdi'   CRDInfo                              no
+  'csnm'   ColorSpaceName                       no
+  'dAB0'   DirectionalAToB0                     no
+  'dAB1'   DirectionalAToB1                     no
+  'dAB2'   DirectionalAToB2                     no
+  'dAB3'   DirectionalAToB3                     no
+  'dBA0'   DirectionalBToA0                     no
+  'dBA1'   DirectionalBToA1                     no
+  'dBA2'   DirectionalBToA2                     no
+  'dBA3'   DirectionalBToA3                     no
+  'dBD0'   DirectionalBToD0                     no
+  'dBD1'   DirectionalBToD1                     no
+  'dBD2'   DirectionalBToD2                     no
+  'dBD3'   DirectionalBToD3                     no
+  'dDB0'   DirectionalDToB0                     no
+  'dDB1'   DirectionalDToB1                     no
+  'dDB2'   DirectionalDToB2                     no
+  'dDB3'   DirectionalDToB3                     no
   'desc'   ProfileDescription                   no
   'devs'   DeviceSettings                       no
   'dmdd'   DeviceModelDesc                      no
@@ -5604,14 +5670,23 @@ specification.
   'gTRC'   GreenTRC                             no
   'gXYZ'   GreenMatrixColumn                    no
   'gamt'   Gamut                                no
+  'gdb0'   GamutBoundaryDescription0            no
+  'gdb1'   GamutBoundaryDescription1            no
+  'gdb2'   GamutBoundaryDescription2            no
+  'gdb3'   GamutBoundaryDescription3            no
   'kTRC'   GrayTRC                              no
   'lumi'   Luminance                            no
+  'mcta'   MultiplixTypeArray                   no
+  'mdv '   MultiplexDefaultValues               no
   'meas'   Measurement                          ICC_Profile Measurement
   'meta'   Metadata                             ICC_Profile Metadata
+  'miin'   MeasurementInputInfo                 no
+  'minf'   MeasurementInfo                      no
   'mmod'   MakeAndModel                         no
   'ncl2'   NamedColor2                          no
   'ncol'   NamedColor                           no
   'ndin'   NativeDisplayInfo                    no
+  'nmcl'   NamedColor                           no
   'pre0'   Preview0                             no
   'pre1'   Preview1                             no
   'pre2'   Preview2                             no
@@ -5623,18 +5698,24 @@ specification.
   'psd3'   PostScript2CRD3                      no
   'pseq'   ProfileSequenceDesc                  no
   'psid'   ProfileSequenceIdentifier            no
+  'psin'   ProfileSequenceInfo                  no
   'psvm'   PS2CRDVMSize                         no
   'rTRC'   RedTRC                               no
   'rXYZ'   RedMatrixColumn                      no
   'resp'   OutputResponse                       no
+  'rfnm'   ReferenceName                        no
   'rhoc'   ReflectionHardcopyOrigColorimetry    no
   'rig0'   PerceptualRenderingIntentGamut       no
   'rig2'   SaturationRenderingIntentGamut       no
   'rpoc'   ReflectionPrintOutputColorimetry     no
+  's2cp'   StandardToCustomPcc                  no
   'sape'   SceneAppearanceEstimates             no
   'scoe'   SceneColorimetryEstimates            no
   'scrd'   ScreeningDesc                        no
   'scrn'   Screening                            no
+  'smap'   SurfaceMap                           no
+  'svcn'   SpectralViewingConditions            no
+  'swpt'   SpectralWhitePoint                   no
   'targ'   CharTarget                           no
   'tech'   Technology                           no
   'vcgt'   VideoCardGamma                       no
@@ -18744,6 +18825,7 @@ WX350/WX500, ILCE-1/7/7C/7R/7S/7M2/7M3/7RM2/7RM3/7RM4/7SM2/7SM3/9/9M2/5000/
   Index1   Tag Name                             Writable
   ------   --------                             --------
    1176    ISOInfo                              Sony ISOInfo
+   1181    ISOInfo                              Sony ISOInfo
    1185    ISOInfo                              Sony ISOInfo
    1186    ISOInfo                              Sony ISOInfo
    1437    ISOInfo                              Sony ISOInfo
@@ -19074,7 +19156,7 @@ E-mount models.
 
 =head3 Sony Tag9416 Tags
 
-Valid for the ILCE-1/7SM3, ILME-FX3.
+Valid for the ILCE-1/7M4/7SM3, ILME-FX3.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -19098,7 +19180,9 @@ Valid for the ILCE-1/7SM3, ILME-FX3.
     115    MinFocalLength                       no
     117    MaxFocalLength                       no
    2191    VignettingCorrParams                 no
+   2193    VignettingCorrParams                 no
    2324    ChromaticAberrationCorrParams        no
+   2326    ChromaticAberrationCorrParams        no
 
 =head3 Sony PIC Tags
 
@@ -25049,22 +25133,22 @@ This is the PDF document catalog.
 
   Tag ID               Tag Name                 Writable
   ------               --------                 --------
-  'CS0'                CS0                      PDF ICCBased
-  'Cs1'                Cs1                      PDF ICCBased
+  'CS0'                CS0                      PDF DefaultRGB
+  'Cs1'                Cs1                      PDF DefaultRGB
   'DefaultCMYK'        DefaultCMYK              PDF DefaultRGB
   'DefaultRGB'         DefaultRGB               PDF DefaultRGB
 
-=head3 PDF ICCBased Tags
+=head3 PDF DefaultRGB Tags
 
   Tag ID       Tag Name                         Writable
   ------       --------                         --------
-  '_stream'    _stream                          ICC_Profile
+  'ICCBased'   ICCBased                         PDF ICCBased
 
-=head3 PDF DefaultRGB Tags
+=head3 PDF ICCBased Tags
 
   Tag ID       Tag Name                         Writable
   ------       --------                         --------
-  'ICCBased'   ICCBased                         PDF ICCBased
+  '_stream'    _stream                          ICC_Profile
 
 =head3 PDF Properties Tags
 
@@ -26079,6 +26163,11 @@ the PrintConv option is enabled and no time zone is specified.  This is
 because Apple software may display crazy values if the time zone is missing
 for some tags.
 
+By default ExifTool will remove null padding from some QuickTime containers
+in Canon CR3 files when writing, but the
+QuickTimePad option may be used to preserve
+the original size by padding with nulls if necessary.
+
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
 for the official specification.
@@ -35464,6 +35553,7 @@ FileName.
   XMP                        XMP                yes!
   XResolution                File               no
   YResolution                File               no
+  ZoneIdentifier             System             yes!
 
 =head2 Composite Tags
 

package/bin/lib/Image/ExifTool/WriteQuickTime.pl

@@ -1067,6 +1067,9 @@ sub WriteQuickTime($$$)
                     #  3=optional base offset, 4=optional item ID)
                     ChunkOffset => \@chunkOffset,
                 );
+                # set InPlace flag so XMP will be padded properly when
+                # QuickTimePad is used if this is an XMP directory
+                $subdirInfo{InPlace} = 2 if $et->Options('QuickTimePad');
                 # pass the header pointer if necessary (for EXIF IFD's
                 # where the Base offset is at the end of the header)
                 if ($hdrLen and $hdrLen < $size) {
@@ -1331,6 +1334,13 @@ sub WriteQuickTime($$$)
             }
             # write the new atom if it was modified
             if (defined $newData) {
+                my $sizeDiff = length($buff) - length($newData);
+                if ($sizeDiff > 0 and $$tagInfo{PreservePadding} and $et->Options('QuickTimePad')) {
+                    $newData .= "\0" x $sizeDiff;
+                    $et->VPrint(1, "    ($$tagInfo{Name} padded to original size)");
+                } elsif ($sizeDiff) {
+                    $et->VPrint(1, "    ($$tagInfo{Name} changed size)");
+                }
                 my $len = length($newData) + 8;
                 $len > 0x7fffffff and $et->Error("$$tagInfo{Name} to large to write"), last;
                 # update size in ChunkOffset list for modified 'uuid' atom

package/bin/lib/Image/ExifTool/Writer.pl

@@ -2074,6 +2074,46 @@ sub SetSystemTags($$)
             last;
         }
     }
+    # delete Windows Zone.Identifier if specified
+    my $zhash = $self->GetNewValueHash($Image::ExifTool::Extra{ZoneIdentifier});
+    if ($zhash) {
+        my $res = -1;
+        if ($^O ne 'MSWin32') {
+            $self->Warn('ZoneIdentifer is a Windows-only tag');
+        } elsif (ref $file) {
+            $self->Warn('Writing ZoneIdentifer requires a file name');
+        } elsif (defined $self->GetNewValue('ZoneIdentifier', \$zhash)) {
+            $self->Warn('ZoneIndentifier may only be delted');
+        } elsif (not eval { require Win32API::File }) {
+            $self->Warn('Install Win32API::File to write ZoneIdentifier');
+        } else {
+            my ($wattr, $wide);
+            my $zfile = "${file}:Zone.Identifier";
+            if ($self->EncodeFileName($zfile)) {
+                $wide = 1;
+                $wattr = eval { Win32API::File::GetFileAttributesW($zfile) };
+            } else {
+                $wattr = eval { Win32API::File::GetFileAttributes($zfile) };
+            }
+            if ($wattr == Win32API::File::INVALID_FILE_ATTRIBUTES()) {
+                $res = 0; # file doesn't exist, nothing to do
+            } elsif ($wattr & Win32API::File::FILE_ATTRIBUTE_READONLY()) {
+                $self->Warn('Zone.Identifier stream is read-only');
+            } else {
+                if ($wide) {
+                    $res = 1 if eval { Win32API::File::DeleteFileW($zfile) };
+                } else {
+                    $res = 1 if eval { Win32API::File::DeleteFile($zfile) };
+                }
+                if ($res > 0) {
+                    $self->VPrint(0, "  Deleting Zone.Identifier stream\n");
+                } else {
+                    $self->Warn('Error deleting Zone.Identifier stream');
+                }
+            }
+        }
+        $result = $res if $res == 1 or not $result;
+    }
     return $result;
 }
 

package/bin/lib/Image/ExifTool/XMP.pm

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.46';
+$VERSION = '3.47';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -2142,8 +2142,8 @@ my %sPantryItem = (
     NAMESPACE   => 'exifEX',
     PRIORITY => 0, # not as reliable as actual EXIF tags
     NOTES => q{
-        EXIF tags added by the EXIF 2.31 for XMP specification (see
-        L<http://www.cipa.jp/std/documents/e/DC-X010-2017.pdf>).
+        EXIF tags added by the EXIF 2.32 for XMP specification (see
+        L<https://cipa.jp/std/documents/download_e.html?DC-010-2020_E>).
     },
     Gamma                       => { Writable => 'rational' },
     PhotographicSensitivity     => { Writable => 'integer' },
@@ -2349,8 +2349,9 @@ my %sPantryItem = (
     Scene               => { Groups => { 2 => 'Other' }, List => 'Bag' },
     SubjectCode         => { Groups => { 2 => 'Other' }, List => 'Bag' },
     # Copyright - have seen this in a sample (Jan 2021), but I think it is non-standard
-    AltTextAccessibility =>{ Groups => { 2 => 'Other' }, Writable => 'lang-alt' }, # added 2021-10-13
-    ExtDescrAccessibility=>{ Groups => { 2 => 'Other' }, Writable => 'lang-alt' }, # added 2021-10-13
+    # new IPTC Core 1.3 properties
+    AltTextAccessibility  => { Groups => { 2 => 'Other' }, Writable => 'lang-alt' },
+    ExtDescrAccessibility => { Groups => { 2 => 'Other' }, Writable => 'lang-alt' },
 );
 
 # Adobe Lightroom namespace properties (lr) (ref PH)
@@ -3975,14 +3976,16 @@ sub ProcessXMP($$;$)
                     } elsif ($buf2 =~ /<plist[\s>]/) {
                         $type = 'PLIST';
                     }
-                    if ($isSVG and $$et{XMP_CAPTURE}) {
-                        $et->Error("ExifTool does not yet support writing of SVG images");
-                        return 0;
-                    }
                 }
                 $isXML = 1;
             } elsif ($2 eq '<rdf:RDF') {
                 $isRDF = 1;     # recognize XMP without x:xmpmeta element
+            } elsif ($2 eq '<svg') {
+                $isSVG = $isXML = 1;
+            }
+            if ($isSVG and $$et{XMP_CAPTURE}) {
+                $et->Error("ExifTool does not yet support writing of SVG images");
+                return 0;
             }
             if ($buff =~ /^\0\0/) {
                 $fmt = 'N';     # UTF-32 MM with or without BOM

package/bin/lib/Image/ExifTool/XMP2.pl

@@ -797,7 +797,8 @@ my %sImageRegion = ( # new in 1.5
     audioBitsPerSample  => { Groups => { 2 => 'Audio' }, Writable => 'integer' },
     # new IPTC Extension schema 1.5 property
     ImageRegion => { Groups => { 2 => 'Image' }, List => 'Bag', Struct => \%sImageRegion },
-    EventID     => { List => 'Bag' }, # added 2021-10-13
+    # new Extension 1.6 property
+    EventId     => { Name => 'EventID', List => 'Bag' },
 );
 
 #------------------------------------------------------------------------------

package/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath
             %static_vars);
 
-$VERSION = '12.33';
+$VERSION = '12.34';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -909,7 +909,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     GZIP => '\x1f\x8b\x08',
     HDR  => '#\?(RADIANCE|RGBE)\x0a',
     HTML => '(\xef\xbb\xbf)?\s*(?i)<(!DOCTYPE\s+HTML|HTML|\?xml)', # (case insensitive)
-    ICC  => '.{12}(scnr|mntr|prtr|link|spac|abst|nmcl|nkpf)(XYZ |Lab |Luv |YCbr|Yxy |RGB |GRAY|HSV |HLS |CMYK|CMY |[2-9A-F]CLR){2}',
+    ICC  => '.{12}(scnr|mntr|prtr|link|spac|abst|nmcl|nkpf|cenc|mid |mlnk|mvis)(XYZ |Lab |Luv |YCbr|Yxy |RGB |GRAY|HSV |HLS |CMYK|CMY |[2-9A-F]CLR|nc..|\0{4}){2}',
     IND  => '\x06\x06\xed\xf5\xd8\x1d\x46\xe5\xbd\x31\xef\xe7\xfe\x74\xb7\x1d',
   # ISO  =>  signature is at byte 32768
     ITC  => '.{4}itch',
@@ -1208,6 +1208,18 @@ my %systemTagsNotes = (
         },
         PrintConv => \&ConvertFileSize,
     },
+    ZoneIdentifier => {
+        Groups => { 1 => 'System', 2 => 'Other' },
+        Notes => q{
+            Windows only.  Used to indicate that a file has a Zone.Identifier alternate
+            data stream, which is used by some Windows browsers to mark downloaded files
+            as possibly unsafe to run.  May be deleted to remove this stream.  Requires
+            Win32API::File
+        },
+        Writable => 1,
+        WritePseudo => 1,
+        Protected => 1,
+    },
     FileType => {
         Groups => { 2 => 'Other' },
         Notes => q{
@@ -2320,6 +2332,7 @@ sub ClearOptions($)
         Password    => undef,   # password for password-protected PDF documents
         PrintConv   => 1,       # flag to enable print conversion
         QuickTimeHandler => 1,  # flag to add mdir Handler to newly created Meta box
+        QuickTimePad=> undef,   # flag to preserve padding of QuickTime CR3 tags
         QuickTimeUTC=> undef,   # assume that QuickTime date/time tags are stored as UTC
         RequestAll  => undef,   # extract all tags that must be specifically requested
         RequestTags => undef,   # extra tags to request (on top of those in the tag list)
@@ -2369,7 +2382,7 @@ sub ExtractInfo($;@)
     my $fast = $$options{FastScan} || 0;
     my $req = $$self{REQ_TAG_LOOKUP};
     my $reqAll = $$options{RequestAll} || 0;
-    my (%saveOptions, $reEntry, $rsize, $type, @startTime, $saveOrder, $isDir);
+    my (%saveOptions, $reEntry, $rsize, $zid, $type, @startTime, $saveOrder, $isDir);
 
     # check for internal ReEntry option to allow recursive calls to ExtractInfo
     if (ref $_[1] eq 'HASH' and $_[1]{ReEntry} and
@@ -2461,6 +2474,17 @@ sub ExtractInfo($;@)
                 }
                 # get size of resource fork on Mac OS
                 $rsize = -s "$filename/..namedfork/rsrc" if $^O eq 'darwin' and not $$self{IN_RESOURCE};
+                # check to see if Zone.Identifier file exists in Windows
+                if ($^O eq 'MSWin32' and eval { require Win32API::File }) {
+                    my $wattr;
+                    my $zfile = "${filename}:Zone.Identifier";
+                    if ($self->EncodeFileName($zfile)) {
+                        $wattr = eval { Win32API::File::GetFileAttributesW($zfile) };
+                    } else {
+                        $wattr = eval { Win32API::File::GetFileAttributes($zfile) };
+                    }
+                    $zid = 1 unless $wattr == Win32API::File::INVALID_FILE_ATTRIBUTES();
+                }
             }
             # open the file
             if ($self->Open(\*EXIFTOOL_FILE, $filename)) {
@@ -2503,6 +2527,7 @@ sub ExtractInfo($;@)
         my $fileSize = $stat[7];
         $self->FoundTag('FileSize', $stat[7]) if defined $stat[7];
         $self->FoundTag('ResourceForkSize', $rsize) if $rsize;
+        $self->FoundTag('ZoneIdentifier', 'Exists') if $zid;
         $self->FoundTag('FileModifyDate', $stat[9]) if defined $stat[9];
         $self->FoundTag('FileAccessDate', $stat[8]) if defined $stat[8];
         my $cTag = $^O eq 'MSWin32' ? 'FileCreateDate' : 'FileInodeChangeDate';

package/bin/lib/Image/ExifTool.pod

@@ -860,6 +860,14 @@ commonly found in samples from other software, and it has been reported that
 Apple QuickTime Player and Photos.apps will ignore ItemList tags if this is
 missing.  Default is 1.
 
+=item QuickTimePad
+
+Flag to preserve the padding of some QuickTime atoms when writing. 
+QuickTime-based Canon CR3 files pad the values of container atoms with null
+bytes.  This padding is removed by default when the file is rewritten, but
+setting this option to 1 adds padding to preserve the original atom size if
+the new atom would be smaller than the original.  Default is undef.
+
 =item QuickTimeUTC
 
 Flag set to assume that QuickTime date/time values are stored as UTC,
@@ -1236,7 +1244,7 @@ The following ExifTool options are effective in the call to L</WriteInfo>:
 
 ByteOrder, Charset, CharsetEXIF, CharsetFileName, CharsetIPTC, Compact,
 Compress, FixBase, IgnoreMinorErrors, NoMultiExif, NoPDFList, Password,
-QuickTimeHandler, Verbose and WriteMode.
+QuickTimeHandler, QuickTimePad, Verbose and WriteMode.
 
 =head2 GetTagList
 

package/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.33
+Version: 12.34
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

package/bin/pp_build_exe.args

@@ -21,10 +21,10 @@
 #           10) Copy zip archive to web servers.
 #           11) Update zip file version in link and text of html/index.html.
 #------------------------------------------------------------------------------
--T exiftool-12.33
-#--info=FileVersion=12.3.3.0
-#--info=ProductVersion=12.3.3.0
-##"--info=Build Date=2021:10:16 13:22:24-04:00"
+-T exiftool-12.34
+#--info=FileVersion=12.3.4.0
+#--info=ProductVersion=12.3.4.0
+##"--info=Build Date=2021:10:27 11:53:38-04:00"
 ##"--info=Bundled Perl Version=ActivePerl 5.24.0"
 ##"--info=LegalCopyright=Copyright (c) 2003-2021, Phil Harvey"
 ##"--info=ProductName=ExifTool"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiftool-vendored.pl",
-  "version": "12.33.0",
+  "version": "12.34.0",
   "description": "Vendored perl ExifTool for Node.js",
   "main": "./index.js",
   "homepage": "https://github.com/mceachen/exiftool-vendored.pl#readme",