exiftool_vendored 12.38.0 → 12.42.0

data/bin/exiftool

@@ -8,9 +8,10 @@
 #               (See html/history.html for revision history)
 #------------------------------------------------------------------------------
 use strict;
+use warnings;
 require 5.004;
 
-my $version = '12.38';
+my $version = '12.42';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -109,6 +110,8 @@ my %database;       # lookup for database information based on file name (in Exi
 my %filterExt;      # lookup for filtered extensions
 my %ignore;         # directory names to ignore
 my $ignoreHidden;   # flag to ignore hidden files
+my %outComma;       # flag that output text file needs a comma
+my %outTrailer;     # trailer for output text file
 my %preserveTime;   # preserved timestamps for files
 my %printFmt;       # the contents of the print format file
 my %setTags;        # hash of list references for tags to set from files
@@ -441,6 +444,8 @@ undef %database;
 undef %endDir;
 undef %filterExt;
 undef %ignore;
+undef %outComma;
+undef %outTrailer;
 undef %printFmt;
 undef %preserveTime;
 undef %setTags;
@@ -1821,8 +1826,21 @@ if ($filtered and not $validFile) {
 PrintCSV() if $csv and not $isWriting;
 
 # print folder/file trailer if necessary
-print $sectTrailer if $sectTrailer and not $textOut;
-print $fileTrailer if $fileTrailer and not $textOut and not $fileHeader;
+if ($textOut) {
+    foreach (keys %outTrailer) {
+        next unless $outTrailer{$_};
+        if ($mt->Open(\*OUTTRAIL, $_, '>>')) {
+            my $fp = \*OUTTRAIL;
+            print $fp $outTrailer{$_};
+            close $fp;
+        } else {
+            Error("Error appending to $_\n");
+        }
+    }
+} else {
+    print $sectTrailer if $sectTrailer;
+    print $fileTrailer if $fileTrailer and not $fileHeader;
+}
 
 my $totWr = $countGoodWr + $countBadWr + $countSameWr + $countCopyWr +
             $countGoodCr + $countBadCr;
@@ -2160,6 +2178,9 @@ sub GetImageInfo($$)
         $tmpText = $outfile unless $append;
     }
 
