exiftool_vendored 12.67.0 → 12.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a6389f7140433c97eea74b3a6b428d8c5d940dc4d295741a9a69027ee561079
-  data.tar.gz: b28eb642d02cf914b516e1e5e2a40588548b7ab77158a1cf78ee6b76334ad682
+  metadata.gz: 8660bdc38a746e24a73d1b5a0b167250bce83398c78d24f4a2ef736b9bb7a5a4
+  data.tar.gz: 8fc11e9218cf70d7ab1bf608b39bcd12693aea6c20bdaf3d31907a95ff21b626
 SHA512:
-  metadata.gz: 0b6f0e36a66b21a6e6d9635484cba7d0ad9f94aabfede322548a0f7e31e100aa0c75766f4c0248fba3be575e734ef698b270086b5a35ba3c5164118090cc02f6
-  data.tar.gz: 15859db49991094833a0e8cb4ac64604b8235abc48fdb0baea28f4d4c6a1260c9b241be4e4b4ceabc4ca840eb4da9386546f843913702488109ab2393fb1465f
+  metadata.gz: 77b2a89162d45e272bb27aa0481c57ea95fae1e677081aad86976accda1492f622e46d789c39818e4de31b1e1fa8fb951c4687a20ecfe7d5435a98df30b73a19
+  data.tar.gz: 9d59b5179a8b89b99456845bc087b643290efe2bcfddffbed73eb224b7fb7f669a43f1e5c29f60ae60bf3d00ac3142372cee21932c65d321e1868f35fa5e567e

data/bin/Changes

