exiftool-vendored.pl 12.40.0 → 12.43.0

package/bin/Changes

@@ -4,13 +4,78 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.30. (Other versions are
+Note: The most recent production release is Version 12.42. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+July 6, 2022 - Version 12.43
+
+  - Added the ability to geotag from Google Takeout JSON files
+  - Added a few new Canon RF LensType values and a couple of new CanonModelID's
+    (thanks Norbert Wasser)
+  - Added new values to a couple of FujiFilm tags (thanks Greybeard)
+  - Added a new Nikon LensID (thanks BertJan Bakker)
+  - Recognize Autodesk Revit files (but don't yet support reading metadata)
+  - Decode DriveSerialNumber from LNK files (github #145)
+  - Decode Apple FocusDistanceRange (thanks Neal Krawetz)
+  - Made a number of Sony SR2SubIFD tags writable
+  - Tolerate dashes instead of colons as date separators in -geotag CSV files
+  - Patched to read new format accelerometer data from Insta360 files
+  - Patched to avoid outputting some Unknown tags when the -validate option is
+    used after a previously -execute'd command used the -u option
+  - Fixed names of Canon G9 WB levels tags (changed from GRGB to GRBG) (thanks
+    Christoph)
+  - Fixed typo in new Olympus AISubjectTrackingMode value
+  - Fixed "use of undefined value" warning when reading DJI metadata
+  - API Changes:
+      - Added IgnoreTags option
+
+June 1, 2022 - Version 12.42 (production release)
+
+  - Added support for reading maker notes from Panasonic DC-GH6 videos
+  - Added conversion for Samsung MCCData
+  - Added a new Nikon LensID (thanks Chris)
+  - Added a few new Canon LensType values
+  - Added a couple of new Olympus StackedImage values (thanks Eberhard)
+  - Added a few new values for some Nikon Settings tags (thanks Warren Hatch)
+  - Added a "lang:" element to the -json output for alternate language tags when
+    -D, -H or -t is used
+  - Update DNG writer to not issue an error when writing DNG 1.6 files
+  - Decode information from DJI "ae_dbg_info" maker notes
+  - Decode Olympus AISubjectTrackingMode
+  - Changed ExifTool FileSize print conversion to use kB/MB/GB units instead of
+    KiB/MiB/GiB
+  - Changed "is not shiftable" warning to appear in -v (instead of just -v3)
+    output
+  - Patched to allow PDF Encrypt object to be "null"
+  - Fixed bug reading ICC_Profile 'meta' tags
+
+Apr. 7, 2022 - Version 12.41
+
+  - Added support for "OM SYSTEM" maker notes
+  - Added 2 new Sony LensType values (thanks Jos Roost)
+  - Added some new Canon lenses (thanks LibRaw)
+  - Added a new Nikon LensID (thanks Bert Ligtvoet)
+  - Added a new Canon ContinuousDrive value (thanks Wolfgang Gulcker)
+  - Enhanced -v0 option to also print new file name when renaming, moving or
+    copying a file
+  - Updated xmp2exif.args and exif2xmp.args helper files to reflect the IPTC
+    Photometadata Mapping Guidelines version 2202.1
+  - Made "Invalid Xxx data" a minor warning for MakerNote data
+  - Patched to allow writing of MP4 videos which have other tracks with a
+    missing sample description entry
+  - Patched MacOS version to specify directory for external utilities (setfile,
+    xattr, stat, mdls and osascript from /usr/bin, and tag from /usr/local/bin)
+  - Fixed long-standing problem where Windows version could behave differently
+    for -if conditions containing undefined tags
+  - Fixed problem where -W+! combined with -j or -X produced invalid JSON or XML
+    when  processing multiple files
+  - Fixed potential "uninitialized value $time in division" runtime warning when
+    reading MP4 videos
+
 Feb. 9, 2022 - Version 12.40
 
-  - Added a new Nikon LensID (thanks Wolfgang Exler)
   - Added PageCount tag to return the number of pages in a multi-page TIFF
+  - Added a new Nikon LensID (thanks Wolfgang Exler)
   - Added a few more Sony LensTypes (thanks Jos Roost)
   - Decode some new Canon tags (thanks Mark Reid)
   - Decode another Nikon Z9 tag (thanks Warren Hatch)
@@ -20,14 +85,14 @@ Feb. 9, 2022 - Version 12.40
   - Updated photoshop_paths.config to include WorkingPath
   - Patched to allow writing of MP4 videos which have url tracks with a missing
     sample description entry
-  - Fixed typo in the name of a new Nikon tag (thanks Herb)
-  - Fixed description of GPR (General Purpose RAW) file type
+  - Fixed deep recursion error when reading multi-page TIFF images with more
+    than 100 pages
   - Fixed potential deep recursion runtime error when writing nested XMP
     structures
   - Fixed warning which could be generated when writing new
     Composite:GPSCoordinates tag
-  - Fixed deep recursion error when reading multi-page TIFF images with more
-    than 100 pages
+  - Fixed description of GPR (General Purpose RAW) file type
+  - Fixed typo in the name of a new Nikon tag (thanks Herb)
 
 Jan. 13, 2022 - Version 12.39
 

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.40",
+   "version" : "12.43",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.40
+version: 12.43
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -107,8 +107,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.40.tar.gz | tar -xf -
-  cd Image-ExifTool-12.40
+  gzip -dc Image-ExifTool-12.43.tar.gz | tar -xf -
+  cd Image-ExifTool-12.43
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/arg_files/exif2xmp.args

@@ -12,8 +12,10 @@
 #               2013/06/12 - PH Additions for the Exif 2.3 for XMP spec
 #               2015/01/12 - PH Avoid copying to non-standard namespaces
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
+#               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #
 # References:   http://www.metadataworkinggroup.org/specs/
+#               https://iptc.org/std/photometadata/documentation/mappingguidelines/
 #
 # Notes:     1) The first three arguments copy most of the EXIF and GPS tags to
 #               XMP-exif/XMP-tiff, and the remaining arguments handle tags
@@ -22,6 +24,8 @@
 #            2) These arguments will not delete existing XMP tags which are
 #               missing from the EXIF.  The XMP tags should be deleted
 #               beforehand if required.
+#
+#            3) EXIF:SubjectArea is not currently mapped into XMP-iptcExt:ImageRegion
 #------------------------------------------------------------------------------
 -XMP-exif:all < EXIF:all
 -XMP-exifEX:all < EXIF:all
@@ -37,6 +41,7 @@
 -XMP-xmp:CreatorTool < EXIF:Software
 -XMP-dc:Rights < EXIF:Copyright
 -XMP-dc:Creator < EXIF:Artist
+-XMP-iptcExt:DigitalImageGUID < EXIF:DigImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -Composite:Flash < EXIF:Flash
 # overwrite GPS tags which have different formats in XMP

package/bin/arg_files/xmp2exif.args

@@ -14,8 +14,10 @@
 #               2016/09/26 - PH Write Composite SubSec tags
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
 #               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
+#               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #
 # References:   http://www.metadataworkinggroup.org/specs/
+#               https://iptc.org/std/photometadata/documentation/mappingguidelines/
 #
 # Notes:     1) The first three arguments copy the bulk of the EXIF and GPS
 #               information, and the remaining arguments handle the tags
@@ -24,6 +26,8 @@
 #            2) These arguments will not delete existing EXIF tags which are
 #               missing from the XMP.  The EXIF tags should be deleted
 #               beforehand if required.
+#
+#            3) XMP-iptcExt:ImageRegion is not currently mapped into EXIF:SubjectArea
 #------------------------------------------------------------------------------
 -EXIF:all < XMP-exif:all
 -EXIF:all < XMP-exifEX:all
@@ -37,7 +41,9 @@
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
 -EXIF:Software < XMP-xmp:CreatorTool
 -EXIF:Copyright < XMP-dc:Rights
+-EXIF:Artist < XMP-plus:ImageCreatorName
 -EXIF:Artist < XMP-dc:Creator
+-EXIF:DigImageGUID < XMP-iptcExt:DigitalImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -EXIF:Flash < Composite:Flash
 # generate GPS tags which have been combined into other XMP tags

package/bin/exiftool

@@ -8,9 +8,10 @@
 #               (See html/history.html for revision history)
 #------------------------------------------------------------------------------
 use strict;
+use warnings;
 require 5.004;
 
-my $version = '12.40';
+my $version = '12.43';
 
 # 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)
@@ -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.40 --
+    -- Generated by ExifTool 12.43 --
     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>)
 

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
@@ -66,7 +66,16 @@ $VERSION = '1.05';
         Writable => 'string',
         Notes => 'unique ID for all images in a burst',
     },
-    # 0x000c - rational64s[2]: eg) "0.1640625 0.19921875"
+    0x000c => { # ref forum13710 (Neal Krawetz)
+        Name => 'FocusDistanceRange',
+        Writable => 'rational64s',
+        Count => 2,
+        PrintConv => q{
+            my @a = split ' ', $val;
+            sprintf('%.2f - %.2f m', $a[0] <= $a[1] ? @a : reverse @a);
+        },
+        PrintConvInv => '$val =~ s/ - //; $val =~ s/ ?m$//; $val',
+    },
     # 0x000d - int32s: 0,1,6,20,24,32,40
     # 0x000e - int32s: 0,1,4,12 (Orientation? 0=landscape? 4=portrait? ref 1)
     # 0x000f - int32s: 2,3

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.56';
+$VERSION = '4.59';
 
 # 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.56';
     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.56';
     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.56';
     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',
@@ -593,13 +597,23 @@ $VERSION = '4.56';
    '61182.19' => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
    '61182.20' => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
    '61182.21' => 'Canon RF 70-200mm F4L IS USM', #42
-   '61182.22' => 'Canon RF 50mm F1.8 STM', #42
-   '61182.23' => 'Canon RF 14-35mm F4L IS USM', #IB
-   '61182.24' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-   '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.22' => 'Canon RF 100mm F2.8L MACRO IS USM', #42
+   '61182.23' => 'Canon RF 50mm F1.8 STM', #42
+   '61182.24' => 'Canon RF 14-35mm F4L IS USM', #IB
+   '61182.25' => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
+   '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
+   '61182.27' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
+   '61182.28' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+   '61182.29' => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
+   '61182.30' => 'Canon RF 16mm F2.8 STM', #42
+   '61182.31' => 'Canon RF 400mm F2.8L IS USM', #IB
+   '61182.32' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+   '61182.33' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
+   '61182.34' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+   # we need the RFLensType values for the following...
+   '61182.35' => 'Canon RF 800mm F5.6L IS USM', #PH (NC)
+   '61182.36' => 'Canon RF 1200mm F8L IS USM', #PH (NC)
+   '61182.37' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -956,6 +970,8 @@ $VERSION = '4.56';
     0x80000437 => 'EOS 90D', #IB
     0x80000450 => 'EOS R3', #42
     0x80000453 => 'EOS R6', #PH
+    0x80000464 => 'EOS R7', #42
+    0x80000465 => 'EOS R10', #42
     0x80000467 => 'PowerShot ZOOM',
     0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
     0x80000520 => 'EOS D2000C', #IB
@@ -1018,7 +1034,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?
@@ -2133,6 +2149,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
@@ -6517,23 +6534,23 @@ my %ciMaxFocal = (
     0x02 => 'FacesDetected',
 );
 
-# G9 white balance information (MakerNotes tag 0x29) (ref IB)
+# G9 white balance information (MakerNotes tag 0x29) (ref IB, changed ref forum13640)
 %Image::ExifTool::Canon::WBInfo = (
     %binaryDataAttrs,
     NOTES => 'WB tags for the Canon G9.',
     FORMAT => 'int32u',
     FIRST_ENTRY => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    0x02 => { Name => 'WB_GRGBLevelsAuto',        Format => 'int32s[4]' },
-    0x0a => { Name => 'WB_GRGBLevelsDaylight',    Format => 'int32s[4]' },
-    0x12 => { Name => 'WB_GRGBLevelsCloudy',      Format => 'int32s[4]' },
-    0x1a => { Name => 'WB_GRGBLevelsTungsten',    Format => 'int32s[4]' },
-    0x22 => { Name => 'WB_GRGBLevelsFluorescent', Format => 'int32s[4]' },
-    0x2a => { Name => 'WB_GRGBLevelsFluorHigh',   Format => 'int32s[4]' },
-    0x32 => { Name => 'WB_GRGBLevelsFlash',       Format => 'int32s[4]' },
-    0x3a => { Name => 'WB_GRGBLevelsUnderwater',  Format => 'int32s[4]' },
-    0x42 => { Name => 'WB_GRGBLevelsCustom1',     Format => 'int32s[4]' },
-    0x4a => { Name => 'WB_GRGBLevelsCustom2',     Format => 'int32s[4]' },
+    0x02 => { Name => 'WB_GRBGLevelsAuto',        Format => 'int32s[4]' },
+    0x0a => { Name => 'WB_GRBGLevelsDaylight',    Format => 'int32s[4]' },
+    0x12 => { Name => 'WB_GRBGLevelsCloudy',      Format => 'int32s[4]' },
+    0x1a => { Name => 'WB_GRBGLevelsTungsten',    Format => 'int32s[4]' },
+    0x22 => { Name => 'WB_GRBGLevelsFluorescent', Format => 'int32s[4]' },
+    0x2a => { Name => 'WB_GRBGLevelsFluorHigh',   Format => 'int32s[4]' },
+    0x32 => { Name => 'WB_GRBGLevelsFlash',       Format => 'int32s[4]' },
+    0x3a => { Name => 'WB_GRBGLevelsUnderwater',  Format => 'int32s[4]' },
+    0x42 => { Name => 'WB_GRBGLevelsCustom1',     Format => 'int32s[4]' },
+    0x4a => { Name => 'WB_GRBGLevelsCustom2',     Format => 'int32s[4]' },
 );
 
 # yet more face detect information (MakerNotes tag 0x2f) - PH (G12)
@@ -6790,13 +6807,19 @@ my %ciMaxFocal = (
             276 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
             277 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
             278 => 'Canon RF 70-200mm F4L IS USM', #42
+            279 => 'Canon RF 100mm F2.8L MACRO IS USM', #42
             280 => 'Canon RF 50mm F1.8 STM', #42
             281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
+            282 => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
             283 => 'Canon RF 100-400mm F5.6-8 IS USM', #42
             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)
+            286 => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
             288 => 'Canon RF 16mm F2.8 STM', #42
-           #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
+            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
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },

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

