exiftool_vendored 11.98.0 → 12.10.0

data/bin/lib/Image/ExifTool.pod

@@ -65,46 +65,47 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r
-  3G2   r/w   | DSS   r     | J2C   r     | ODS   r     | RSRC  r
-  3GP   r/w   | DV    r     | JNG   r/w   | ODT   r     | RTF   r
-  A     r     | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
-  AA    r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
-  AAE   r     | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
-  AAX   r/w   | EIP   r     | K25   r     | OPUS  r     | RM    r
-  ACR   r     | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
-  AFM   r     | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
-  AI    r/w   | ERF   r/w   | LA    r     | PAC   r     | SO    r
-  AIFF  r     | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
-  APE   r     | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
-  ARQ   r/w   | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
-  ARW   r/w   | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
-  ASF   r     | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
-  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
-  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
-  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
-  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
-  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
-  BTF   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
-  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
-  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
-  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
-  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
-  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
-  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
-  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
-  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
-  DCM   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WMV   r
-  DCP   r/w   | HTML  r     | MPC   r     | PSB   r/w   | WTV   r
-  DCR   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | WV    r
-  DFONT r     | ICS   r     | MPO   r/w   | PSP   r     | X3F   r/w
-  DIVX  r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XCF   r
-  DJVU  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLS   r
-  DLL   r     | IND   r/w   | MXF   r     | RA    r     | XLSX  r
-  DNG   r/w   | INSP  r/w   | NEF   r/w   | RAF   r/w   | XMP   r/w/c
-  DOC   r     | INSV  r     | NRW   r/w   | RAM   r     | ZIP   r
-  DOCX  r     | INX   r     | NUMBERS r   | RAR   r     |
-  DPX   r     | ISO   r     | O     r     | RAW   r/w   |
+  360   r/w   | DPX   r     | ITC   r     | ODP   r     | RIFF  r
+  3FR   r     | DR4   r/w/c | J2C   r     | ODS   r     | RSRC  r
+  3G2   r/w   | DSS   r     | JNG   r/w   | ODT   r     | RTF   r
+  3GP   r/w   | DV    r     | JP2   r/w   | OFR   r     | RW2   r/w
+  A     r     | DVB   r/w   | JPEG  r/w   | OGG   r     | RWL   r/w
+  AA    r     | DVR-MS r    | JSON  r     | OGV   r     | RWZ   r
+  AAE   r     | DYLIB r     | K25   r     | ONP   r     | RM    r
+  AAX   r/w   | EIP   r     | KDC   r     | OPUS  r     | SEQ   r
+  ACR   r     | EPS   r/w   | KEY   r     | ORF   r/w   | SKETCH r
+  AFM   r     | EPUB  r     | LA    r     | OTF   r     | SO    r
+  AI    r/w   | ERF   r/w   | LFP   r     | PAC   r     | SR2   r/w
+  AIFF  r     | EXE   r     | LNK   r     | PAGES r     | SRF   r
+  APE   r     | EXIF  r/w/c | LRV   r/w   | PBM   r/w   | SRW   r/w
+  ARQ   r/w   | EXR   r     | M2TS  r     | PCD   r     | SVG   r
+  ARW   r/w   | EXV   r/w/c | M4A/V r/w   | PCX   r     | SWF   r
+  ASF   r     | F4A/V r/w   | MACOS r     | PDB   r     | THM   r/w
+  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | TIFF  r/w
+  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TORRENT r
+  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TTC   r
+  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTF   r
+  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TXT   r
+  BTF   r     | FLV   r     | MKS   r     | PGF   r     | VCF   r
+  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VRD   r/w/c
+  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VSD   r
+  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | WAV   r
+  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WDP   r/w
+  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WEBP  r
+  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBM  r
+  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WMA   r
+  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMV   r
+  CZI   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WTV   r
+  DCM   r     | HTML  r     | MPC   r     | PSB   r/w   | WV    r
+  DCP   r/w   | ICC   r/w/c | MPG   r     | PSD   r/w   | X3F   r/w
+  DCR   r     | ICS   r     | MPO   r/w   | PSP   r     | XCF   r
+  DFONT r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XLS   r
+  DIVX  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLSX  r
+  DJVU  r     | IND   r/w   | MXF   r     | RA    r     | XMP   r/w/c
+  DLL   r     | INSP  r/w   | NEF   r/w   | RAF   r/w   | ZIP   r
+  DNG   r/w   | INSV  r     | NRW   r/w   | RAM   r     |
+  DOC   r     | INX   r     | NUMBERS r   | RAR   r     |
+  DOCX  r     | ISO   r     | O     r     | RAW   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -306,7 +307,7 @@ L</Options> settings.
 
 =item Return Values:
 
-L</ImageInfo> returns a reference to a hash of tag key/value pairs.  The tag
+L</ImageInfo> returns a reference to a hash of tag-key/value pairs.  The tag
 keys are identifiers -- essentially case-sensitive tag names with an
 appended instance number if multiple tags with the same name were extracted
 from the image.  Many of the ExifTool functions require a tag key as an
@@ -662,7 +663,7 @@ option is disabled.
 Perl expression used to filter PrintConv values when writing.  The
 expression acts on the value of the Perl default variable ($_), and changes
 the value of this variable as required.  The current ExifTool object may be