@@ -4,9 +4,80 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.60. (Other versions are
+Note: The most recent production release is Version 12.70. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Nov. 19, 2023 - Version 12.70 (production release)
+
+  - This marks the 20th anniversary of the initial ExifTool release!
+  - Added ability to read/delete C2PA CAI JUMBF metadata from TIFF-based images
+    (eg. DNG), QuickTime-based files (eg. MP4) and WebP images, and read JUMBF
+    from other RIFF-based files (eg. WAV, AVI), GIF images and ID3v2 metadata
+  - Added read/write support for JPH images
+  - Added ability to read Leica Q3 maker notes
+  - Added ability to recognize and write FujiFilm M-RAW RAF images (multiple raw
+    images in a single file) and the ability to read preview-less RAF images
+  - Added support for reading a number of obscure Microsoft EXIF tags
+  - Added a few new Sony lenses and support for the ILCE-9M3 (thanks Jos Roost)
+  - Added a couple of new Panasonic Leica lenses
+  - Added a couple of new Canon RF lenses (thanks Norbert Wasser)
+  - Added a number of new CPUType values for ELF executables
+  - Added some new Olympus CameraType values
+  - Decode a few more ID3v2.2 tags (github #142)
+  - Decode a few new Canon G5X Mark II tags (thanks Martin B.)
+  - Decode WB_RGGBLevels for a few more Nikon cameras
+  - Extract information from FujiFilm M-RAW header
+  - Improved decoding of a few Nikon Z tags (thanks Warren Hatch)
+  - Marked misspelt XMP-drone-dji:GPSLongtitude tag to Avoid when writing
+  - Changed RIFF MaxDataRate conversion to use SI prefixes by default
+  - Fixed decoding of unknown ColorBalance information for some Nikon models
+  - Fixed an incorrect Nikon Z LensID
+  - API Changes:
+      - Added ByteUnit option
+
+Oct. 26, 2023 - Version 12.69
+
+  - Added support for DNG version 1.7.0.0
+  - Added a new XMP-GCamera tag
+  - Added a number of new Nikon Z lenses (thanks Warren Hatch and Stefan)
+  - Added a number of new XMP-crs tags
+  - Extract XML metadata from some Hasselblad images
+  - Tweaked -fast2 option to read metadata from inside mdat atom of HEIC images
+  - Patched FFF reader to be more tolerant of the mess made by incompetent
+    Hasselblad programmers (wrong IFD count for some values)
+  - Patched WebP reader to be more tolerant of the mess made by incompetent
+    Google programmers (EXIF with wrong header and XMP with wrong ID)
+  - Fixed writing of MakerNotes as a block to CR3 images (now properly stored in
+    the CMT3 chunk instead of the ExifIFD) and added ability to delete them from
+    the ExifIFD of CR3 images
+  - Fixed problem which could cause runtime error when copying MakerNotes from a
+    file that contains multiple maker note blocks
+  - Fixed problem which could cause "use of uninitialized variable" warnings
+    when reading images from some Nikon cameras
+  - Fixed List type for new XMP-photomech:CreatorIdentity tag
+
+Oct. 16, 2023 - Version 12.68
+
+  - Added preliminary read support for XISF images
+  - Added the ability to delete CAI JUMBF metadata from PNG images
+  - Added support for writing Canon burst-roll CR3 images
+  - Added a new Nikon Z9 SubjectDetection value, and improved Zf support (thanks
+    Warren Hatch)
+  - Added a couple of new PentaxModelID values
+  - Added a few couple of new tag values for the Pentax K-3 Mark III Monochrome (github #226)
+  - Added a new XMP-photomech tag
+  - Added a new QuickTime ItemList tag
+  - Added a new Nikon LensID
+  - Added a new Canon LensType
+  - Support decimal values for FujiFilm ShadowTone and HighlightTone tags
+  - Decode some new Sony tags (thanks Jos Roost)
+  - Decode ShutterCount for Canon EOS R6 (thanks Martin B.)
+  - Decode QuickTime VideoFullRangeFlag
+  - Decode JPGCompression for the Nikon D3S
+  - Enhanced -geotag feature to allow writing QuickTime:GPSCoordinates
+  - Renamed Panasonic HDRShot tag to MergedImages (forum 15298)
+  - Fixed problem where some NEF files were misidentified as NRW
+
 Sept. 19, 2023 - Version 12.67
 
   - Added a new Pentax LensType (thanks dmont)
@@ -284,7 +355,7 @@ Dec. 6, 2022 - Version 12.52
 Nov. 21, 2022 - Version 12.51
 
   - Added a new Olympus LensType (thanks Herb)
-  - Extract C2PA JUMBF metadata from PNG images and extract C2PA Salt values
+  - Extract C2PA CAI JUMBF metadata from PNG images and extract C2PA Salt values
   - Decode NikonSettings for Z9 firmware 3.0 (thanks Warren Hatch)
   - Decode additional camm metadata from Insta360 Pro2 MP4 videos
   - Improved Verbose output when writing Composite tags to add a "+" sign to
@@ -343,8 +414,6 @@ Nov. 8, 2022 - Version 12.50 (production release)
   - Fixed inconsistent year and time zone for Kenwood dashcam timed GPS in MP4
     videos
 
-History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
-
 Oct. 19, 2022 - Version 12.49
 
   - Added read support for Windows ICO and CUR files
@@ -669,8 +738,8 @@ Oct. 16, 2021 - Version 12.33
 
 Sept. 30, 2021 - Version 12.32
 
-  - Added support for CBOR-format metadata in JUMBF (note that JUMBF support is
-    still experimental)
+  - Added support for CBOR-format metadata in CAI JUMBF (note that JUMBF support
+    is still experimental)
   - Added a new Nikon LensID
   - Added a new Pentax LensType
   - Decode timed GPS for two more dashcam formats
@@ -729,7 +798,7 @@ July 9, 2021 - Version 12.29
   - Improved a QuickTime "File format error" message to be more meaningful, and
     made it a minor error
   - Changed PNG writer to add EXIF before IDAT
-  - Some changes the way JUMBF metadata is handled
+  - Some changes the way CAI JUMBF metadata is handled
   - Patched to read timed GPS from a different type of INSV videos
   - Patched a security issue
   - Fixed problem where ExifTool could hang when processing mebx timed metadata
@@ -805,7 +874,7 @@ Apr. 13, 2021 - Version 12.24
   - Decode a few new Panasonic and FujiFilm tags (thanks LibRaw and Greybeard)
   - Updated acdsee.config in distribution (thanks StarGeek)
   - Recognize AutoCAD DXF files
-  - More work on experimental JUMBF read support
+  - More work on experimental CAI JUMBF read support
   - More work on experimental JPEG XL read/write support
   - Patched security vulnerability in DjVu reader
 
@@ -813,8 +882,8 @@ Apr. 1, 2021 - Version 12.23
 
   - Added support for Olympus ORI files
   - Added experimental read/write support for JPEG XL images
-  - Added experimental read support for JUMBF metadata in JPEG and Jpeg2000
-    images
+  - Added experimental read support for CAI (Content Authenticity Initiative)
+    JUMBF-format metadata in JPEG and Jpeg2000 images
   - Added built-in support for parsing GPS track from Denver ACG-8050 videos
     with the -ee option
   - Added a some new Sony lenses (thanks Jos Roost and LibRaw)

data/bin/MANIFEST

@@ -179,6 +179,7 @@ html/TagNames/VCard.html
 html/TagNames/Vorbis.html
 html/TagNames/WPG.html
 html/TagNames/WTV.html
+html/TagNames/XISF.html
 html/TagNames/XMP.html
 html/TagNames/ZIP.html
 html/TagNames/ZISRAW.html
@@ -432,6 +433,7 @@ lib/Image/ExifTool/WriteQuickTime.pl
 lib/Image/ExifTool/WriteRIFF.pl
 lib/Image/ExifTool/WriteXMP.pl
 lib/Image/ExifTool/Writer.pl
+lib/Image/ExifTool/XISF.pm
 lib/Image/ExifTool/XMP.pm
 lib/Image/ExifTool/XMP2.pl
 lib/Image/ExifTool/XMPStruct.pl
@@ -916,6 +918,8 @@ t/Writer_6.out
 t/Writer_60.out
 t/Writer_7.out
 t/Writer_9.out
+t/XISF.t
+t/XISF_2.out
 t/XMP.t
 t/XMP_10.out
 t/XMP_11.out
@@ -1144,6 +1148,7 @@ t/images/Vorbis.ogg
 t/images/WPG.wpg
 t/images/WTV.wtv
 t/images/Writer.jpg
+t/images/XISF.xisf
 t/images/XMP.inx
 t/images/XMP.jpg
 t/images/XMP.svg

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.67"
+   "version" : "12.70"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.67
+version: 12.70

data/bin/README

@@ -51,11 +51,11 @@ supported by ExifTool (r = read, w = write, c = create):
   DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
   DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
   DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
-  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
-  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
-  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
-  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     |
+  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
+  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
+  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
+  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
+  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
   DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
@@ -108,8 +108,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.67.tar.gz | tar -xf -
-  cd Image-ExifTool-12.67
+  gzip -dc Image-ExifTool-12.70.tar.gz | tar -xf -
+  cd Image-ExifTool-12.70
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.67';
+my $version = '12.70';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -4665,11 +4665,11 @@ supported by ExifTool (r = read, w = write, c = create):
   DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
   DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
   DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
-  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
-  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
-  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
-  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     |
+  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
+  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
+  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
+  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
+  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
   DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
@@ -4738,7 +4738,7 @@ L<Input-output text formatting|/Input-output text formatting>
   -n          (--printConv)        No print conversion
   -p FMTFILE  (-printFormat)       Print output in specified format
   -php                             Export tags as a PHP Array
-  -s[NUM]     (-short)             Short output format
+  -s[NUM]     (-short)             Short output format (-s for tag names)
   -S          (-veryShort)         Very short output format
   -sep STR    (-separator)         Set separator string for list items
   -sort                            Sort output alphabetically
@@ -4951,7 +4951,7 @@ while C<-all:all=> deletes entire blocks.
 application segments which are not associated with another deletable group. 
 For example, specifying C<-APP14:All=> will NOT delete the APP14 "Adobe"
 segment because this is accomplished with C<-Adobe:All>.  But note that
-these unnamed APP segments may not be excluded with C<--APPxx:all>) when
+these unnamed APP segments may not be excluded with C<--APPxx:all> when
 deleting all information.
 
 6) When shifting a value, the shift is applied to the original value of the
@@ -5582,7 +5582,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.67 --
+    -- Generated by ExifTool 12.70 --
     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
@@ -6418,10 +6418,14 @@ from the track log, and they are supported by the destination metadata
 format):  GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef,
 GPSAltitude, GPSAltitudeRef, GPSDateStamp, GPSTimeStamp, GPSDateTime,
 GPSTrack, GPSTrackRef, GPSSpeed, GPSSpeedRef, GPSImgDirection,