@@ -11,11 +11,14 @@ package Image::ExifTool::DJI;
 
 use strict;
 use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.04';
+$VERSION = '1.06';
+
+sub ProcessDJIInfo($$$);
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -44,6 +47,29 @@ my %convFloat2 = (
     0x0b => { Name => 'CameraRoll', Writable => 'float', %convFloat2 },
 );
 
+# DJI debug maker notes
+%Image::ExifTool::DJI::Info = (
+    PROCESS_PROC => \&ProcessDJIInfo,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Tags written by some DJI drones.',
+    VARS => { LONG_TAGS => 2 },
+    ae_dbg_info         => { Name => 'AEDebugInfo' },
+    ae_histogram_info   => { Name => 'AEHistogramInfo' },
+    ae_local_histogram  => { Name => 'AELocalHistogram' },
+    ae_liveview_histogram_info  => { Name => 'AELiveViewHistogramInfo' },
+    ae_liveview_local_histogram => { Name => 'AELiveViewLocalHistogram' },
+    awb_dbg_info        => { Name => 'AWBDebugInfo' },
+    af_dbg_info         => { Name => 'AFDebugInfo' },
+    hiso                => { Name => 'Histogram' },
+    xidiri              => { Name => 'Xidiri' },
+   'GimbalDegree(Y,P,R)'=> { Name => 'GimbalDegree' },
+   'FlightDegree(Y,P,R)'=> { Name => 'FlightDegree' },
+    adj_dbg_info        => { Name => 'ADJDebugInfo' },
+    sensor_id           => { Name => 'SensorID' },
+   'FlightSpeed(X,Y,Z)' => { Name => 'FlightSpeed' },
+    hyperlapse_dbg_info => { Name => 'HyperlapsDebugInfo' },
+);
+
 # thermal parameters in APP4 of DJI ZH20T images (ref forum11401)
 %Image::ExifTool::DJI::ThermalParams = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -134,6 +160,39 @@ my %convFloat2 = (
     },
 );
 
