exiftool-vendored.pl 12.84.0 → 12.89.0

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.84';
+my $version = '12.89';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -51,7 +51,7 @@ sub CleanXML($);
 sub EncodeXML($);
 sub FormatXML($$$);
 sub EscapeJSON($;$);
-sub FormatJSON($$$);
+sub FormatJSON($$$;$);
 sub PrintCSV();
 sub AddGroups($$$$);
 sub ConvertBinary($);
@@ -735,6 +735,7 @@ for (;;) {
             push @isUTF8, 10 if $isAlt;
             for ($i=0; ; ++$i) {
                 my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt,1) or last;
+                $#entry = 9;    # remove everything after latitude (eg. feature type)
                 next if $minPop and $entry[7] < $minPop;
                 next if %fcodes and $neg ? $fcodes{lc $entry[6]} : not $fcodes{lc $entry[6]};
                 push @entry, Image::ExifTool::Geolocation::GetAltNames($i,1) if $isAlt;
@@ -1801,7 +1802,12 @@ if ($outOpt) {
     my $type = GetFileType($outOpt);
     if ($type) {
         # (must test original file name because we can write .webp but not other RIFF types)
-        unless (CanWrite($outOpt)) {
+        my $canWrite = CanWrite($outOpt);
+        unless ($canWrite) {
+            if (defined $canWrite and $canWrite eq '') {
+                $type = Image::ExifTool::GetFileExtension($outOpt);
+                $type = uc($outOpt) unless defined $type;
+            }
             Warn "Can't write $type files\n";
             $rtnVal = 1;
             next;
@@ -2365,7 +2371,7 @@ sub GetImageInfo($$)
         my $errs = $et->GetInfo('Warning', 'Error');
         PrintErrors($et, $errs, $file) and EFile($file);
     } elsif (not $disableOutput) {
-        my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep);
+        my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep, $quote);
         if ($fp) {
             # print file header (only once)
             if ($fileHeader) {
@@ -2408,6 +2414,7 @@ sub GetImageInfo($$)
             } elsif ($json) {
                 # set delimiters for JSON or PHP output
                 ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
+                $quote = 1 if $$et{OPTIONS}{StructFormat} and $$et{OPTIONS}{StructFormat} eq 'JSONQ';
                 print $fp ",\n" if $comma;
                 print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file),1);
                 $comma = 1;
@@ -2701,7 +2708,7 @@ TAG:    foreach $tag (@foundTags) {
                         }
                     }
                 }
-                FormatJSON($fp, $val, $ind);
+                FormatJSON($fp, $val, $ind, $quote);
                 $comma = 1;
                 next;
             }
@@ -3493,17 +3500,17 @@ sub EscapeJSON($;$)
 
 #------------------------------------------------------------------------------
 # Print JSON or PHP value