-GPSImgDirectionRef, GPSPitch, GPSRoll, AmbientTemperature and
-CameraElevationAngle.  By default, tags are created in EXIF, and updated in
-XMP only if they already exist.  However, C<EXIF:Geotime> or C<XMP:Geotime>
-may be specified to write only EXIF or XMP tags respectively.  Note that
+GPSImgDirectionRef, GPSPitch, GPSRoll, GPSCoordinates, AmbientTemperature
+and CameraElevationAngle.  By default, in image files tags are created in
+EXIF, and updated in XMP only if they already exist.  In QuickTime-format
+files GPSCoordinates is created in the preferred location (ItemList by
+default) as well as in XMP.  However, C<EXIF:Geotime>, C<XMP:Geotime> or
+C<QuickTime:Geotime> may be specified to write to write only to one group. 
+Also, C<ItemList:Geotime>, C<Keys:Geotime> or C<UserData:Geotime> may be
+used to write to a specific location in QuickTime-format files.  Note that
 GPSPitch and GPSRoll are non-standard, and require user-defined tags in
 order to be written.
 
@@ -6544,11 +6548,12 @@ options on the command line.
 
 Load specified configuration file instead of the default ".ExifTool_config".
 If used, this option must come before all other arguments on the command
-line and applies to all B<-execute>'d commands.  The I<CFGFILE> must exist
-relative to the current working directory or the exiftool application
-directory unless an absolute path is specified.  Loading of the default
-config file may be disabled by setting I<CFGFILE> to an empty string (ie.
-"").  See L<https://exiftool.org/config.html> and
+line and applies to all B<-execute>'d commands.  This file is used to create
+user-defined tags as well as set default ExifTool options.  The I<CFGFILE>
+must exist relative to the current working directory or the exiftool
+application directory unless an absolute path is specified.  Loading of the
+default config file may be disabled by setting I<CFGFILE> to an empty string
+(ie. "").  See L<https://exiftool.org/config.html> and
 config_files/example.config in the full ExifTool distribution for details
 about the configuration file syntax.
 