-accessed through $self.  The value is not changed if $_ is set to undef.
+accessed through $self.  The tag is not written if $_ is set to undef.
 
 =item FixBase
 
@@ -731,6 +732,11 @@ to be excluded by preceding group name with a '-'.  See L</GetGroup> for a
 description of group families, and L</GetAllGroups [static]> for lists of
 group names.
 
+=item HexTagIDs
+
+Use hexadecimal instead of decimal for the family 7 group names of tags with
+numerical ID's.
+
 =item HtmlDump
 
 Dump information in hex to dynamic HTML web page.  The value may be 0-3 for
@@ -809,6 +815,11 @@ formatting expression returns undef).  If not set, a minor error is issued
 for missing values, or the value is set to '' if L</IgnoreMinorErrors> is
 set.  Default is undef.
 
+=item NoMultiExif
+
+Raise error when attempting to write multi-segment EXIF in a JPEG image. 
+Default is undef.
+
 =item NoPDFList
 
 Flag to avoid splitting PDF list-type tag values into separate items.
@@ -839,9 +850,10 @@ causing conversion to local time when they are extracted and from local time
 when written.  According to the QuickTime specification date/time values
 should be UTC, but many digital cameras store local time instead (presumably
 because they don't know the time zone), so the default is to not convert
-these times.  This option also disables the autodetection of incorrect
-time-zero offsets in QuickTime date/time values, and enforces a time zero of
-1904 as per the QuickTime specification.
+these times (except for Canon CR3 files, which always use UTC times).  This
+option also disables the autodetection of incorrect time-zero offsets in
+QuickTime date/time values, and enforces a time zero of 1904 as per the
+QuickTime specification.
 
 =item RequestAll
 
@@ -1128,11 +1140,17 @@ created in the destination file as required to store the specified
 information.  May be called repeatedly to write the same information to
 additional files without the need to call L</SetNewValue> again.
 
-Note that it is NOT necessary to call L</ExtractInfo> or L</ImageInfo>
+ExifTool queues all new values that are assigned via calls to
+L</SetNewValue>, then applies them to any number of files through one or
+more calls to L</WriteInfo>. These queued values may be accessed through
+L</GetNewValue>, and are completely separate from metadata extracted from
+files via L</ExtractInfo> or L</ImageInfo> and accessed through L</GetInfo>
+or L</GetValue>.
+
+To be clear, it is NOT necessary to call L</ExtractInfo> or L</ImageInfo>
 before L</WriteInfo>.  L</WriteInfo> changes only metadata specified by
 previous calls to L</SetNewValue>.
 
-
     # add information to a source file, writing output to new file
     $exifTool->WriteInfo($srcfile, $dstfile);
 
@@ -1601,7 +1619,8 @@ values in list context.
 
 0) ExifTool object reference
 
-1) Tag name (case sensitive, may be prefixed by family 0 or 1 group name)
+1) Tag name (case sensitive, may be prefixed by family 0, 1 or 7 group
+names, separated by colons)
 
 =item Return Values:
 
@@ -1663,34 +1682,35 @@ in a specified file.
 
 2-N) [optional] List of tag names to set or options hash references.  All
 writable tags are set if none are specified.  The tag names are not case
-sensitive, and may be prefixed by one or more family 0, 1 or 2 group names
-with optional leading family numbers, separated by colons (eg. 'exif:iso'). 
-A leading '-' indicates tags to be excluded (eg. '-comment'), or a trailing
-'#' causes the ValueConv value to be copied (same as setting the Type option
-to 'ValueConv' for this tag only).  Wildcards ('*' and '?') may be used in
-the tag name.  A tag name of '*' is commonly used when a group is specified
-to copy all tags in the group (eg. 'XMP:*').  A special feature allows tag
-names of the form 'DSTTAGE<lt>SRCTAG' (or 'SRCTAGE<gt>DSTTAG') to be
-specified to copy information to a tag with a different name or a specified
-group.  Both 'SRCTAG' and 'DSTTAG' may contain wildcards and/or be prefixed
-by a group name (eg. 'fileModifyDateE<lt>modifyDate' or 'xmp:*E<lt>*'),
-and/or suffixed by a '#' to disable print conversion.  Copied tags may also
-be added or deleted from a list with arguments of the form
-'DSTTAG+E<lt>SRCTAG' or 'DSTTAG-E<lt>SRCTAG'.  Tags are evaluated in order,
-so exclusions apply only to tags included earlier in the list.  An extension
-of this feature allows the tag value to be set from a string containing tag
-names with leading '$' symbols (eg. 'CommentE<lt>the file is $filename'). 
-Braces '{}' may be used around the tag name to separate it from subsequent
-text, and a '$$' is used to to represent a '$' symbol.  The behaviour for
-missing tags in expressions is defined by the L</MissingTagValue> option.
-The tag value may be modified via changes to the default input variable ($_)
-in a Perl expression placed inside the braces and after a semicolon
-following the tag name (see the last example above).  A '@' may be added
-after the tag name (before the semicolon) to make the expression act on
-individual list items instead of the concatenated string for list-type tags.
-Braces within the expression must be balanced. Multiple options hash
-references may be passed to set different options for different tags. 
-Options apply to subsequent tags in the argument list.
+sensitive, and may be prefixed by one or more family 0, 1, 2 or 7 group
+names with optional leading family numbers, separated by colons (eg.
+'exif:iso'). A leading '-' indicates tags to be excluded (eg. '-comment'),
+or a trailing '#' causes the ValueConv value to be copied (same as setting
+the Type option to 'ValueConv' for this tag only).  Wildcards ('*' and '?')
+may be used in the tag name.  A tag name of '*' is commonly used when a
+group is specified to copy all tags in the group (eg. 'XMP:*').  A special
+feature allows tag names of the form 'DSTTAGE<lt>SRCTAG' (or
+'SRCTAGE<gt>DSTTAG') to be specified to copy information to a tag with a
+different name or a specified group.  Both 'SRCTAG' and 'DSTTAG' may contain
+wildcards and/or be prefixed by a group name (eg.
+'fileModifyDateE<lt>modifyDate' or 'xmp:*E<lt>*'), and/or suffixed by a '#'
+to disable print conversion.  Copied tags may also be added or deleted from
+a list with arguments of the form 'DSTTAG+E<lt>SRCTAG' or
+'DSTTAG-E<lt>SRCTAG'.  Tags are evaluated in order, so exclusions apply only
+to tags included earlier in the list.  An extension of this feature allows
+the tag value to be set from a string containing tag names with leading '$'
+symbols (eg. 'CommentE<lt>the file is $filename'). Braces '{}' may be used
+around the tag name to separate it from subsequent text, and a '$$' is used
+to to represent a '$' symbol.  The behaviour for missing tags in expressions
+is defined by the L</MissingTagValue> option. The tag value may be modified
+via changes to the default input variable ($_) in a Perl expression placed
+inside the braces and after a semicolon following the tag name (see the last
+example above).  A '@' may be added after the tag name (before the
+semicolon) to make the expression act on individual list items instead of
+the concatenated string for list-type tags. Braces within the expression
+must be balanced. Multiple options hash references may be passed to set
+different options for different tags. Options apply to subsequent tags in
+the argument list.
 
 By default, this routine will commute information between same-named tags in
 different groups, allowing information to be translated between images with