+    # restore state of comma flag for this file if appending
+    $comma = $outComma{$outfile} if $append and ($textOverwrite & 0x02);
+
     # print the results for this file
     if (%printFmt) {
         # output using print format file (-p) option
@@ -2221,7 +2242,7 @@ sub GetImageInfo($$)
         if ($fp) {
             # print file header (only once)
             if ($fileHeader) {
-                print $fp $fileHeader;
+                print $fp $fileHeader unless defined $outfile and ($created{$outfile} or $appended{$outfile});
                 undef $fileHeader unless $textOut;
             }
             if ($html) {
@@ -2533,8 +2554,9 @@ TAG:    foreach $tag (@foundTags) {
                 if ($showTagID or $outFormat < 0) {
                     $val = { val => $val };
                     if ($showTagID) {
-                        my $id = $et->GetTagID($tag);
+                        my ($id, $lang) = $et->GetTagID($tag);
                         $id = sprintf('0x%.4x', $id) if $showTagID eq 'H' and $id =~ /^\d+$/;
+                        $$val{lang} = $lang if $lang;
                         $$val{id} = $id;
                     }
                     if ($tabFormat) {
@@ -2674,9 +2696,17 @@ TAG:    foreach $tag (@foundTags) {
         }
     }
     if ($outfile) {
-        # write section and file trailers before closing the file
-        print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
-        print $fp $fileTrailer if $fileTrailer;
+        if ($textOverwrite & 0x02) {
+            # save state of this file if we may be appending
+            $outComma{$outfile} = $comma;
+            $outTrailer{$outfile} = '';
+            $outTrailer{$outfile} .= $sectTrailer and $sectTrailer = '' if $sectTrailer;
+            $outTrailer{$outfile} .= $fileTrailer if $fileTrailer;
+        } else {
+            # write section and file trailers before closing the file
+            print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
+            print $fp $fileTrailer if $fileTrailer;
+        }
         close($fp);
         undef $tmpText;
         if ($lineCount) {
@@ -2926,7 +2956,7 @@ sub SetImageInfo($$$)
             }
         }
         if (defined $outfile) {
-            $verbose and print $vout "'${infile}' --> '${outfile}'\n";
+            defined $verbose and print $vout "'${infile}' --> '${outfile}'\n";
             # create output directory if necessary
             CreateDirectory($outfile);
             # set temporary file (automatically erased on abnormal exit)
@@ -4459,7 +4489,7 @@ B<exiftool> [I<OPTIONS>] -I<TAG>[+-E<lt>]=[I<VALUE>]... I<FILE>...
 =head2 Copying
 
 B<exiftool> [I<OPTIONS>] B<-tagsFromFile> I<SRCFILE>
-[-I<SRCTAG>[E<gt>I<DSTTAG>]...] I<FILE>...
+[-[I<DSTTAG>E<lt>]I<SRCTAG>...] I<FILE>...
 
 =head2 Other
 
@@ -4499,48 +4529,48 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RIFF  r
-  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RSRC  r
-  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RTF   r
-  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RW2   r/w
-  A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWL   r/w
-  AA    r     | DYLIB r     | K25   r     | OGV   r     | RWZ   r
-  AAE   r     | EIP   r     | KDC   r     | ONP   r     | RM    r
-  AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SEQ   r
-  ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SKETCH r
-  AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SO    r
-  AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SR2   r/w
-  AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRF   r
-  APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SRW   r/w
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SVG   r
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | SWF   r
-  ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | THM   r/w
-  AVI   r     | FITS  r     | MAX   r     | PDB   r     | TIFF  r/w
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TORRENT r
-  AZW   r     | FLAC  r     | MIE   r/w/  | PEF   r/w   | TTC   r
-  BMP   r     | FLIF  r/w   | MIFF  r   c | PFA   r     | TTF   r
-  BPG   r     | FLV   r     | MKA   r     | PFB   r     | TXT   r
-  BTF   r     | FPF   r     | MKS   r     | PFM   r     | VCF   r
-  CHM   r     | FPX   r     | MKV   r     | PGF   r     | VRD   r/w/c
-  COS   r     | GIF   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
-  CR2   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
-  CR3   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
-  CRM   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r
-  CRW   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
-  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
-  CSV   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
-  CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WTV   r
-  DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WV    r
-  DCP   r/w   | ICS   r     | MPG   r     | PSB   r/w   | X3F   r/w
-  DCR   r     | IDML  r     | MPO   r/w   | PSD   r/w   | XCF   r
-  DFONT r     | IIQ   r/w   | MQV   r/w   | PSP   r     | XLS   r
-  DIVX  r     | IND   r/w   | MRC   r     | QTIF  r/w   | XLSX  r
-  DJVU  r     | INSP  r/w   | MRW   r/w   | R3D   r     | XMP   r/w/c
-  DLL   r     | INSV  r     | MXF   r     | RA    r     | ZIP   r
-  DNG   r/w   | INX   r     | NEF   r/w   | RAF   r/w   |
-  DOC   r     | ISO   r     | NRW   r/w   | RAM   r     |
-  DOCX  r     | ITC   r     | NUMBERS r   | RAR   r     |
-  DPX   r     | J2C   r     | O     r     | RAW   r/w   |
+  360   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RAW   r/w
+  3FR   r     | DSS   r     | JP2   r/w   | ODP   r     | RIFF  r
+  3G2   r/w   | DV    r     | JPEG  r/w   | ODS   r     | RSRC  r
+  3GP   r/w   | DVB   r/w   | JSON  r     | ODT   r     | RTF   r
+  A     r     | DVR-MS r    | JXL   r     | OFR   r     | RW2   r/w
+  AA    r     | DYLIB r     | K25   r     | OGG   r     | RWL   r/w
+  AAE   r     | EIP   r     | KDC   r     | OGV   r     | RWZ   r
+  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | RM    r
+  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SEQ   r
+  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SKETCH r
+  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SO    r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SR2   r/w
+  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SRF   r
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRW   r/w
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
+  ASF   r     | FFF   r/w   | MACOS r     | PCD   r     | SWF   r
+  AVI   r     | FITS  r     | MAX   r     | PCX   r     | THM   r/w
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TIFF  r/w
+  AZW   r     | FLAC  r     | MIE   r/w/  | PDF   r/w   | TORRENT r
+  BMP   r     | FLIF  r/w   | MIFF  r   c | PEF   r/w   | TTC   r
+  BPG   r     | FLV   r     | MKA   r     | PFA   r     | TTF   r
+  BTF   r     | FPF   r     | MKS   r     | PFB   r     | TXT   r
+  CHM   r     | FPX   r     | MKV   r     | PFM   r     | VCF   r
+  COS   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
+  CR2   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VSD   r
+  CR3   r/w   | GZ    r     | MODD  r     | PLIST r     | WAV   r
+  CRM   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WDP   r/w
+  CRW   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WEBP  r
+  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
+  CSV   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WMA   r
+  CZI   r     | HTML  r     | MP4   r/w   | PPT   r     | WMV   r
+  DCM   r     | ICC   r/w/c | MPC   r     | PPTX  r     | WTV   r
+  DCP   r/w   | ICS   r     | MPG   r     | PS    r/w   | WV    r
+  DCR   r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
+  DFONT r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
+  DIVX  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
+  DJVU  r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
+  DLL   r     | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
+  DNG   r/w   | INX   r     | NEF   r/w   | RA    r     | ZIP   r
+  DOC   r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
+  DOCX  r     | ITC   r     | NRW   r/w   | RAM   r     |
+  DPX   r     | J2C   r     | NUMBERS r   | RAR   r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5136,13 +5166,14 @@ The following examples demonstrate basic use of the B<-csv> option:
     # update metadata for all images in a directory from CSV file
     exiftool -csv=a.csv dir
 
-Empty values are ignored when importing (unless the B<-f> option is used and
-the API MissingTagValue is set to an empty string, in which case the tag is
+When importing, empty values are ignored unless the B<-f> option is used and
+the API MissingTagValue is set to an empty string (in which case the tag is
 deleted).  Also, FileName and Directory columns are ignored if they exist
-(ie. ExifTool will not attempt to write these tags with a CSV import).  To
-force a tag to be deleted, use the B<-f> option and set the value to "-" in
-the CSV file (or to the MissingTagValue if this API option was used).
-Multiple databases may be imported in a single command.
+(ie. ExifTool will not attempt to write these tags with a CSV import), but
+all other columns are imported.  To force a tag to be deleted, use the B<-f>
+option and set the value to "-" in the CSV file (or to the MissingTagValue
+if this API option was used).  Multiple databases may be imported in a
+single command.
 
 When exporting a CSV file, the B<-g> or B<-G> option adds group names to the
 tag headings.  If the B<-a> option is used to allow duplicate tag names, the
@@ -5436,7 +5467,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.38 --
+    -- Generated by ExifTool 12.42 --
     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
@@ -5555,7 +5586,9 @@ level greater than 0, most other options are ignored and normal console
 output is suppressed unless specific tags are extracted.  Using B<-v0>
 causes the console output buffer to be flushed after each line (which may be
 useful to avoid delays when piping exiftool output), and prints the name of
-each processed file when writing.  Also see the B<-progress> option.
+each processed file when writing and the new file name when renaming,
+moving or copying.  Verbose levels above B<-v0> do not flush after each
+line.  Also see the B<-progress> option.
 
 =item B<-w>[+|!] I<EXT> or I<FMT> (B<-textOut>)
 
@@ -5768,11 +5801,10 @@ an XMP extension for the output file.
 =item B<-a>, B<--a> (B<-duplicates>, B<--duplicates>)
 
 Allow (B<-a>) or suppress (B<--a>) duplicate tag names to be extracted.  By
-default, duplicate tags are suppressed when reading unless the B<-ee> or
-B<-X> options are used or the Duplicates option is enabled in the
-configuration file. This option has an affect when writing only to allow
-duplicate Warning messages to be shown.  Duplicate tags are always extracted
-when copying.
+default, duplicate tags are suppressed when reading unless the B<-ee> or B<-X>
+options are used or the Duplicates option is enabled in the configuration file.
+When writing, this option allows multiple Warning messages to be shown.
+Duplicate tags are always extracted when copying.
 
 =item B<-e> (B<--composite>)
 
@@ -7250,7 +7282,7 @@ the commands if B<-execute> was used).
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey
+Copyright 2003-2022, Phil Harvey
 
 This is free software; you can redistribute it and/or modify it under the
 same terms as Perl itself.

data/bin/lib/File/RandomAccess.pm

@@ -25,7 +25,7 @@
 #
 #               May also be used for string i/o (just pass a scalar reference)
 #
-# Legal:        Copyright (c) 2003-2021 Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2022 Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------

data/bin/lib/File/RandomAccess.pod

@@ -3,7 +3,7 @@
 #
 # Description:  Buffer to support random access reading of sequential file
 #
-# Legal:        Copyright (c) 2003-2021 Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2022 Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------
@@ -236,7 +236,7 @@ the end of file is not allowed.
 
 =head1 AUTHOR
 
-Copyright 2003-2021 Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022 Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -477,7 +477,7 @@ main purpose of encryption, so this really can't be considered a bug.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -259,7 +259,7 @@ scanning for AFCP information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -287,7 +287,7 @@ information from AIFF (Audio Interchange File Format) audio files.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -263,7 +263,7 @@ Currently doesn't parse MAC header unless it is at the start of the file.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -305,7 +305,7 @@ APP12 meta information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -876,7 +876,7 @@ Windows Media Audio (WMA) and Windows Media Video (WMV) files.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -149,7 +149,7 @@ Apple maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -291,7 +291,7 @@ information from Audible audio books.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -335,7 +335,7 @@ This module contains definitions required by Image::ExifTool to read BMP
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -231,7 +231,7 @@ This module contains definitions required by Image::ExifTool to read BPG
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -445,7 +445,7 @@ compression ability).
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 Copyright 2002, Leon Bottou and Yann Le Cun
 Copyright 2001, AT&T
 Copyright 1999-2001, LizardTech Inc.

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

@@ -275,7 +275,7 @@ information in BigTIFF images.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -669,7 +669,7 @@ L<Image::ExifTool::BuildTagLookup|Image::ExifTool::BuildTagLookup>.
 
 ~head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
@@ -905,8 +905,10 @@ TagID:  foreach $tagID (@keys) {
                 foreach (@grps) {
                     warn "Group name starts with 'ID-' for $short $name\n" if /^ID-/i;
                 }
-                if ($isXMP and not $$tagInfo{Avoid} and not $$tagInfo{Struct}) {
-                    $dupXmpTag{$name} and warn "Duplicate XMP tag $name\n";
+                if ($isXMP and not $$tagInfo{Avoid} and not $$tagInfo{Struct} and
+                    ($$tagInfo{Writable} or $$table{WRITABLE}))
+                {
+                    $dupXmpTag{$name} and warn "Duplicate writable XMP tag $name\n";
                     $dupXmpTag{$name} = 1;
                 }
                 # validate Name (must not start with a digit or else XML output will not be valid;
@@ -2760,7 +2762,7 @@ Returned list of writable pseudo tags.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -307,7 +307,7 @@ specification.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.55';
+$VERSION = '4.58';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -197,6 +197,7 @@ $VERSION = '4.55';
     44 => 'Canon EF 90-300mm f/4.5-5.6', #32
     45 => 'Canon EF-S 18-55mm f/3.5-5.6 [II]', #PH (same ID for version II, ref 20)
     46 => 'Canon EF 28-90mm f/4-5.6', #32
+  # 46 => 'Tamron 28-300mm f/3.5-6.3 Di VC PZD (A010)', # (also possibly?)
     47 => 'Zeiss Milvus 35mm f/2 or 50mm f/2', #IB
     47.1 => 'Zeiss Milvus 50mm f/2 Makro', #IB
     47.2 => 'Zeiss Milvus 135mm f/2 ZE', #IB
@@ -208,6 +209,7 @@ $VERSION = '4.55';
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
     54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
     60 => 'Irix 11mm f/4', #50
+    63 => 'Irix 30mm F1.4 Dragonfly', #IB
     80 => 'Canon TS-E 50mm f/2.8L Macro', #42
     81 => 'Canon TS-E 90mm f/2.8L Macro', #42
     82 => 'Canon TS-E 135mm f/4L Macro', #42
@@ -570,7 +572,9 @@ $VERSION = '4.55';
     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
-    # see RFLensType tag for master list of 61182 RF lenses
+#
+# 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',
@@ -599,7 +603,15 @@ $VERSION = '4.55';
    '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',
+   '61182.28' => 'Canon RF 400mm F2.8L IS USM', #IB
+   '61182.29' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+   '61182.30' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
+   '61182.31' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+   # we need the RFLensType values for the following...
+   '61182.32' => 'Canon RF 800mm F5.6L IS USM', #PH (NC)
+   '61182.33' => 'Canon RF 1200mm F8L IS USM', #PH (NC)
+   '61182.34' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.35' => 'Canon RF 100mm F2.8L MACRO IS USM', #(NC)
     65535 => 'n/a',
 );
 
@@ -970,8 +982,8 @@ my %canonQuality = (
     4 => 'RAW',
     5 => 'Superfine',
     7 => 'CRAW', #42
-    130 => 'Normal Movie', #22
-    131 => 'Movie (2)', #PH (7DmkII 1920x1080)
+    130 => 'Light (RAW)', #github#119
+    131 => 'Standard (RAW)', #github#119
 );
 my %canonImageSize = (
    -1 => 'n/a',
@@ -1018,7 +1030,7 @@ my %canonWhiteBalance = (
     20 => 'PC Set4', #PH
     21 => 'PC Set5', #PH
     # 22 - Custom 2?
-    23 => 'Auto (ambience priority)', #PH (5DS)
+    23 => 'Auto (ambience priority)', #PH (5DS) (perhaps this needs re-thinking?: forum13295)
     # 30 - Click White Balance?
     # 31 - Shot Settings?
     # 137 - Tungsten?
@@ -2053,6 +2065,13 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             TagTable => 'Image::ExifTool::Canon::HDRInfo',
         }
     },
+    0x4026 => { #github#119
+        Name => 'LogInfo',
+        SubDirectory => {
+            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart,$size)',
+            TagTable => 'Image::ExifTool::Canon::LogInfo',
+        }
+    },
     0x4028 => { #PH
         Name => 'AFConfig', # (AFTabInfo)
         SubDirectory => {
@@ -2126,6 +2145,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             4 => 'Continuous, Low', #PH
             5 => 'Continuous, High', #PH
             6 => 'Silent Single', #PH
+            8 => 'Continuous, High+', #WolfgangGulcker
             # ref A: https://exiftool.org/forum/index.php/topic,5701.msg27843.html#msg27843
             9 => 'Single, Silent', #A
             10 => 'Continuous, Silent', #A
@@ -6789,6 +6809,10 @@ my %ciMaxFocal = (
             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
+            289 => 'Canon RF 400mm F2.8L IS USM', #IB
+            290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+            291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
+            292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
            #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
@@ -8701,6 +8725,65 @@ my %filterConv = (
     # 3 - maybe related to AutoImageAlign?
 );
 
+# More color information (MakerNotes tag 0x4026) (ref github issue #119)
+%Image::ExifTool::Canon::LogInfo = (
+    %binaryDataAttrs,
+    FORMAT => 'int32s',
+    FIRST_ENTRY => 1,
+    PRIORITY => 0,
+    4 => {
+        Name => 'CompressionFormat',
+        PrintConv => {
+             0 => 'Editing (ALL-I)',
+             1 => 'Standard (IPB)',
+             2 => 'Light (IPB)',
+             3 => 'Motion JPEG',
+             4 => 'RAW', # either Standard or Light, depending on Quality
+        },
+    },
+    6 => {  # 0 to 7
+        Name => 'Sharpness',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+    },
+    7 => {  # -4 to 4
+        Name => 'Saturation', 
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        %Image::ExifTool::Exif::printParameter,
+    },
+    8 => {  # -4 to 4
+        Name => 'ColorTone',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        %Image::ExifTool::Exif::printParameter,
+    },
+    9 => {
+        Name => 'ColorSpace2',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        PrintConv => {
+            0 => 'BT.709',
+            1 => 'BT.2020',
+            2 => 'CinemaGamut',
+        },
+    },
+    10 => {
+        Name => 'ColorMatrix',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        PrintConv => {
+            0 => 'EOS Original',
+            1 => 'Neutral',
+        },
+    },
+    11 => {
+        Name => 'CanonLogVersion', # (increases dynamic range of sensor data)
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        PrintConv => {
+            0 => 'OFF',
+            1 => 'CLogV1',
+            2 => 'CLogV2', # (NC)
+            3 => 'CLogV3',
+        },
+    },
+);
+
 # AF configuration info (MakerNotes tag 0x4028) (ref PH)
 %Image::ExifTool::Canon::AFConfig = (
     %binaryDataAttrs,
@@ -10064,7 +10147,7 @@ Canon maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.