-# Inputs: 0) file reference, 1) value, 2) indentation
-sub FormatJSON($$$)
+# Inputs: 0) file reference, 1) value, 2) indentation, 3) true to quote numbers
+sub FormatJSON($$$;$)
 {
     local $_;
-    my ($fp, $val, $ind) = @_;
+    my ($fp, $val, $ind, $quote) = @_;
     my $comma;
     if (not ref $val) {
-        print $fp EscapeJSON($val);
+        print $fp EscapeJSON($val, $quote);
     } elsif (ref $val eq 'ARRAY') {
         if ($joinLists and not ref $$val[0]) {
-            print $fp EscapeJSON(join $listSep, @$val);
+            print $fp EscapeJSON(join($listSep, @$val), $quote);
         } else {
             my ($bra, $ket) = $json == 1 ? ('[',']') : ('Array(',')');
             print $fp $bra;
@@ -4720,50 +4727,50 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ITC   r     | O     r     | RSRC  r
-  3FR   r     | DPX   r     | J2C   r     | ODP   r     | RTF   r
-  3G2   r/w   | DR4   r/w/c | JNG   r/w   | ODS   r     | RW2   r/w
-  3GP   r/w   | DSS   r     | JP2   r/w   | ODT   r     | RWL   r/w
-  7Z    r     | DV    r     | JPEG  r/w   | OFR   r     | RWZ   r
-  A     r     | DVB   r/w   | JSON  r     | OGG   r     | RM    r
-  AA    r     | DVR-MS r    | JXL   r/w   | OGV   r     | SEQ   r
-  AAC   r     | DYLIB r     | K25   r     | ONP   r     | SKETCH r
-  AAE   r     | EIP   r     | KDC   r     | OPUS  r     | SO    r
-  AAX   r/w   | EPS   r/w   | KEY   r     | ORF   r/w   | SR2   r/w
-  ACR   r     | EPUB  r     | LA    r     | ORI   r/w   | SRF   r
-  AFM   r     | ERF   r/w   | LFP   r     | OTF   r     | SRW   r/w
-  AI    r/w   | EXE   r     | LIF   r     | PAC   r     | SVG   r
-  AIFF  r     | EXIF  r/w/c | LNK   r     | PAGES r     | SWF   r
-  APE   r     | EXR   r     | LRV   r/w   | PBM   r/w   | THM   r/w
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PCD   r     | TIFF  r/w
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCX   r     | TORRENT r
-  ASF   r     | FFF   r/w   | MACOS r     | PDB   r     | TTC   r
-  AVI   r     | FITS  r     | MAX   r     | PDF   r/w   | TTF   r
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PEF   r/w   | TXT   r
-  AZW   r     | FLAC  r     | MIE   r/w/c | PFA   r     | VCF   r
-  BMP   r     | FLIF  r/w   | MIFF  r     | PFB   r     | VNT   r
-  BPG   r     | FLV   r     | MKA   r     | PFM   r     | VRD   r/w/c
-  BTF   r     | FPF   r     | MKS   r     | PGF   r     | VSD   r
-  C2PA  r     | FPX   r     | MKV   r     | PGM   r/w   | WAV   r
-  CHM   r     | GIF   r/w   | MNG   r/w   | PLIST r     | WDP   r/w
-  COS   r     | GLV   r/w   | MOBI  r     | PICT  r     | WEBP  r/w
-  CR2   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WEBM  r
-  CR3   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WMA   r
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WMV   r
-  CRW   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WPG   r
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PPTX  r     | WTV   r
-  CSV   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WV    r
-  CUR   r     | HTML  r     | MPC   r     | PSB   r/w   | X3F   r/w
-  CZI   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | XCF   r
-  DCM   r     | ICO   r     | MPO   r/w   | PSP   r     | XISF  r
-  DCP   r/w   | ICS   r     | MQV   r/w   | QTIF  r/w   | XLS   r
-  DCR   r     | IDML  r     | MRC   r     | R3D   r     | XLSX  r
-  DFONT r     | IIQ   r/w   | MRW   r/w   | RA    r     | XMP   r/w/c
-  DIVX  r     | IND   r/w   | MXF   r     | RAF   r/w   | ZIP   r
-  DJVU  r     | INSP  r/w   | NEF   r/w   | RAM   r     |
-  DLL   r     | INSV  r     | NKSC  r/w   | RAR   r     |
-  DNG   r/w   | INX   r     | NRW   r/w   | RAW   r/w   |
-  DOC   r     | ISO   r     | NUMBERS r   | RIFF  r     |
+  360   r/w   | DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w
+  3FR   r     | DPX   r     | J2C   r     | NXD   r     | RIFF  r
+  3G2   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RSRC  r
+  3GP   r/w   | DSS   r     | JP2   r/w   | ODP   r     | RTF   r
+  7Z    r     | DV    r     | JPEG  r/w   | ODS   r     | RW2   r/w
+  A     r     | DVB   r/w   | JSON  r     | ODT   r     | RWL   r/w
+  AA    r     | DVR-MS r    | JXL   r/w   | OFR   r     | RWZ   r
+  AAC   r     | DYLIB r     | K25   r     | OGG   r     | RM    r
+  AAE   r     | EIP   r     | KDC   r     | OGV   r     | SEQ   r
+  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | SKETCH r
+  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SO    r
+  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SR2   r/w
+  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SRF   r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SRW   r/w
+  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SVG   r
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SWF   r
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | THM   r/w
+  ASF   r     | FFF   r/w   | MACOS r     | PCD   r     | TIFF  r/w
+  AVI   r     | FITS  r     | MAX   r     | PCX   r     | TORRENT r
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TTC   r
+  AZW   r     | FLAC  r     | MIE   r/w/c | PDF   r/w   | TTF   r
+  BMP   r     | FLIF  r/w   | MIFF  r     | PEF   r/w   | TXT   r
+  BPG   r     | FLV   r     | MKA   r     | PFA   r     | VCF   r
+  BTF   r     | FPF   r     | MKS   r     | PFB   r     | VNT   r
+  C2PA  r     | FPX   r     | MKV   r     | PFM   r     | VRD   r/w/c
+  CHM   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VSD   r
+  COS   r     | GLV   r/w   | MOBI  r     | PGM   r/w   | WAV   r
+  CR2   r/w   | GPR   r/w   | MODD  r     | PLIST r     | WDP   r/w
+  CR3   r/w   | GZ    r     | MOI   r     | PICT  r     | WEBP  r/w
+  CRM   r/w   | HDP   r/w   | MOS   r/w   | PMP   r     | WEBM  r
+  CRW   r/w   | HDR   r     | MOV   r/w   | PNG   r/w   | WMA   r
+  CS1   r/w   | HEIC  r/w   | MP3   r     | PPM   r/w   | WMV   r
+  CSV   r     | HEIF  r/w   | MP4   r/w   | PPT   r     | WPG   r
+  CUR   r     | HTML  r     | MPC   r     | PPTX  r     | WTV   r
+  CZI   r     | ICC   r/w/c | MPG   r     | PS    r/w   | WV    r
+  DCM   r     | ICO   r     | MPO   r/w   | PSB   r/w   | X3F   r/w
+  DCP   r/w   | ICS   r     | MQV   r/w   | PSD   r/w   | XCF   r
+  DCR   r     | IDML  r     | MRC   r     | PSP   r     | XISF  r
+  DFONT r     | IIQ   r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
+  DIVX  r     | IND   r/w   | MXF   r     | R3D   r     | XLSX  r
+  DJVU  r     | INSP  r/w   | NEF   r/w   | RA    r     | XMP   r/w/c
+  DLL   r     | INSV  r     | NKA   r     | RAF   r/w   | ZIP   r
+  DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
+  DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5677,7 +5684,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.84 --
+    -- Generated by ExifTool 12.89 --
     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
@@ -5916,7 +5923,8 @@ processed file by using %C (upper case) instead of %c.  This allows a
 sequential number to be added to output file names, even if the names are
 different.  For %C, a copy number of zero is not omitted as it is with %c. 
 A leading '-' causes the number to be reset at the start of each new
-directory, and '+' has no effect.  The number before the decimal place gives
+directory (in the original directory structure if the files are being
+moved), and '+' has no effect.  The number before the decimal place gives
 the starting index, the number after the decimal place gives the field
 width.  The following examples show the output filenames when used with the
 command C<exiftool rose.jpg star.jpg jet.jpg ...>:
@@ -6117,7 +6125,9 @@ B<-if> and B<-fileOrder> options for details.
 =item B<-fileOrder>[I<NUM>] [-]I<TAG>
 
 Set file processing order according to the sorted value of the specified
-I<TAG>.  For example, to process files in order of date:
+I<TAG>.  Without this option, files are processed in the order returned by
+the system, which is commonly by file name, but this is filesystem
+dependent.  For example, to process files in order of date:
 
     exiftool -fileOrder DateTimeOriginal DIR
 

package/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.12';
+$VERSION = '1.13';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -226,9 +226,13 @@ sub ProcessAIFF($$)
         # AIFF chunks are padded to an even number of bytes
         my $len2 = $len + ($len & 0x01);
         if ($len2 > 100000000) {
-            if ($len2 >= 0x80000000 and not $et->Options('LargeFileSupport')) {
-                $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
-                last;
+            if ($len2 >= 0x80000000) {
+                if (not $et->Options('LargeFileSupport')) {
+                    $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
+                    last;
+                } elsif ($et->Options('LargeFileSupport') eq '2') {
+                    $et->WarnOnce('Skipping large chunk (LargeFileSupport is 2)');
+                }
             }
             if ($tagInfo) {
                 $et->Warn("Skipping large $$tagInfo{Name} chunk (> 100 MB)");

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

@@ -17,7 +17,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::RIFF;
 
-$VERSION = '1.25';
+$VERSION = '1.26';
 
 sub ProcessASF($$;$);
 sub ProcessContentDescription($$$);
@@ -780,6 +780,9 @@ sub ProcessASF($$;$)
             if ($size > 0x7fffffff * 4294967296) {
                 $err = 'Invalid ASF object size';
             } elsif ($et->Options('LargeFileSupport')) {
+                if ($et->Options('LargeFileSupport') eq '2') {
+                    $et->WarnOnce('Skipping large ASF object (LargeFileSupport is 2)');
+                }
                 if ($raf->Seek($size, 1)) {
                     $et->VPrint(0, "  Skipped large ASF object ($size bytes)\n");
                     $pos += $size;

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

@@ -128,7 +128,8 @@ sub ConvertPLIST($$);
             1 => 'ProRAW',
             2 => 'Portrait',
             10 => 'Photo',
-            12 => 'Photo (12)', #PH (NC)
+            11 => 'Manual Focus', #forum16044
+            12 => 'Scene', #forum16044
         },
     },
     0x0015 => { # (ImageGroupIdentifier, ref 2)

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.56';
+$VERSION = '3.58';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -98,6 +98,8 @@ my %tweakOrder = (
     GIMP    => 'Microsoft',
     DarwinCore => 'AFCP',
     MWG     => 'Shortcuts',
+    'FujiFilm::RAF' => 'FujiFilm::RAFHeader',
+    'FujiFilm::RAFData' => 'FujiFilm::RAF',
 );
 
 # list of all recognized Format strings
@@ -423,11 +425,11 @@ parameters, as well as proprietary information written by many camera
 models.  Tags with a question mark after their name are not extracted unless
 the L<Unknown|../ExifTool.html#Unknown> option is set.
 
-When writing, ExifTool creates both QuickTime and XMP tags by default, but
-the group may be specified to write one or the other separately.  If no
-location is specified, newly created QuickTime tags are added in the
-L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> location if
-possible, otherwise in
+When writing video files, ExifTool creates both QuickTime and XMP tags by
+default, but the group may be specified to write one or the other
+separately.  If no location is specified, newly created QuickTime tags are
+added in the L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags>
+location if possible, otherwise in
 L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags>, and
 finally in L<Keys|Image::ExifTool::TagNames/QuickTime Keys Tags>,
 but this order may be changed by setting the PREFERRED level of the
@@ -478,7 +480,7 @@ the original size by padding with nulls if necessary.
 
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
-for the official specification.
+for the official QuickTime specification.
 },
     Photoshop => q{
 Photoshop tags are found in PSD and PSB files, as well as inside embedded
@@ -600,7 +602,8 @@ running ExifTool the old information may be removed permanently using the
     DNG => q{
 The main DNG tags are found in the EXIF table.  The tables below define only
 information found within structures of these main DNG tag values.  See
-L<http://www.adobe.com/products/dng/> for the official DNG specification.
+L<https://helpx.adobe.com/camera-raw/digital-negative.html> for the official
+DNG specification.
 },
     MPEG => q{
 The MPEG format doesn't specify any file-level meta information.  In lieu of
@@ -905,6 +908,9 @@ TagID:  foreach $tagID (@keys) {
                 @infoArray = GetTagInfoList($table,$tagID);
             }
             foreach $tagInfo (@infoArray) {
+                if ($binaryTable and $$tagInfo{Writable} and $$tagInfo{Writable} ne '1') {
+                    warn("$tableName $$tagInfo{Name} Writable should be 1, not $$tagInfo{Writable}\n");
+                }
                 my $name = $$tagInfo{Name};
                 if ($$tagInfo{WritePseudo}) {
                     push @writePseudo, $name;

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.74';
+$VERSION = '4.78';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -630,6 +630,7 @@ $VERSION = '4.74';
    '61182.53' => 'Canon RF 28mm F2.8 STM', #42
    '61182.54' => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
    '61182.55' => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
+   '61182.56' => 'Canon RF 35mm F1.4 L VCM', #42
     65535 => 'n/a',
 );
 
@@ -2128,6 +2129,13 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             TagTable => 'Image::ExifTool::Canon::RawBurstInfo',
         }
     },
+    0x4059 => { #forum16111
+        Name => 'LevelInfo',
+        SubDirectory => {
+            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart,$size)',
+            TagTable => 'Image::ExifTool::Canon::LevelInfo',
+        }
+    },
 );
 
 #..............................................................................
@@ -2590,6 +2598,14 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     },
     # 47 - related to aspect ratio: 100=4:3,70=1:1/16:9,90=3:2,60=4:5 (PH G12)
     #      (roughly image area in percent - 4:3=100%,1:1/16:9=75%,3:2=89%,4:5=60%)
+    # 48 - 3 for CR2/CR3, 4 or 7 for JPG, -1 for edited JPG (see forum16127)
+    51 => { #forum16036 (EOS R models)
+        Name => 'Clarity',
+        PrintConv => {
+            OTHER => sub { shift },
+            0x7fff => 'n/a',
+        },
+    },
 );
 
 # focal length information (MakerNotes tag 0x02)
@@ -4715,12 +4731,15 @@ my %ciMaxFocal = (
     FIRST_ENTRY => 0,
     PRIORITY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    NOTES => 'CameraInfo tags for the EOS R6.',
+    NOTES => 'CameraInfo tags for the EOS R5 and R6.',
+    # (see forum16111 for more notes on these tags)
+    # 0x0a5d - some sort of sequence number starting from 1 (ref forum16111)
     0x0af1 => { #forum15210/15579
         Name => 'ShutterCount',
         Format => 'int32u',
         Notes => 'includes electronic + mechanical shutter',
     },
+    # 0x0bb7 - counts down during focus stack (ref forum16111)
 );
 
 # ref https://exiftool.org/forum/index.php?topic=15356.0
@@ -6382,8 +6401,12 @@ my %ciMaxFocal = (
             10 => 'AF Point Expansion (8 point)', #forum6237
             11 => 'Flexizone Multi (49 point)', #PH (NC, EOS M, live view; 750D 49 points)
             12 => 'Flexizone Multi (9 point)', #PH (750D, 9 points)
-            13 => 'Flexizone Single', #PH (EOS M default, live view)
+            13 => 'Flexizone Single', #PH (EOS M default, live view) (R7 calls this '1-point AF', ref github268)
             14 => 'Large Zone AF', #PH/forum6237 (7DmkII)
+            19 => 'Flexible Zone AF 1', #github268 (R7)
+            20 => 'Flexible Zone AF 2', #github268 (R7)
+            21 => 'Flexible Zone AF 3', #github268 (R7)
+            22 => 'Whole Area AF', #github268 (R7)
         },
     },
     2 => {
@@ -6962,6 +6985,7 @@ my %ciMaxFocal = (
             313 => 'Canon RF 28mm F2.8 STM', #42
             314 => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
             315 => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
+            316 => 'Canon RF 35mm F1.4 L VCM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -7031,7 +7055,7 @@ my %ciMaxFocal = (
         },
     },
     2 => { #12
-        Name => 'Sharpness',
+        Name => 'Sharpness', # (unsharp mask strength for the EOS R5)
         Notes => 'all models except the 20D and 350D',
         Condition => '$$self{Model} !~ /\b(20D|350D|REBEL XT|Kiss Digital N)\b/',
         Priority => 0,  # (maybe not as reliable as other sharpness values)
@@ -7077,6 +7101,8 @@ my %ciMaxFocal = (
         Name => 'WBShiftGM',
         Notes => 'positive is a shift toward green',
     },
+    14 => 'UnsharpMaskFineness', #forum16036
+    15 => 'UnsharpMaskThreshold', #forum16036
 );
 
 # Color balance information (MakerNotes tag 0xa9) (ref PH)
@@ -8759,7 +8785,7 @@ my %ciMaxFocal = (
         Name => 'DigitalLensOptimizer',
         PrintConv => {
             0 => 'Off',
-            1 => 'Stanard',
+            1 => 'Standard',
             2 => 'High',
         },
     },
@@ -8992,20 +9018,32 @@ my %filterConv = (
              4 => 'Focus High Priority',
         },
     },
-    7 => { #52
+    7 => [{ #forum16068
+        Name => 'USMLensElectronicMF',
+        Condition => '$$self{Model} =~ /EOS R\d/',
+        Notes => 'EOS R models',
+        PrintConv => {
+             0 => 'Disable After One-Shot',
+             1 => 'One-Shot -> Enabled',
+             2 => 'One-Shot -> Enabled (magnify)',
+             3 => 'Disable in AF Mode',
+        },
+    },{ #52
         Name => 'USMLensElectronicMF',
+        Notes => 'Other models',
         PrintConv => {
              0 => 'Enable After AF',
              1 => 'Disable After AF',
              2 => 'Disable in AF Mode',
         },
-    },
+    }],
     8 => { #52
         Name => 'AFAssistBeam',
         PrintConv => {
              0 => 'Enable',
              1 => 'Disable',
              2 => 'IR AF Assist Beam Only',
+             3 => 'LED AF Assist Beam Only', #forum16068
         },
     },
     9 => { #52
@@ -9104,6 +9142,19 @@ my %filterConv = (
              2 => 'Auto', #PH (1DXmkII)
         },
     },
+    20 => { #forum16068
+        Name => 'SubjectToDetect',
+        PrintConv => {
+            0 => 'None',
+            1 => 'People',
+            2 => 'Animals',
+            3 => 'Vehicles',
+        },
+    },
+    24 => { #forum16068
+        Name => 'EyeDetection',
+        PrintConv => \%offOn,
+    },
 );
 
 # RAW burst mode info (MakerNotes tag 0x403f) (ref 25)