@@ -6588,15 +6593,15 @@ option no longer suppresses the output "{readyNUM}" message.
 
 Read tags from an alternate source file.  Among other things, this allows
 tags from different files to be compared and combined using the B<-if> and
-B<-p> options.  Tags from alternate files are accessed via the corresponding
-family 8 group name (eg. C<File1:TAG> for the B<-file1> option, C<File2:TAG>
-for B<-file2>, etc).  I<ALTFILE> may contain filename formatting codes like
-the B<-w> option (%d, %f, etc), and/or tag names with a leading C<$> symbol
-to access tags from the source file in the same way as the B<-p> option (so
-any other dollar symbol in the file name must be doubled, eg.
-C<money$$.jpg>).  For example, assuming that the OriginalFileName tag has
-been set in the edited file, a command to copy Rights from the original file
-could look like this:
+B<-p> options.  I<NUM> is any string of digits.  Tags from alternate files
+are accessed via the corresponding family 8 group name (eg. C<File1:TAG> for
+the B<-file1> option, C<File2:TAG> for B<-file2>, etc).  I<ALTFILE> may
+contain filename formatting codes like the B<-w> option (%d, %f, etc),
+and/or tag names with a leading C<$> symbol to access tags from the source
+file in the same way as the B<-p> option (so any other dollar symbol in the
+file name must be doubled, eg. C<money$$.jpg>).  For example, assuming that
+the OriginalFileName tag has been set in the edited file, a command to copy
+Rights from the original file could look like this:
 
     exiftool -file1 '$originalfilename' '-rights<file1:rights' edited.jpg
 

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