@@ -2067,6 +2087,14 @@ Family 6 is currently used only for EXIF/TIFF metadata, and gives the format
 type of the extracted value.  Generated only if the L</SaveFormat> option is
 used when extracting.
 
+Family 7 is used for tag ID's.  The group names are "ID-" followed by the
+tag ID with characters other than [-_A-Za-z0-9] converted to hex.  Numerical
+tag ID's are given in hex if the L</HexTagIDs> option is set.  When
+specifying a family 7 group name, numerical ID's may be in hex or decimal,
+and non-numercal ID's may or may not have characters other than
+[-_A-Za-z0-9] converted to hex.  Note that unlike other group names, family
+7 group names are case sensitive (except for the leading "ID-").
+
 See L</GetAllGroups [static]> for complete lists of group names.
 
 =back
@@ -2260,22 +2288,22 @@ ICC-meta, ICC-view, ICC_Profile, ICC_Profile#, ID3, ID3v1, ID3v1_Enh,
 ID3v2_2, ID3v2_3, ID3v2_4, IFD0, IFD1, IPTC, IPTC#, ISO, ITC, Insta360,
 InteropIFD, ItemList, JFIF, JFXX, JPEG, JPEG-HDR, JSON, JVC, Jpeg2000,
 KDC_IFD, Keys, Kodak, KodakBordersIFD, KodakEffectsIFD, KodakIFD,