@@ -9116,6 +9167,48 @@ my %filterConv = (
     2 => 'RawBurstImageCount',
 );
 
+# level information (ref forum16111, EOS R5)
+%Image::ExifTool::Canon::LevelInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FORMAT => 'int32s',
+    FIRST_ENTRY => 1,
+    4 => {
+        Name => 'RollAngle',
+        Notes => 'converted to degrees of clockwise camera rotation',
+        ValueConv => '$val > 1800 and $val -= 3600; -$val / 10',
+        ValueConvInv => '$val > 0 and $val -= 360; int(-$val * 10 + 0.5)',
+    },
+    5 => {
+        Name => 'PitchAngle',
+        Notes => 'converted to degrees of upward camera tilt',
+        ValueConv => '$val > 1800 and $val -= 3600; $val / 10',
+        ValueConvInv => '$val < 0 and $val += 360; int($val * 10 + 0.5)',
+    },
+    7 => {
+        Name => 'FocalLength',
+        ValueConv => '$val / 10',
+        ValueConvInv => 'int($val * 10 + 0.5)',
+        PrintConv => '"$val mm"',
+        PrintConvInv => '$val=~s/\s*mm//;$val',
+    },
+    8 => {
+        Name => 'MinFocalLength',
+        ValueConv => '$val / 10',
+        ValueConvInv => 'int($val * 10 + 0.5)',
+        PrintConv => '"$val mm"',
+        PrintConvInv => '$val=~s/\s*mm//;$val',
+    },
+    9 => {
+        Name => 'MaxFocalLength',
+        ValueConv => '$val / 10',
+        ValueConvInv => 'int($val * 10 + 0.5)',
+        PrintConv => '"$val mm"',
+        PrintConvInv => '$val=~s/\s*mm//;$val',
+    },
+
+);
+
 # Canon UUID atoms (ref PH, SX280)
 %Image::ExifTool::Canon::uuid = (
     GROUPS => { 0 => 'MakerNotes', 1 => 'Canon', 2 => 'Video' },

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

@@ -562,7 +562,7 @@ sub BuildMakerNotes($$$$$$);
     3 => {
         Name => 'Rotation',
         Format => 'int32s',
-        Writable => 'int32s',
+        Writable => 1,
     },
     4 => 'ComponentBitDepth', #3
     5 => 'ColorBitDepth', #3

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

@@ -1212,9 +1212,9 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
             4 => 'Emphasize Center',
         },
     },