+#------------------------------------------------------------------------------
+# Process DJI infor (ref PH)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessDJIInfo($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dirStart = $$dirInfo{DirStart} || 0;
+    my $dirLen = $$dirInfo{DirLen} || (length($$dataPt) - $dirStart);
+    if ($dirStart) {
+        my $buff = substr($$dataPt, $dirStart, $dirLen);
+        $dataPt = \$buff;
+    }
+    while ($$dataPt =~ /\G\[(.*?)\](?=(\[|$))/sg) {
+        my ($tag, $val) = split /:/, $1, 2;
+        next unless defined $tag and defined $val;
+        if ($val =~ /^([\x20-\x7f]+)\0*$/) {
+            $val = $1;
+        } else {
+            my $buff = $val;
+            $val = \$buff;
+        }
+        if (not $$tagTbl{$tag} and $tag=~ /^[-_a-zA-Z0-9]+$/) {
+            my $name = $tag;
+            $name =~ s/_([a-z])/_\U$1/g;
+            AddTagToTable($tagTbl, $tag, { Name => Image::ExifTool::MakeTagName($name) });
+        }
+        $et->HandleTag($tagTbl, $tag, $val);
+    }
+    return 1;
+}
+
 __END__
 
 =head1 NAME

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

@@ -680,8 +680,14 @@ sub ProcessAdobeMakN($$$)
     my $dataPos = $$dirInfo{DataPos};
     my $hdrLen = 6;
 
-    # hack for extra 12 bytes in MakN header of JPEG converted to DNG by Adobe Camera Raw
-    # (4 bytes "00 00 00 01" followed by 8 unknown bytes)
+    # 2018-09-27: hack for extra 12 bytes in MakN header of JPEG converted to DNG
+    # by Adobe Camera Raw (4 bytes "00 00 00 01" followed by 8 unknown bytes)
+    # - this is because CameraRaw copies the maker notes from the wrong location
+    #   in a JPG image (off by 12 bytes presumably due to the JPEG headers)
+    # - this hack won't work in most cases because the extra bytes are not consistent
+    #   since they are just the data that existed in the JPG before the maker notes
+    # - also, the last 12 bytes of the maker notes will be missing
+    # - 2022-04-26: this bug still exists in Camera Raw 14.3
     $hdrLen += 12 if $len >= 18 and substr($$dataPt, $start+6, 4) eq "\0\0\0\x01";
 
     my $dirStart = $start + $hdrLen;    # pointer to maker note directory