-KyoceraRaw, LNK, Leaf, LeafSubIFD, Leica, Lytro, M2TS, MAC, MIE-Audio,
-MIE-Camera, MIE-Canon, MIE-Doc, MIE-Extender, MIE-Flash, MIE-GPS, MIE-Geo,
-MIE-Image, MIE-Lens, MIE-Main, MIE-MakerNotes, MIE-Meta, MIE-Orient,
-MIE-Preview, MIE-Thumbnail, MIE-UTM, MIE-Unknown, MIE-Video, MIFF, MNG,
-MOBI, MOI, MPC, MPEG, MPF0, MPImage, MS-DOC, MXF, MacOS, MakerNotes,
-MakerUnknown, Matroska, MediaJukebox, Meta, MetaIFD, Microsoft, Minolta,
-MinoltaRaw, Motorola, NITF, Nikon, NikonCapture, NikonCustom, NikonScan,
-Nintendo, Ocad, Ogg, Olympus, OpenEXR, Opus, PDF, PICT, PNG, PNG-pHYs, PSP,
-Palm, Panasonic, PanasonicRaw, Pentax, PhaseOne, PhotoCD, PhotoMechanic,
-Photoshop, PictureInfo, PostScript, PreviewIFD, PrintIM, ProfileIFD,
-Qualcomm, QuickTime, RAF, RAF2, RIFF, RMETA, RSRC, RTF, Radiance, Rawzor,
-Real, Real-CONT, Real-MDPR, Real-PROP, Real-RA3, Real-RA4, Real-RA5,
-Real-RJMD, Reconyx, Red, Ricoh, SPIFF, SR2, SR2DataIFD, SR2SubIFD, SRF#,
-SVG, Samsung, Sanyo, Scalado, Sigma, SigmaRaw, Sony, SonyIDC, Stim, SubIFD,
-System, Theora, Torrent, Track#, UserData, UserParam, VCalendar, VCard,
-Version0, Vorbis, WTV, XML, XMP, XMP-DICOM, XMP-Device, XMP-GAudio,
+KyoceraRaw, LNK, Leaf, LeafSubIFD, Leica, Lyrics3, Lytro, M2TS, MAC,
+MIE-Audio, MIE-Camera, MIE-Canon, MIE-Doc, MIE-Extender, MIE-Flash, MIE-GPS,
+MIE-Geo, MIE-Image, MIE-Lens, MIE-Main, MIE-MakerNotes, MIE-Meta,
+MIE-Orient, MIE-Preview, MIE-Thumbnail, MIE-UTM, MIE-Unknown, MIE-Video,
+MIFF, MNG, MOBI, MOI, MPC, MPEG, MPF0, MPImage, MS-DOC, MXF, MacOS,
+MakerNotes, MakerUnknown, Matroska, MediaJukebox, Meta, MetaIFD, Microsoft,
+Minolta, MinoltaRaw, Motorola, NITF, Nikon, NikonCapture, NikonCustom,
+NikonScan, Nintendo, Ocad, Ogg, Olympus, OpenEXR, Opus, PDF, PICT, PNG,
+PNG-pHYs, PSP, Palm, Panasonic, PanasonicRaw, Pentax, PhaseOne, PhotoCD,
+PhotoMechanic, Photoshop, PictureInfo, PostScript, PreviewIFD, PrintIM,
+ProfileIFD, Qualcomm, QuickTime, RAF, RAF2, RIFF, RMETA, RSRC, RTF,
+Radiance, Rawzor, Real, Real-CONT, Real-MDPR, Real-PROP, Real-RA3, Real-RA4,
+Real-RA5, Real-RJMD, Reconyx, Red, Ricoh, SPIFF, SR2, SR2DataIFD, SR2SubIFD,
+SRF#, SVG, Samsung, Sanyo, Scalado, Sigma, SigmaRaw, Sony, SonyIDC, Stim,
+SubIFD, System, Theora, Torrent, Track#, UserData, UserParam, VCalendar,
+VCard, Version0, Vorbis, WTV, XML, XMP, XMP-DICOM, XMP-Device, XMP-GAudio,
 XMP-GDepth, XMP-GFocus, XMP-GImage, XMP-GPano, XMP-GSpherical, XMP-LImage,
 XMP-MP, XMP-MP1, XMP-PixelLive, XMP-aas, XMP-acdsee, XMP-album,
 XMP-apple-fi, XMP-aux, XMP-cc, XMP-cell, XMP-creatorAtom, XMP-crs, XMP-dc,
@@ -2309,6 +2337,12 @@ eg. JPEG-APP1-IFD0-ExifIFD
 int8u, string, int16u, int32u, rational64u, int8s, undef, int16s, int32s,
 rational64s, float, double, ifd, unicode, complex, int64u, int64s, ifd64
 
+=item Family 7 (Tag ID):
+
+ID-xxx (where xxx is the tag ID.  Numerical ID's are given in hex with a
+leading "0x" if the HexTagIDs option is set, as are characters in
+non-numerical ID's which are not valid in a group name)
+
 =back
 
 =head2 GetDeleteGroups [static]
@@ -2588,7 +2622,7 @@ IPTC Core and Extension specifications actually use the XMP format.)
 
 =head2 XMP
 
-Exiftool reads XMP encoded as UTF-8, UTF-16 or UTF-32, and converts them all
+ExifTool reads XMP encoded as UTF-8, UTF-16 or UTF-32, and converts them all
 to UTF-8 internally.  Also, all XML character entity references and numeric
 character references are converted.  When writing, ExifTool always encodes
 XMP as UTF-8, converting the following 5 characters to XML character

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

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::ID3;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -73,12 +73,12 @@ my %timeInfo = (
             ProcessProc => \&Image::ExifTool::ID3::ProcessID3,
         },
     },
+    APPL => 'ApplicationData', # (first 4 bytes are the application signature)
 #    SSND => 'SoundData',
 #    MARK => 'Marker',
 #    INST => 'Instrument',
 #    MIDI => 'MidiData',
 #    AESD => 'AudioRecording',