+    0x2070b => { Name => 'DiffractionCorrectionOn', %noYes },
     # 0x20800 - fmt=1: 0
     # 0x20801 - fmt=1: 0
-    0x2070b => { Name => 'DiffractionCorrectionOn', %noYes },
     0x20900 => 'ColorHue',
     0x20901 => 'SaturationAdj',
     0x20910 => 'RedHSL',
@@ -1282,6 +1282,9 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     # 0xf0521 - DLO data
     # 0xf0520 - DLO data
     # 0xf0530 - created when dust delete data applied (4 bytes, all zero)
+    # 0xf0561 - 1932 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
+    # 0xf0562 - 1596 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
+    # 0xf0566 - 1520 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
     # 0xf0600 - fmt=253 (2308 bytes, JPG images)
     # 0xf0601 - fmt=253 (2308 bytes, JPG images)
     # 0x1ff52c - values: 129,130,132 (related to custom picture style somehow)
@@ -1303,7 +1306,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     # 2 - value: 6
     3 => {
         Name => 'DR4CameraModel',
-        Writable => 'int32u',
+        Format => 'int32u',
         PrintHex => 1,
         SeparateTable => 'Canon CanonModelID',
         PrintConv => \%Image::ExifTool::Canon::canonModelID,

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # DPX tags
 %Image::ExifTool::DPX::Main = (
@@ -97,7 +97,7 @@ $VERSION = '1.06';
             3 => 'Logarithmic',
             4 => 'Unspecified video',
             5 => 'SMPTE 274M',
-            6 => 'ITU-R 704-4',
+            6 => 'ITU-R 709-4',
             7 => 'ITU-R 601-5 system B or G (625)',
             8 => 'ITU-R 601-5 system M (525)',
             9 => 'Composite video (NTSC)',
@@ -124,7 +124,7 @@ $VERSION = '1.06';
             1 => 'Printing density',
             4 => 'Unspecified video',
             5 => 'SMPTE 274M',
-            6 => 'ITU-R 704-4',
+            6 => 'ITU-R 709-4',
             7 => 'ITU-R 601-5 system B or G (625)',
             8 => 'ITU-R 601-5 system M (525)',
             9 => 'Composite video (NTSC)',