@@ -7,6 +7,7 @@
 #
 # References:   1) https://c2pa.org/public-draft/
 #               2) https://datatracker.ietf.org/doc/html/rfc7049
+#               3) https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::CBOR;
@@ -15,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::JSON;
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub ProcessCBOR($$$);
 sub ReadCBORValue($$$$);
@@ -28,15 +29,27 @@ my %cborType6 = (
     3 => 'negative bignum',
     4 => 'decimal fraction',
     5 => 'bigfloat',
+    16 => 'COSE Encrypt0',          #3 (COSE Single Recipient Encrypted Data Object)
+    17 => 'COSE Mac0',              #3 (COSE Mac w/o Recipients Object)
+    18 => 'COSE Sign1',             #3 (COSE Single Signer Data Object)
+    19 => 'COSE Countersignature',  #3 (COSE standalone V2 countersignature)
     21 => 'expected base64url encoding',
     22 => 'expected base64 encoding',
     23 => 'expected base16 encoding',
     24 => 'encoded CBOR data',
+    25 => 'string number',          #3 (reference the nth previously seen string)
+    26 => 'serialized Perl',        #3 (Serialised Perl object with classname and constructor arguments)
+    27 => 'serialized code',        #3 (Serialised language-independent object with type name and constructor arguments)
+    28 => 'shared value',           #3 (mark value as (potentially) shared)
+    29 => 'shared value number',    #3 (reference nth marked value)
+    30 => 'rational',               #3 (Rational number)
+    31 => 'missing array value',    #3 (Absent value in a CBOR Array)
     32 => 'URI',
     33 => 'base64url',
     34 => 'base64',
     35 => 'regular expression',
     36 => 'MIME message',
+    # (lots more after this in ref 3, but don't include them unless we see them)
     55799 => 'CBOR magic number',
 );
 
@@ -212,7 +225,7 @@ sub ReadCBORValue($$$$)
         {
             $val = $$val[1] * ($num == 4 ? 10 : 2) ** $$val[0];
         }
-    } elsif ($fmt == 7) {       
+    } elsif ($fmt == 7) {
         if ($dat == 31) {
             undef $val; # "break" = end of indefinite array/hash (not used in C2PA)
         } elsif ($dat < 24) {
@@ -263,6 +276,7 @@ sub ProcessCBOR($$$)
     my ($val, $err, $tag, $i);
 
     $et->VerboseDir('CBOR', undef, $$dirInfo{DirLen});
+    SetByteOrder('MM');
 
     $$et{cbor_datapos} = $$dirInfo{DataPos} + $$dirInfo{Base};
 
@@ -320,6 +334,8 @@ under the same terms as Perl itself.
 
 =item L<https://datatracker.ietf.org/doc/html/rfc7049>
 
+=item L<https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml>
+
 =back
 
 =head1 SEE ALSO

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.68';
+$VERSION = '4.71';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -490,6 +490,7 @@ $VERSION = '4.68';
    '368.11' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
    '368.12' => 'Sigma 18-35mm f/1.8 DC HSM | A', #50
    '368.13' => 'Sigma 24-105mm f/4 DG OS HSM | A', #forum3833
+   '368.14' => 'Sigma 18-300mm f/3.5-6.3 DC Macro OS HSM | C', #forum15280 (014)
     # 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
@@ -610,22 +611,23 @@ $VERSION = '4.68';
    '61182.35' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
    '61182.36' => 'Canon RF 600mm F4L IS USM + RF1.4x', #42
    '61182.37' => 'Canon RF 600mm F4L IS USM + RF2x', #42
-   '61182.38' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
-   '61182.39' => 'Canon RF 800mm F5.6L IS USM', #42
-   '61182.40' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
-   '61182.41' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
-   '61182.42' => 'Canon RF 1200mm F8L IS USM', #42
-   '61182.43' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
-   '61182.44' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
-   '61182.45' => 'Canon RF 135mm F1.8 L IS USM', #42
-   '61182.46' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
-   '61182.47' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
-   '61182.48' => 'Canon RF 100-300mm F2.8L IS USM', #42
-   '61182.49' => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
-   '61182.50' => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
-   '61182.51' => 'Canon RF 28mm F2.8 STM', #42
+   '61182.38' => 'Canon RF 800mm F5.6L IS USM', #42
+   '61182.39' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+   '61182.40' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+   '61182.41' => 'Canon RF 1200mm F8L IS USM', #42
+   '61182.42' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+   '61182.43' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+   '61182.44' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH
+   '61182.45' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+   '61182.46' => 'Canon RF 135mm F1.8 L IS USM', #42
+   '61182.47' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
+   '61182.48' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
+   '61182.49' => 'Canon RF 100-300mm F2.8L IS USM', #42
+   '61182.50' => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
+   '61182.51' => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
+   '61182.52' => 'Canon RF 10-20mm F4 L IS STM', #42
+   '61182.53' => 'Canon RF 28mm F2.8 STM', #42
     # we need the RFLensType values for the following...
-   '61182.52' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -1389,6 +1391,16 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Condition => '$$self{Model} =~ /\b(1200D|REBEL T5|Kiss X70)\b/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo60D' },
         },
+        {
+            Name => 'CanonCameraInfoR6',
+            Condition => '$$self{Model} =~ /\bEOS R6$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoR6' },
+        },
+        {
+            Name => 'CanonCameraInfoG5XII',
+            Condition => '$$self{Model} =~ /\bG5 X Mark II$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoG5XII' },
+        },
         {
             Name => 'CanonCameraInfoPowerShot',
             # valid if format is int32u[138] or int32u[148]
@@ -4695,6 +4707,57 @@ my %ciMaxFocal = (
     },
 );
 