-#    APPL => 'ApplicationSpecific',
 );
 
 %Image::ExifTool::AIFF::Common = (

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # APE metadata blocks
 %Image::ExifTool::APE::Main = (
@@ -166,7 +166,7 @@ sub ProcessAPE($$)
         # look for the APE trailer footer...
         my $footPos = -32;
         # (...but before the ID3v1 trailer if it exists)
-        $footPos -= 128 if $$et{DoneID3} == 2;
+        $footPos -= $$et{DoneID3} if $$et{DoneID3} > 1;
         $raf->Seek($footPos, 2)     or return 1;
         $raf->Read($buff, 32) == 32 or return 1;
         $buff =~ /^APETAGEX/        or return 1;

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.35';
+$VERSION = '3.39';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -415,7 +415,7 @@ IPTC group only in the standard location.
 },
     QuickTime => q{
 The QuickTime format is used for many different types of audio, video and
-image files (most notably, MOV/MP4 videos and HEIC/CR3 images).  Exiftool
+image files (most notably, MOV/MP4 videos and HEIC/CR3 images).  ExifTool
 extracts standard meta information and a variety of audio, video and image
 parameters, as well as proprietary information written by many camera
 models.  Tags with a question mark after their name are not extracted unless
@@ -444,10 +444,10 @@ country code to the tag name (eg. "ItemList:Artist-deu" or
 "ItemList::Artist-deu-DE").  Most
 L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags> tags support a
 language code, but without a country code.  If no language code is specified
-when writing, alternate languages for the tag are deleted.  Use the "und"
-language code to write the default language without deleting alternate
-languages.  Note that "eng" is treated as a default language when reading,
-but not when writing.
+when writing, the default language is written and alternate languages for
+the tag are deleted.  Use the "und" language code to write the default
+language without deleting alternate languages.  Note that "eng" is treated
+as a default language when reading, but not when writing.
 
 According to the specification, integer-format QuickTime date/time tags
 should be stored as UTC.  Unfortunately, digital cameras often store local
@@ -633,7 +633,8 @@ L<http://www.metadataworkinggroup.org/> for the official MWG specification.
     MacOS => q{
 On MacOS systems, the there are additional MDItem and XAttr Finder tags that
 may be extracted.  These tags are not extracted by default -- they must be
-specifically requested or enabled via an API option.
+specifically requested or enabled via an API option.  (Except when reading
+MacOS "._" files directly, see below.)
 
 The tables below list some of the tags that may be extracted, but ExifTool
 will extract all available information even for tags not listed.
@@ -877,6 +878,11 @@ TagID:  foreach $tagID (@keys) {
                     $case{$lc} = $name;
                 }
                 my $format = $$tagInfo{Format};
+                # check TagID's to make sure they don't start with 'ID-'
+                my @grps = $et->GetGroup($tagInfo);
+                foreach (@grps) {
+                    warn "Group name starts with 'ID-' for $short $name\n" if /^ID-/i;
+                }
                 # validate Name (must not start with a digit or else XML output will not be valid;
                 # must not start with a dash or exiftool command line may get confused)
                 if ($name !~ /^[_A-Za-z][-\w]+$/ and
@@ -1023,9 +1029,14 @@ TagID:  foreach $tagID (@keys) {
                     $note =~ s/(^[ \t]+|[ \t]+$)//mg;
                     push @values, "($note)";
                 }
-                if ($isXMP and lc $tagID ne lc $name) {
-                    # add note about different XMP Tag ID
-                    my $note = $$tagInfo{RootTagInfo} ? $tagID : "called $tagID by the spec";
+                if ($isXMP and (lc $tagID ne lc $name or $$tagInfo{NotFlat})) {
+                    my $note;
+                    if ($$tagInfo{NotFlat}) {
+                        $note = 'NOT a flattened tag!';
+                    } else {
+                        # add note about different XMP Tag ID
+                        $note = $$tagInfo{RootTagInfo} ? $tagID : "called $tagID by the spec";
+                    }
                     if ($$tagInfo{Notes}) {
                         $values[-1] =~ s/^\(/($note; /;
                     } else {

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.37';
+$VERSION = '4.40';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -474,8 +474,9 @@ $VERSION = '4.37';
     253.1 => 'Canon EF 70-200mm f/2.8L IS III USM + 2x', #PH (NC)
     # 253.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025) + 2x', #forum9367
     254 => 'Canon EF 100mm f/2.8L Macro IS USM', #42
-    255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens', #50
+    255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
+    255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
     368 => 'Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens', #IB (A018)
     368.1 => 'Sigma 20mm f/1.4 DG HSM | A', #50 (newer firmware)
     368.2 => 'Sigma 50mm f/1.4 DG HSM | A', #50
@@ -486,8 +487,9 @@ $VERSION = '4.37';
     368.7 => 'Sigma 85mm f/1.4 DG HSM | A', #IB (016)
     368.8 => 'Sigma 105mm f/1.4 DG HSM', #IB (A018)
     368.9 => 'Sigma 14-24mm f/2.8 DG HSM', #IB (A018)
-    368.10 => 'Sigma 35mm f/1.4 DG HSM | A', #PH (012)
-   '368.10' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
+   '368.10' => 'Sigma 35mm f/1.4 DG HSM | A', #PH (012)
+   '368.11' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
+   '368.12' => 'Sigma 18-35mm f/1.8 DC HSM | A', #50
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek
@@ -565,14 +567,27 @@ $VERSION = '4.37';
     61494 => 'Canon CN-E 85mm T1.3 L F', #PH
     61495 => 'Canon CN-E 135mm T2.2 L F', #PH
     61496 => 'Canon CN-E 35mm T1.5 L F', #PH
-    61182 => 'Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens', #IB
-    61182.1 => 'Canon RF 50mm F1.2 L USM', #IB
-    61182.2 => 'Canon RF 24-105mm F4 L IS USM', #IB
-    61182.3 => 'Canon RF 28-70mm F2 L USM', #IB
-    61182.4 => 'Canon RF 85mm F1.2L USM', #IB
-    61182.5 => 'Canon RF 24-240mm F4-6.3 IS USM', #IB
-    61182.6 => 'Canon RF 24-70mm F2.8 L IS USM', #PH
-    61182.7 => 'Canon RF 15-35mm F2.8 L IS USM', #PH
+    # see RFLensType tag for master list of 61182 RF lenses
+    61182 => 'Canon RF 50mm F1.2L USM or other Canon RF Lens',
+    61182.1 => 'Canon RF 24-105mm F4L IS USM',
+    61182.2 => 'Canon RF 28-70mm F2L USM',
+    61182.3 => 'Canon RF 35mm F1.8 MACRO IS STM',
+    61182.4 => 'Canon RF 85mm F1.2L USM',
+    61182.5 => 'Canon RF 85mm F1.2L USM DS',
+    61182.6 => 'Canon RF 24-70mm F2.8L IS USM',
+    61182.7 => 'Canon RF 15-35mm F2.8L IS USM',
+    61182.8 => 'Canon RF 24-240mm F4-6.3 IS USM',
+    61182.9 => 'Canon RF 70-200mm F2.8L IS USM',
+    61182.10 => 'Canon RF 600mm F11 IS STM',
+    61182.11 => 'Canon RF 600mm F11 IS STM + RF1.4x',
+    61182.12 => 'Canon RF 600mm F11 IS STM + RF2x',
+    61182.13 => 'Canon RF 800mm F11 IS STM',
+    61182.14 => 'Canon RF 800mm F11 IS STM + RF1.4x',
+    61182.15 => 'Canon RF 800mm F11 IS STM + RF2x',
+    61182.16 => 'Canon RF 24-105mm F4-7.1 IS STM',
+    61182.17 => 'Canon RF 100-500mm F4.5-7.1L IS USM',
+    61182.18 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
+    61182.19 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
     65535 => 'n/a',
 );
 
@@ -918,13 +933,16 @@ $VERSION = '4.37';
     0x80000406 => 'EOS 6D Mark II', #IB/42
     0x80000408 => 'EOS 77D / 9000D',
     0x80000417 => 'EOS Rebel SL2 / 200D / Kiss X9', #IB/42
+    0x80000421 => 'EOS R5', #PH
     0x80000422 => 'EOS Rebel T100 / 4000D / 3000D', #IB (3000D in China; Kiss? - PH)
     0x80000424 => 'EOS R', #IB
     0x80000428 => 'EOS-1D X Mark III', #IB
     0x80000432 => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', #IB
     0x80000433 => 'EOS RP',
+    0x80000435 => 'EOS Rebel T8i / 850D / X10i', #JR/PH
     0x80000436 => 'EOS SL3 / 250D / Kiss X10', #25
     0x80000437 => 'EOS 90D', #IB
+    0x80000453 => 'EOS R6', #PH
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -1881,6 +1899,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Name => 'ColorData9',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData9' },
         },
+        {   # (int16u[2024|3656]) - 1DXmkIII (2024) ref IB, R5/R6 (3656) ref PH
+            Condition => '$count == 2024 or $count == 3656',
+            Name => 'ColorData10',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData10' },
+        },
         {
             Name => 'ColorDataUnknown',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorDataUnknown' },
@@ -5660,6 +5683,13 @@ my %ciMaxFocal = (
         ValueConv => 'unpack("H*",$val)',
         ValueConvInv => 'length($val) < 10 and $val = 0 x (10-length($val)) . $val; pack("H*",$val)',
     },
+    0x5c1 => {
+        Name => 'FirmwareVersion',
+        Format => 'string[6]',
+        Writable => 0,
+        Condition => '$$valPt =~ /^\d\.\d\.\d\0/',
+        Notes => 'M50', # (firmware 1.0.0)
+    },
 );
 
 # Picture Style information for various cameras (ref 48)
@@ -6692,7 +6722,17 @@ my %ciMaxFocal = (
             264 => 'Canon RF 15-35mm F2.8L IS USM',
             265 => 'Canon RF 24-240mm F4-6.3 IS USM',
             266 => 'Canon RF 70-200mm F2.8L IS USM',
+            268 => 'Canon RF 600mm F11 IS STM',
+            269 => 'Canon RF 600mm F11 IS STM + RF1.4x',
+            270 => 'Canon RF 600mm F11 IS STM + RF2x',
+            271 => 'Canon RF 800mm F11 IS STM',
+            272 => 'Canon RF 800mm F11 IS STM + RF1.4x',
+            273 => 'Canon RF 800mm F11 IS STM + RF2x',
             274 => 'Canon RF 24-105mm F4-7.1 IS STM',
+            275 => 'Canon RF 100-500mm F4.5-7.1L IS USM',
+            276 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
+            277 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
+            # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
 );
@@ -8037,7 +8077,6 @@ my %ciMaxFocal = (
     0x149 => { #IB
         Name => 'PerChannelBlackLevel',
         Format => 'int16u[4]',
-        Notes => '1300D',
     },
     # 0x318 - PerChannelBlackLevel again (ref IB)
     0x31c => { #IB
@@ -8055,6 +8094,128 @@ my %ciMaxFocal = (
     },
 );
 
+# Color data (MakerNotes tag 0x4001, count=2024,3656)
+# (same as ColorData9 but shifted up by 0x0e, ref PH)
+%Image::ExifTool::Canon::ColorData10 = (
+    %binaryDataAttrs,
+    FORMAT => 'int16s',
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 0 ],
+    IS_SUBDIR => [ 0x118 ],
+    0x00 => {
+        Name => 'ColorDataVersion',
+        DataMember => 'ColorDataVersion',
+        RawConv => '$$self{ColorDataVersion} = $val',
+        PrintConv => {
+            32 => '32 (1DXmkIII)', #IB
+            33 => '33 (R5/R6)',
+        },
+    },
+    0x55 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
+    0x59 => 'ColorTempAsShot',
+    0x5a => { Name => 'WB_RGGBLevelsAuto',       Format => 'int16s[4]' },
+    0x5e => 'ColorTempAuto',
+    0x5f => { Name => 'WB_RGGBLevelsMeasured',   Format => 'int16s[4]' },
+    0x63 => 'ColorTempMeasured',
+    0x64 => { Name => 'WB_RGGBLevelsUnknown',   Format => 'int16s[4]', Unknown => 1 },
+    0x68 => { Name => 'ColorTempUnknown',  Unknown => 1 },
+    0x69 => { Name => 'WB_RGGBLevelsUnknown2',  Format => 'int16s[4]', Unknown => 1 },
+    0x6d => { Name => 'ColorTempUnknown2', Unknown => 1 },
+    0x6e => { Name => 'WB_RGGBLevelsUnknown3',  Format => 'int16s[4]', Unknown => 1 },
+    0x72 => { Name => 'ColorTempUnknown3', Unknown => 1 },
+    0x73 => { Name => 'WB_RGGBLevelsUnknown4',  Format => 'int16s[4]', Unknown => 1 },
+    0x77 => { Name => 'ColorTempUnknown4', Unknown => 1 },
+    0x78 => { Name => 'WB_RGGBLevelsUnknown5',  Format => 'int16s[4]', Unknown => 1 },
+    0x7c => { Name => 'ColorTempUnknown5', Unknown => 1 },
+    0x7d => { Name => 'WB_RGGBLevelsUnknown6',  Format => 'int16s[4]', Unknown => 1 },
+    0x81 => { Name => 'ColorTempUnknown6', Unknown => 1 },
+    0x82 => { Name => 'WB_RGGBLevelsUnknown7',  Format => 'int16s[4]', Unknown => 1 },
+    0x86 => { Name => 'ColorTempUnknown7', Unknown => 1 },
+    0x87 => { Name => 'WB_RGGBLevelsUnknown8',  Format => 'int16s[4]', Unknown => 1 },
+    0x8b => { Name => 'ColorTempUnknown8', Unknown => 1 },
+    0x8c => { Name => 'WB_RGGBLevelsUnknown9',  Format => 'int16s[4]', Unknown => 1 },
+    0x90 => { Name => 'ColorTempUnknown9', Unknown => 1 },
+    0x91 => { Name => 'WB_RGGBLevelsUnknown10',  Format => 'int16s[4]', Unknown => 1 },
+    0x95 => { Name => 'ColorTempUnknown10', Unknown => 1 },
+    0x96 => { Name => 'WB_RGGBLevelsDaylight',   Format => 'int16s[4]' },
+    0x9a => 'ColorTempDaylight',
+    0x9b => { Name => 'WB_RGGBLevelsShade',      Format => 'int16s[4]' },
+    0x9f => 'ColorTempShade',
+    0xa0 => { Name => 'WB_RGGBLevelsCloudy',     Format => 'int16s[4]' },
+    0xa4 => 'ColorTempCloudy',
+    0xa5 => { Name => 'WB_RGGBLevelsTungsten',   Format => 'int16s[4]' },
+    0xa9 => 'ColorTempTungsten',
+    0xaa => { Name => 'WB_RGGBLevelsFluorescent',Format => 'int16s[4]' },
+    0xae => 'ColorTempFluorescent',
+    0xaf => { Name => 'WB_RGGBLevelsKelvin',     Format => 'int16s[4]' },
+    0xb3 => 'ColorTempKelvin',
+    0xb4 => { Name => 'WB_RGGBLevelsFlash',      Format => 'int16s[4]' },
+    0xb8 => 'ColorTempFlash',
+    0xb9 => { Name => 'WB_RGGBLevelsUnknown11',  Format => 'int16s[4]', Unknown => 1 },
+    0xbd => { Name => 'ColorTempUnknown11', Unknown => 1 },
+    0xbe => { Name => 'WB_RGGBLevelsUnknown12',  Format => 'int16s[4]', Unknown => 1 },
+    0xc2 => { Name => 'ColorTempUnknown12', Unknown => 1 },
+    0xc3 => { Name => 'WB_RGGBLevelsUnknown13',  Format => 'int16s[4]', Unknown => 1 },
+    0xc7 => { Name => 'ColorTempUnknown13', Unknown => 1 },
+    0xc8 => { Name => 'WB_RGGBLevelsUnknown14',  Format => 'int16s[4]', Unknown => 1 },
+    0xcc => { Name => 'ColorTempUnknown14', Unknown => 1 },
+    0xcd => { Name => 'WB_RGGBLevelsUnknown15',  Format => 'int16s[4]', Unknown => 1 },
+    0xd1 => { Name => 'ColorTempUnknown15', Unknown => 1 },
+    0xd2 => { Name => 'WB_RGGBLevelsUnknown16',  Format => 'int16s[4]', Unknown => 1 },
+    0xd6 => { Name => 'ColorTempUnknown16', Unknown => 1 },
+    0xd7 => { Name => 'WB_RGGBLevelsUnknown17',  Format => 'int16s[4]', Unknown => 1 },
+    0xdb => { Name => 'ColorTempUnknown17', Unknown => 1 },
+    0xdc => { Name => 'WB_RGGBLevelsUnknown18',  Format => 'int16s[4]', Unknown => 1 },
+    0xe0 => { Name => 'ColorTempUnknown18', Unknown => 1 },
+    0xe1 => { Name => 'WB_RGGBLevelsUnknown19',  Format => 'int16s[4]', Unknown => 1 },
+    0xe5 => { Name => 'ColorTempUnknown19', Unknown => 1 },
+    0xe6 => { Name => 'WB_RGGBLevelsUnknown20',  Format => 'int16s[4]', Unknown => 1 },
+    0xea => { Name => 'ColorTempUnknown20', Unknown => 1 },
+    0xeb => { Name => 'WB_RGGBLevelsUnknown21',  Format => 'int16s[4]', Unknown => 1 },
+    0xef => { Name => 'ColorTempUnknown21', Unknown => 1 },
+    0xf0 => { Name => 'WB_RGGBLevelsUnknown22',  Format => 'int16s[4]', Unknown => 1 },
+    0xf4 => { Name => 'ColorTempUnknown22', Unknown => 1 },
+    0xf5 => { Name => 'WB_RGGBLevelsUnknown23',  Format => 'int16s[4]', Unknown => 1 },
+    0xf9 => { Name => 'ColorTempUnknown23', Unknown => 1 },
+    0xfa => { Name => 'WB_RGGBLevelsUnknown24',  Format => 'int16s[4]', Unknown => 1 },
+    0xfe => { Name => 'ColorTempUnknown24', Unknown => 1 },
+    0xff => { Name => 'WB_RGGBLevelsUnknown25',  Format => 'int16s[4]', Unknown => 1 },
+    0x103=> { Name => 'ColorTempUnknown25', Unknown => 1 },
+    0x104=> { Name => 'WB_RGGBLevelsUnknown26',  Format => 'int16s[4]', Unknown => 1 },
+    0x108=> { Name => 'ColorTempUnknown26', Unknown => 1 },
+    0x109=> { Name => 'WB_RGGBLevelsUnknown27',  Format => 'int16s[4]', Unknown => 1 },
+    0x10d=> { Name => 'ColorTempUnknown27', Unknown => 1 },
+    0x10e=> { Name => 'WB_RGGBLevelsUnknown28',  Format => 'int16s[4]', Unknown => 1 },
+    0x112=> { Name => 'ColorTempUnknown28', Unknown => 1 },
+    0x113=> { Name => 'WB_RGGBLevelsUnknown29',  Format => 'int16s[4]', Unknown => 1 },
+    0x117=> { Name => 'ColorTempUnknown29', Unknown => 1 },
+    0x118 => {
+        Name => 'ColorCalib',
+        Format => 'undef[120]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorCalib' }
+    },
+    0x157 => {
+        Name => 'PerChannelBlackLevel',
+        Format => 'int16u[4]',
+    },
+    # 0x326 - PerChannelBlackLevel again
+    0x32a => {
+        Name => 'NormalWhiteLevel',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+    },
+    0x32b => {
+        Name => 'SpecularWhiteLevel',
+        Format => 'int16u',
+    },
+    0x32c => {
+        Name => 'LinearityUpperMargin',
+        Format => 'int16u',
+    },
+);
+
 # Unknown color data (MakerNotes tag 0x4001)
 %Image::ExifTool::Canon::ColorDataUnknown = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -8563,7 +8724,7 @@ my %filterConv = (
         Name => 'MakerNoteCanon',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
-            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+            ProcessProc => \&ProcessCMT3,
             WriteProc => \&Image::ExifTool::WriteTIFF,
         },
     },
@@ -9509,6 +9670,33 @@ sub CanonEvInv($)
     return $sign * ($val * 0x20 + $frac);
 }
 
+#------------------------------------------------------------------------------
+# Read CMT3 maker notes from CR3 file
+# Inputs: 0) ExifTool object reference, 1) dirInfo ref, 2) tag table ref
+# Returns: data block (may be empty if no Exif data) or undef on error
+sub ProcessCMT3($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+
+    # extract the static maker notes to copying to other file types if requested
+    # Note: this won't copy makernotes in the timed metadata since these are stored
+    # separately, but the only records they have that aren't in the static maker notes
+    # (for the M50) are: ColorData9, Flavor, CanonCameraInfoUnknown,
+    # VignettingCorrUnknown1, Canon_0x4033 and Canon_0x402e
+    if (($et->Options('MakerNotes') or $$et{REQ_TAG_LOOKUP}{makernotecanon}) and
+        $$dirInfo{DirLen} > 8)
+    {
+        my $dataPt = $$dirInfo{DataPt};
+        # remove old (unused) trailer
+        $$dataPt =~ s/(II\x2a\0|MM\0\x2a)\0{4,10}$//;
+        # remove TIFF header and append as the Canon makernote trailer
+        # (so offsets will be interpreted correctly)
+        my $val = substr($$dataPt,8) . substr($$dataPt,0,8);
+        $et->FoundTag($Image::ExifTool::Canon::uuid{CMT3}, \$val);
+    }
+    return $et->ProcessTIFF($dirInfo, $tagTablePtr);
+}
+
 #------------------------------------------------------------------------------
 # Process CTMD EXIF information
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref