exiftool-vendored.pl 12.85.0 → 12.89.0

package/bin/Changes

@@ -7,6 +7,73 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.76. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+July 12, 2024 - Version 12.89
+
+  - Added new Sony lenses and updated decoding of some tags (thanks Jos Roost)
+  - Minor change to description of NKA files
+  - Fixed Archive::Zip problem in Windows executable version
+
+July 11, 2024 - Version 12.88 - "New Windows/MacOS packages"
+
+  - 
+
+NOTE: The install procedure for the Windows executable has changed!
+  - Windows EXE version now uses Oliver Betz's bundle with Strawberry Perl and
+    comes in 32- and 64-bit versions
+  - MacOS distribution now uses a flattened package
+  - Added ability to read/write deflate-compressed XMP in HEIC files
+  - Added a new Canon LensType (thanks Norbert Wasser)
+  - Added a new XMP-GCamera tag (thanks Herb)
+  - Added a new Nikon LensID
+  - Added a few new Canon AFAreaMode values (thanks Wernfried)
+  - Added config_files/onone.config to the distribution
+  - Decode timed accelerometer readings from NextBase 622GW videos
+  - Decode Pentax K-3III CameraOrentation (thanks Peter)
+  - Improved German translation for LensModel
+  - Enhanced the API StructFormat JSONQ setting to quote all JSON values, even
+    if they aren't in a structure
+  - Changed -geolocate option so specifying the Keys group writes
+    Keys:GPSPosition only if an input city is specified, and Keys:LocationName
+    only for input GPS coordinates
+  - Tweaked API Geolocation option recognized space-separated lat/lon even when
+    there is no decimal point in the numbers
+  - API Changes:
+      - Changed LargeFileSupport default to 2 and added a warning if a large
+        chunk is encountered.  Set to 1 to avoid the warning.
+
+June 13, 2024 - Version 12.87
+
+  - Added ability to write Google Container XMP tags (using the namespace prefix
+    'GContainer' to avoid conflict with the Google Device Container prefix)
+  - Decode a few new tags for the Canon EOS R5 (thanks John Moyer)
+  - Decode battery information for the Pentax K-3 III (thanks Peter)
+  - Decode RAFCompression from FujiFilm RAF images (thanks Albert Shan)
+  - Avoid reporting FileSize for pipes
+  - Updated Geolocation databases from current geonames.org files
+  - Enhanced Geolocation feature to allow lat/lon to be input with a space
+    separator instead of a comma
+  - Skip over Matroska Cluster if necessary to read Tags when referenced from
+    SeekHead
+  - Changed conversion for Matroska SeekID (now in hex with tag name in
+    brackets) and SeekPosition (now returns an absolute offset)
+  - Fixed problem writing XMP-Device:EarthPos coordinates
+  - Fixed typo in a value of Canon:DigitalLensOptimizer (thanks Martin B.)
+  - Fixed decoding of Matroska VideoScanType
+  - Fixed misleading error message when -o option was used to write to an
+    unsupported file type
+
+June 7, 2024 - Version 12.86
+
+  - Added a new value for a couple of Olympus tags (thanks Herb)
+  - Improved handling of ID3 user-defined tags
+  - Decode all JPEG segments from RICO box in Ricoh MOV videos
+  - Decode a few new values for some tags written by Canon EOS R cameras (thanks
+    John Moyer and Martin B.)
+  - Patched some Olympus WB_RBLevels tags to allow 4 values to be written as per
+    some newer models
+  - Fixed issue when writing IPTC date tags with a date/time value containing
+subseconds with 4 or more digits
+
 May 21, 2024 - Version 12.85
 
   - Added GeolocationFeatureType tag
@@ -36,6 +103,8 @@ Apr. 23, 2024 - Version 12.84
   - Decode a few more Apple tags and a new CanonVRD tag
   - Enhanced Geolocation feature with the ability to return any number of nearby
     cities
+  - Allow coordinates to be entered without comma separator for the Geolocation
+    feature as long as both coordinates have a decimal point
   - Fixed long-standing bug in Windows version that didn't properly handle dates
     older than 50 years when writing FileModifyDate or FileCreateDate
   - Fixed API TimeZone option to work in Windows

package/bin/MANIFEST

@@ -28,6 +28,7 @@ config_files/frameCount.config
 config_files/gps2utm.config
 config_files/guano.config
 config_files/nksc.config
+config_files/onone.config
 config_files/photoshop_paths.config
 config_files/picasa_faces.config
 config_files/pix4d.config

package/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.85"
+   "version" : "12.89"
 }

package/bin/META.yml

@@ -3,32 +3,32 @@ abstract: 'Read and write meta information'
 author:
   - 'Phil Harvey (philharvey66 at gmail.com)'
 build_requires:
-  ExtUtils::MakeMaker: 0
+  ExtUtils::MakeMaker: '0'
 configure_requires:
-  ExtUtils::MakeMaker: 0
+  ExtUtils::MakeMaker: '0'
 dynamic_config: 0
 generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.143240, CPAN::Meta::Converter version 2.133380'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+  version: '1.4'
 name: Image-ExifTool
 no_index:
   directory:
     - t
     - inc
 recommends:
-  Archive::Zip: 0
-  Compress::Raw::Lzma: 0
-  Compress::Zlib: 0
-  Digest::MD5: 0
-  Digest::SHA: 0
-  IO::Compress::Brotli: 0
-  IO::Compress::RawDeflate: 0
-  IO::Uncompress::Brotli: 0
-  IO::Uncompress::RawInflate: 0
-  POSIX::strptime: 0
-  Time::HiRes: 0
+  Archive::Zip: '0'
+  Compress::Raw::Lzma: '0'
+  Compress::Zlib: '0'
+  Digest::MD5: '0'
+  Digest::SHA: '0'
+  IO::Compress::Brotli: '0'
+  IO::Compress::RawDeflate: '0'
+  IO::Uncompress::Brotli: '0'
+  IO::Uncompress::RawInflate: '0'
+  POSIX::strptime: '0'
+  Time::HiRes: '0'
 requires:
-  perl: 5.004
-version: 12.85
+  perl: '5.004'
+version: '12.89'

package/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.85.tar.gz | tar -xf -
-  cd Image-ExifTool-12.85
+  gzip -dc Image-ExifTool-12.89.tar.gz | tar -xf -
+  cd Image-ExifTool-12.89
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -209,6 +209,7 @@ distribution package:
     gps2utm.config            - Generate UTM coordinate tags from GPS info
     guano.config              - Decode individual tags from Guano metadata
     nksc.config               - Decode tags in Nikon ViewNX NKSC files
+    onone.config              - Definitions for writing On1 XMP tags
     photoshop_paths.config    - For extracting or copying Photoshop paths
     picasa_faces.config       - Convert from Picasa to MWG/MP face regions
     pix4d.config              - Definitions for writing Pix4D XMP tags

package/bin/build_geolocation

@@ -15,6 +15,7 @@
 #               2024-04-24 - PH Fixed problem with population exponent when run
 #                               under ActivePerl
 #               2024-04-29 - PH Added feature types and default to db v1.03
+#               2024-06-13 - PH Tweaked case of imported feature types
 #
 # Notes:        Requires these files from https://download.geonames.org/export/
 #
@@ -208,8 +209,9 @@ Syntax:       build_geolocation [OPTIONS] [DBFILE] ...
 Options:
   DBFILE    - Input database file name or directory.  Multiple input database
               files may be specified.  The -p, -c and -cp options apply to
-              the database that comes after them on the command line.
-              Default is "$dbFile".
+              the database that comes after them on the command line.  The
+              other input files are assumed to be in the same directory as
+              the first database file.  Default is "$dbFile".
   -p POP    - Minimum population for cities to include.  POP may be a number
               or be of the form "CC[,C2...]=###" to set different limits for
               specific countries/regions, where CC and C2 are country codes
@@ -250,7 +252,7 @@ Input files (download from https://download.geonames.org/export/dump/):
   $countryFile       - mandatory country names file
   $regionFile  - mandatory region names file
   $admin2File       - mandatory subregion names file
-  $featureFile   - optional feature codes file
+  $featureFile   - optional feature codes file(s)
   $altNamesFile  - optional alternate names file (must exist to
                           to generate $outAltNames and $geoLang files)
 
@@ -478,6 +480,7 @@ if (open INFILE, '<', "$dbdir/$featureFile") {
         next unless $featureCodes{$items[0]};
         my $name = ucfirst $items[1];
         $name =~ s/ ([a-z])/ \U$1/g;
+        $name =~ s/(.)\b(Of|Or|A|An|On|In|The|By|For|And)\b/$1\L$2/g;
         $featureNames{$items[0]} = $name;
     }
     close INFILE;

package/bin/config_files/example.config

@@ -293,6 +293,11 @@
     NewXMPxxxStructX => { Name => 'SomeOtherName', Flat => 1 },
 );
 
+# the namespace may be registered so ExifTool generates the expected family 1
+# group names when reading if the UserDefined namespace uses a different prefix
+require Image::ExifTool::XMP;
+Image::ExifTool::XMP::RegisterNamespace(\%Image::ExifTool::UserDefined::xxx);
+
 # Adding a new MIE group requires a few extra definitions
 use Image::ExifTool::MIE;
 %Image::ExifTool::UserDefined::MIETest = (

package/bin/config_files/onone.config

@@ -0,0 +1,28 @@
+#------------------------------------------------------------------------------
+# File:         onone.config
+#
+# Description:  This config file defines On1 XMP tags for writing.
+#
+# Usage:        exiftool -config onone.config -UserFlag=VALUE FILE ...
+#
+# Requires:     ExifTool version 10.28 or later
+#
+# Revisions:    2024/07/10 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+  'Image::ExifTool::XMP::Main' => {
+    onone => {
+      SubDirectory => { TagTable => 'Image::ExifTool::UserDefined::onone' },
+    },
+  },
+);
+
+%Image::ExifTool::UserDefined::onone = (
+  GROUPS    => { 0 => 'XMP', 1 => 'XMP-onone', 2 => 'Other' },
+  NAMESPACE => { 'onone' => 'http://www.ononesoftware.com/vcb/1.0/' },
+  WRITABLE  => 'string',
+  UserFlag  => { },
+);
+
+1;  #end

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.85';
+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($);
@@ -1802,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;
@@ -2366,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) {
@@ -2409,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;
@@ -2702,7 +2708,7 @@ TAG:    foreach $tag (@foundTags) {
                         }
                     }
                 }
-                FormatJSON($fp, $val, $ind);
+                FormatJSON($fp, $val, $ind, $quote);
                 $comma = 1;
                 next;
             }
@@ -3494,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;
@@ -5678,7 +5684,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.85 --
+    -- 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
@@ -6119,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/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.75';
+$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.75';
    '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,7 @@ 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 => {
@@ -4722,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
@@ -6389,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 => {
@@ -6969,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
         },
     },
@@ -8768,7 +8785,7 @@ my %ciMaxFocal = (
         Name => 'DigitalLensOptimizer',
         PrintConv => {
             0 => 'Off',
-            1 => 'Stanard',
+            1 => 'Standard',
             2 => 'High',
         },
     },
@@ -9001,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
@@ -9113,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)
@@ -9125,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