+%Image::ExifTool::Canon::CameraInfoR6 = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS R6.',
+    0x0af1 => { #forum15210
+        Name => 'ShutterCount',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+    },
+);
+
+# ref https://exiftool.org/forum/index.php?topic=15356.0
+%Image::ExifTool::Canon::CameraInfoG5XII = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS R6.',
+    0x0293 => {
+        Name => 'ShutterCount',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+        # - advances by 1 for each photo file, regardless of mechanical or electronic shutter
+        # - does not advance for regular video files
+        # - advances for time lapse video files
+        # - creating a new directory or resetting the counter from the menu doesn't affect this shutter count
+    },
+    0x0b21 => {
+        Name => 'DirectoryIndex',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+    },
+    0x0b2d => {
+        Name => 'FileIndex',
+        Format => 'int32u',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+        ValueConv => '$val + 1',
+        ValueConvInv => '$val - 1',
+    },
+    #0x0b39 => {
+    #    Name => 'DirectoryIndex',
+    #    Groups => { 2 => 'Image' },
+    #    Format => 'int32u',
+    #    ValueConv => '$val - 1',
+    #    ValueConvInv => '$val + 1',
+    #},
+);
+
 # Canon camera information for 70D (MakerNotes tag 0x0d) (ref PH)
 %Image::ExifTool::Canon::CameraInfo70D = (
     %binaryDataAttrs,
@@ -6879,6 +6942,7 @@ my %ciMaxFocal = (
             298 => 'Canon RF 1200mm F8L IS USM', #42
             299 => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
             300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+            301 => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH
             302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
             303 => 'Canon RF 135mm F1.8 L IS USM', #42
             304 => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
@@ -6886,6 +6950,7 @@ my %ciMaxFocal = (
             306 => 'Canon RF 100-300mm F2.8L IS USM', #42
             307 => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
             308 => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
+            312 => 'Canon RF 10-20mm F4 L IS STM', #42
             313 => 'Canon RF 28mm F2.8 STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
@@ -9081,8 +9146,14 @@ my %filterConv = (
     CMT3 => { # (CR3 files)
         Name => 'MakerNoteCanon',
         PreservePadding => 1,
+        Writable => 'undef', # (writable directory!)
+        # (note that ExifTool 12.68 and earlier lacked the ability to write this as a block,
+        #  and would instead add the maker notes the the CMT2 ExifIFD.  To remove these
+        #  incorrectly-placed maker notes, use "exiftool -exififd:makernotes= FILE")
+        MakerNotes => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
+            DirName => 'MakerNotes', # (necessary for mechanism that prevents these from being deleted)
             ProcessProc => \&ProcessCMT3,
             WriteProc => \&Image::ExifTool::WriteTIFF,
         },

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

@@ -16,7 +16,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessDJIInfo($$$);
 
@@ -143,9 +143,10 @@ my %convFloat2 = (
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
         PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lat")',
     },
-    GpsLongtitude => { # (sic)
+    GpsLongtitude => { # [sic] (misspelt in DJI original file)
         Name => 'GPSLongtitude',
         Writable => 'real',
+        Avoid => 1, # (in case someone tries to write "GPSLong*")
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
         PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lon")',
     },

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

@@ -17,7 +17,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::MakerNotes;
 use Image::ExifTool::CanonRaw;
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 sub ProcessOriginalRaw($$$);
 sub ProcessAdobeData($$$);
@@ -120,6 +120,25 @@ sub WriteAdobeStuff($$$);
     },
 );
 
+# (DNG 1.7)
+%Image::ExifTool::DNG::ImageSeq = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    0 => { Name => 'SeqID',         Format => 'var_string' },
+    1 => { Name => 'SeqType',       Format => 'var_string' },
+    2 => { Name => 'SeqFrameInfo',  Format => 'var_string' },
+    3 => { Name => 'SeqIndex',      Format => 'int32u' },
+    7 => { Name => 'SeqCount',      Format => 'int32u' },
+    11 => { Name => 'SeqFinal',     Format => 'int8u', PrintConv => { 0 => 'No', 1 => 'Yes' } },
+);
+
+# (DNG 1.7)
+%Image::ExifTool::DNG::ProfileDynamicRange = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    0 => { Name => 'PDRVersion',    Format => 'int16u' },
+    2 => { Name => 'DynamicRange',  Format => 'int16u', PrintConv => { 0 => 'Standard', 1 => 'High' } },
+    4 => { Name => 'HintMaxOutputValue', Format => 'float' },
+);
+
 # fill in maker notes
 {
     my $tagInfo;
@@ -786,7 +805,11 @@ sub ProcessAdobeMakN($$$)
                 return 1 unless $$tagInfo{Writable};
             }
             $val = substr($$dataPt, 20) unless defined $val;
-            $et->FoundTag($tagInfo, $val);
+            my $key = $et->FoundTag($tagInfo, $val);
+            if ($$et{MAKER_NOTE_FIXUP}) {
+                $$et{TAG_EXTRA}{$key}{Fixup} = $$et{MAKER_NOTE_FIXUP};
+                delete $$et{MAKER_NOTE_FIXUP};
+            }
         }
     }
     return 1;