exiftool_vendored 13.50.0 → 13.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119da28d5499012533651a09438cf1c0b551bb65e4b97815bc86190c7b439beb
-  data.tar.gz: 11292b43f6d89879e7eef760270799f803ec5bc15cdcaf8eb9c57fdeb7d9f9cc
+  metadata.gz: f1432f9788115500c5dc934cf7a08f704b8ac43891cd615e31613b08b296d6e4
+  data.tar.gz: 64a324bd2b96853ea8324c43fe1af74a4aa8b57fcda53253d5ec84b28371b59c
 SHA512:
-  metadata.gz: 36b76bee5489e79558b03b5eabf21f0e59d9d60c4702818468f82dd50141f652caa8395a791d117d502d3e7aff95d6ceb139e741fa5351c0cf5925936331d45b
-  data.tar.gz: 39b786e84e02df42bc8021b97084fa899810a4b8207e5bb91fc92dc990e4768efb1600bfc83497f7ae0d1db2cab02677633e054cc23fe693e30490778dd09f23
+  metadata.gz: 3712cd77765affd98d21ec3a8602dc4a2d2f86ccff56c3eb44f437cd7711182e9c7aaaccef566f3bfd045499f72a3641d01b05dec5891cf34059b7d76444892f
+  data.tar.gz: 248b84f36b0dc2f2cc653ef1ee0832adbcbce7d386dc482941a85db67fa2704a23d7a0724cb3d10527aac782a5ee32a11aaca2f0da3277b4180862a5fdf6b7f0

data/bin/Changes

@@ -7,6 +7,34 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.50. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Feb. 27, 2026 - Version 13.52
+
+  - Added a number of new XMP tags written by Adobe software
+  - Added UTF-16 support for a few different metadata types in which only UCS-2
+    was previously implemented (github #396)
+  - Added a few more Canon FlashModel values and decode FlashModel for the
+    5DmkII (thanks Peter Wem, github #390)
+  - Added a new Canon LensType (github #395)
+  - Added some missing file attribute bits to two of the new LNK tags
+  - Decode internal serial number for the 5DmkII (thanks Peter Wem, github #398)
+  - Decode another OwnerName for the 5DmkII (thanks Peter Wem, github #397)
+  - Decode some timed GPS for a couple of new DJI drones
+  - Enable WindowsLongPath by default only if Win32::API is available
+  - Renamed the Pentax K3III AFInfo tag to AFInfoK3III
+
+Feb. 19, 2026 - Version 13.51
+
+  - Added a new Nikon LensID (thanks Johan)
+  - Decode more tags from Windows LNK files
+  - Decode another LIGOGPSINFO variant (github #394)
+  - Decode some new Canon tags (thanks Peter Wem, github #389, #390,  #393)
+  - Decode some new Nikon tags
+  - Split decoding on Nikon BurstGroupID into separate tags
+  - Fixed round-off error in GPSDateTime seconds for camm6 metadata in MP4
+    videos introduced in 13.45
+  - Fixed bug generating the default-language version of
+    QuickTime:LocationInformation (github #391)
+
 Feb. 7, 2026 - Version 13.50 (production release)
 
   - Added a few new Sony lenses (thanks Jos Roost)

data/bin/META.json

@@ -50,6 +50,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.50",
+   "version" : "13.52",
    "x_serialization_backend" : "JSON::PP version 4.06"
 }

data/bin/META.yml

@@ -31,5 +31,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.50'
+version: '13.52'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -111,8 +111,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-13.50.tar.gz | tar -xf -
-  cd Image-ExifTool-13.50
+  gzip -dc Image-ExifTool-13.52.tar.gz | tar -xf -
+  cd Image-ExifTool-13.52
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -158,7 +158,7 @@ for calculating digest values and providing other features listed below:
   POSIX::strptime      (for inverse date/time conversion)
   Time::Piece          (alternative to POSIX::strptime)
   Unicode::LineBreak   (for column alignment of alternate-language output)
-  Win32::API           (for proper handling of Windows file times)
+  Win32::API           (for proper handling of Windows file names/times)
   Win32::FindFile      (for Windows Unicode directory support, app only)
   Win32API::File       (for Windows Unicode file names and file times)
   Compress::Raw::Lzma  (for reading encoded 7z files)

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.50';
+my $version = '13.52';
 
 $^W = 1;    # enable global warnings
 
@@ -5530,7 +5530,7 @@ C<E<lt>> to avoid confusion with the C<E<lt>=> operator which sets the tag
 value from the contents of a file.  A single space at the start of the
 string is removed if it exists, but all other whitespace in the string is
 preserved.  See note 8 below about using the redirection feature with
-list-type stags, shortcuts or when using wildcards in tag names.
+list-type tags, shortcuts or when using wildcards in tag names.
 
 See L</COPYING EXAMPLES> for examples using B<-tagsFromFile>.
 
@@ -6136,7 +6136,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.50 --
+    -- Generated by ExifTool 13.52 --
     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

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.14';
+$VERSION = '1.15';
 
 sub ProcessAPP12($$$);
 sub ProcessDucky($$$);
@@ -114,8 +114,8 @@ sub WriteDucky($$$);
         Priority => 0,
         Avoid => 1,
         # (ignore 4-byte character count at start of value)
-        ValueConv => '$self->Decode(substr($val,4),"UCS2","MM")',
-        ValueConvInv => 'pack("N",length $val) . $self->Encode($val,"UCS2","MM")',
+        ValueConv => '$self->Decode(substr($val,4),"UTF16","MM")',
+        ValueConvInv => 'pack("N",length $val) . $self->Encode($val,"UTF16","MM")',
     },
     3 => { #PH
         Name => 'Copyright',
@@ -123,8 +123,8 @@ sub WriteDucky($$$);
         Avoid => 1,
         Groups => { 2 => 'Author' },
         # (ignore 4-byte character count at start of value)
-        ValueConv => '$self->Decode(substr($val,4),"UCS2","MM")',
-        ValueConvInv => 'pack("N",length $val) . $self->Encode($val,"UCS2","MM")',
+        ValueConv => '$self->Decode(substr($val,4),"UTF16","MM")',
+        ValueConvInv => 'pack("N",length $val) . $self->Encode($val,"UTF16","MM")',
     },
 );
 

data/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.26';
+$VERSION = '1.27';
 
 sub ProcessASF($$;$);
 sub ProcessContentDescription($$$);
@@ -549,7 +549,7 @@ sub ProcessContentDescription($$$)
         my $len = shift @len;
         next unless $len;
         return 0 if $pos + $len > $dirLen;
-        my $val = $et->Decode(substr($$dataPt,$pos,$len),'UCS2','II');
+        my $val = $et->Decode(substr($$dataPt,$pos,$len),'UTF16','II');
         $et->HandleTag($tagTablePtr, $tag, $val);
         $pos += $len;
     }
@@ -594,7 +594,7 @@ sub ReadASF($$$$$)
     my ($et, $dataPt, $pos, $format, $size) = @_;
     my @vals;
     if ($format == 0) { # unicode string
-        $vals[0] = $et->Decode(substr($$dataPt,$pos,$size),'UCS2','II');
+        $vals[0] = $et->Decode(substr($$dataPt,$pos,$size),'UTF16','II');
     } elsif ($format == 2) { # 4-byte boolean
         @vals = ReadValue($dataPt, $pos, 'int32u', undef, $size);
         foreach (@vals) {
@@ -631,7 +631,7 @@ sub ProcessExtendedContentDescription($$$)
         my $nameLen = unpack("x${pos}v", $$dataPt);
         $pos += 2;
         return 0 if $pos + $nameLen + 4 > $dirLen;
-        my $tag = Image::ExifTool::Decode(undef,substr($$dataPt,$pos,$nameLen),'UCS2','II','Latin');
+        my $tag = Image::ExifTool::Decode(undef,substr($$dataPt,$pos,$nameLen),'UTF16','II','Latin');
         $tag =~ s/^WM\///; # remove leading "WM/"
         $pos += $nameLen;
         my ($dType, $dLen) = unpack("x${pos}v2", $$dataPt);
@@ -667,7 +667,7 @@ sub ProcessMetadata($$$)
         my ($index, $stream, $nameLen, $dType, $dLen) = unpack("x${pos}v4V", $$dataPt);
         $pos += 12;
         return 0 if $pos + $nameLen + $dLen > $dirLen;
-        my $tag = Image::ExifTool::Decode(undef,substr($$dataPt,$pos,$nameLen),'UCS2','II','Latin');
+        my $tag = Image::ExifTool::Decode(undef,substr($$dataPt,$pos,$nameLen),'UTF16','II','Latin');
         $tag =~ s/^WM\///; # remove leading "WM/"
         $pos += $nameLen;
         my $val = ReadASF($et,$dataPt,$pos,$dType,$dLen);
@@ -702,8 +702,8 @@ sub ProcessPicture($$$)
     my $str = substr($$dataPt, $dirStart+5, $n);
     if ($str =~ /^((?:..)*?)\0\0((?:..)*?)\0\0/s) {
         my ($mime, $desc) = ($1, $2);
-        $et->HandleTag($tagTablePtr, 1, $et->Decode($mime,'UCS2','II'));
-        $et->HandleTag($tagTablePtr, 2, $et->Decode($desc,'UCS2','II')) if length $desc;
+        $et->HandleTag($tagTablePtr, 1, $et->Decode($mime,'UTF16','II'));
+        $et->HandleTag($tagTablePtr, 2, $et->Decode($desc,'UTF16','II')) if length $desc;
     }
     $et->HandleTag($tagTablePtr, 3, substr($$dataPt, $dirStart+5+$n, $picLen));
     return 1;
@@ -731,12 +731,12 @@ sub ProcessCodecList($$$)
         my $nameLen = Get16u($dataPt, $pos + 2) * 2;
         $pos += 4;
         return 0 if $pos + $nameLen + 2 > $dirLen;
-        my $name = $et->Decode(substr($$dataPt,$pos,$nameLen),'UCS2','II');
+        my $name = $et->Decode(substr($$dataPt,$pos,$nameLen),'UTF16','II');
         $et->HandleTag($tagTablePtr, "${type}Name", $name);
         my $descLen = Get16u($dataPt, $pos + $nameLen) * 2;
         $pos += $nameLen + 2;
         return 0 if $pos + $descLen + 2 > $dirLen;
-        my $desc = $et->Decode(substr($$dataPt,$pos,$descLen),'UCS2','II');
+        my $desc = $et->Decode(substr($$dataPt,$pos,$descLen),'UTF16','II');
         $et->HandleTag($tagTablePtr, "${type}Description", $desc);
         my $infoLen = Get16u($dataPt, $pos + $descLen);
         $pos += $descLen + 2 + $infoLen;

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.65';
+$VERSION = '3.66';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -2262,22 +2262,33 @@ sub WriteTagNames($$)
                 print HTMLFILE "<table class='inner sep' cellspacing=1>\n";
                 my $align = ' class=r';
                 my $wid = 0;
-                my @keys;
+                my (@keys, @bits);
                 foreach (sort { NumbersFirst($a,$b) } keys %$printConv) {
-                    next if /^(Notes|PrintHex|PrintInt|PrintString|OTHER)$/;
+                    next if /^(Notes|PrintHex|PrintInt|PrintString|OTHER|BITMASK)$/;
                     $align = '' if $align and /[^\d]/;
                     my $w = length($_) + length($$printConv{$_});
                     $wid = $w if $wid < $w;
                     push @keys, $_;
-                    if ($$printConv{$_} =~ /[\0-\x1f\x7f-\xff]/) {
-                        warn "Warning: Special characters in $tableName PrintConv ($$printConv{$_})\n";
+                    next unless $$printConv{$_} =~ /[\0-\x1f\x7f-\xff]/;
+                    warn "Warning: Special characters in $tableName PrintConv ($$printConv{$_})\n";
+                }
+                my $bits = $$printConv{BITMASK};
+                if ($bits) {
+                    $align = '';
+                    foreach (sort { NumbersFirst($a,$b) } keys %$bits) {
+                        my $w = length($_) + length($$bits{$_}) + 4;
+                        $wid = $w if $wid < $w;
+                        push @bits, $_;
+                        next unless $$bits{$_} =~ /[\0-\x1f\x7f-\xff]/;
+                        warn "Warning: Special characters in $tableName PrintConv BITMASK ($$bits{$_})\n";
                     }
                 }
                 $wid = length($tableName)+7 if $wid < length($tableName)+7;
                 # print in multiple columns if there is room
                 my $cols = int(110 / ($wid + 4));
-                $cols = 1 if $cols < 1 or $cols > @keys or @keys < 4;
-                my $rows = int((scalar(@keys) + $cols - 1) / $cols);
+                my $items = @keys + @bits;
+                $cols = 1 if $cols < 1 or $cols > $items or $items < 4;
+                my $rows = int(($items + $cols - 1) / $cols);
                 my ($r, $c);
                 print HTMLFILE '<tr class=h>';
                 for ($c=0; $c<$cols; ++$c) {
@@ -2287,11 +2298,18 @@ sub WriteTagNames($$)
                 for ($r=0; $r<$rows; ++$r) {
                     print HTMLFILE '<tr>';
                     for ($c=0; $c<$cols; ++$c) {
-                        my $key = $keys[$r + $c*$rows];
-                        my ($index, $prt);
+                        my ($key, $val, $index, $prt);
+                        my $n = $r + $c * $rows;
+                        if ($n < @keys) {
+                            $key = $keys[$n];
+                            $val = $$printConv{$key};
+                        } elsif ($n < $items) {
+                            $key = 'Bit ' . $bits[$n - @keys];
+                            $val = $$bits{$bits[$n - @keys]};
+                        }
                         if (defined $key) {
                             $index = $key;
-                            $prt = '= ' . EscapeHTML($$printConv{$key});
+                            $prt = '= ' . EscapeHTML($val);
                             $index =~ s/\.\d+$// if $$printConv{PrintInt};
                             if ($$printConv{PrintHex}) {
                                 $index =~ s/(\.\d+)$//; # remove decimal

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '5.03';
+$VERSION = '5.05';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -540,6 +540,8 @@ $VERSION = '5.03';
     757 => 'Canon EF 400mm f/2.8L IS III USM', #IB
     758 => 'Canon EF 600mm f/4L IS III USM', #IB
 
+    923 => 'Meike/SKY 85mm f/1.8 DCM', #github395
+
     1136 => 'Sigma 24-70mm f/2.8 DG OS HSM | A', #IB (017)
     # (STM lenses - 0x10xx)
     4142 => 'Canon EF-S 18-135mm f/3.5-5.6 IS STM',
@@ -1022,6 +1024,29 @@ $VERSION = '5.03';
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
 
+# flash models (github390)
+my %flashModel = (
+    0 => 'n/a',
+  # 1 - seen this for various PowerShot/IXUS models
+    4 => 'Speedlite 540EZ',
+    5 => 'Speedlite 380EX',
+    6 => 'Speedlite 550EX',
+    8 => 'Speedlite ST-E2',
+    9 => 'Speedlite MR-14EX',
+    12 => 'Speedlite 580EX',
+    13 => 'Speedlite 430EX',
+    17 => 'Speedlite 580EX II',
+    18 => 'Speedlite 430EX II',
+    22 => 'Speedlite 600EX-RT',
+    23 => 'Speedlite 600EX II-RT',
+    24 => 'Speedlite 90EX',
+    25 => 'Speedlite 430EX III-RT',
+    31 => 'Speedlite EL-1 ver2',
+    33 => 'Speedlite EL-5',
+    34 => 'Speedlite EL-10',
+  # 127 - seen a lot, currently ignored
+);
+
 my %canonQuality = (
     -1 => 'n/a', # (PH, EOS M MOV video)
     1 => 'Economy',
@@ -2526,8 +2551,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         PrintConvInv => '$val',
     },
     28 => {
-        Name => 'FlashActivity',
-        RawConv => '$val==-1 ? undef : $val',
+        Name => 'FlashModel', #github390
+        # (don't know what bit 7 is for, but it is set for most models except 1Ds)
+        Mask => 0x7f,
+        RawConv => '$val == 127 ? undef : $val',
+        PrintConv => \%flashModel,
     },
     29 => {
         Name => 'FlashBits',
@@ -3969,6 +3997,7 @@ my %ciMaxFocal = (
         Name => 'HighlightTonePriority',
         PrintConv => \%offOn,
     },
+    0x13 => { Name => 'FlashModel', Mask => 0x7f, PrintConv => \%flashModel }, #github390
     0x1b => { %ciMacroMagnification }, #PH
     0x15 => { #PH (580 EX II)
         Name => 'FlashMeteringMode',
@@ -4053,6 +4082,11 @@ my %ciMaxFocal = (
         # some firmwares have a null instead of a space after the version number
         RawConv => '$val=~/^\d+\.\d+\.\d+\s*$/ ? $val : undef',
     },
+    0x18e => { #github397
+        Name => 'OwnerName',
+        Priority => 0,
+        Format => 'string[32]',
+    },
     0x1bb => {
         Name => 'FileIndex',
         Groups => { 2 => 'Image' },
@@ -4787,6 +4821,14 @@ my %ciMaxFocal = (
     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)
+    0x09da => { #github393
+        Name => 'CameraTemperature',
+        Groups => { 2 => 'Camera' },
+        ValueConv => '$val - 128',
+        ValueConvInv => '$val + 128',
+        PrintConv => '"$val C"',
+        PrintConvInv => '$val=~s/ ?C//; $val',
+    },
     0x0af1 => { #forum15210/15579
         Name => 'ShutterCount',
         Format => 'int32u',
@@ -5588,6 +5630,7 @@ my %ciMaxFocal = (
     0x03 => { %ciFNumber }, #PH
     0x04 => { %ciExposureTime }, #PH
     0x06 => { %ciISO }, #PH
+    0x13 => { Name => 'FlashModel', Mask => 0x7f, PrintConv => \%flashModel }, #github390
     0x15 => { #PH (580 EX II)
         Name => 'FlashMeteringMode',
         PrintConv => {
@@ -7095,9 +7138,17 @@ my %ciMaxFocal = (
     %binaryDataAttrs,
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    9 => {
+    0 => { #github398 (5DmkII,5DmkIII,5DmkIV,5DS,5DSR)
+        Name => 'InternalSerialNumber2',
+        Format => 'string[9]',
+        Notes => 'could be the number on a barcode sticker of the main circuit board',
+        RawConv => '$val =~ /^\w{6}/ ? $val : undef',
+
+    },
+    9 => { # (other models)
         Name => 'InternalSerialNumber',
         Format => 'string',
+        RawConv => '$val =~ /^\w{6}/ ? $val : undef',
     },
 );
 
@@ -7626,6 +7677,19 @@ my %ciMaxFocal = (
         SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorCalib' }
     },
     0x0e7 => { Name => 'AverageBlackLevel',     Format => 'int16u[4]' }, #IB
+    0x26b => { #github389
+        Name => 'FlashOutput',
+        ValueConv => '$val >= 255 ? 255 : exp(($val-200)/16*log(2))',
+        ValueConvInv => '$val == 255 ? 255 : 200 + log($val)*16/log(2)',
+        PrintConv => '$val == 255 ? "Strobe or Misfire" : sprintf("%.0f%%", $val * 100)',
+        PrintConvInv => '$val =~ /^(\d(\.?\d*))/ ? $1 / 100 : 255',
+    },
+    0x26c => { #github389
+        Name => 'FlashBatteryLevel',
+        # calibration taken from ColorData3
+        PrintConv => '$val ? sprintf("%.2fV", $val * 5 / 186) : "n/a"',
+        PrintConvInv => '$val=~/^(\d+\.\d+)\s*V?$/i ? int($val*186/5+0.5) : 0',
+    },
     0x280 => { #PH
         Name => 'RawMeasuredRGGB',
         Format => 'int32u[4]',
@@ -8115,6 +8179,19 @@ my %ciMaxFocal = (
         SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorCalib' }
     },
     0x114 => { Name => 'AverageBlackLevel',     Format => 'int16u[4]' }, #IB
+    0x198 => { #github389
+        Name => 'FlashOutput',
+        ValueConv => '$val >= 255 ? 255 : exp(($val-200)/16*log(2))',
+        ValueConvInv => '$val == 255 ? 255 : 200 + log($val)*16/log(2)',
+        PrintConv => '$val == 255 ? "Strobe or Misfire" : sprintf("%.0f%%", $val * 100)',
+        PrintConvInv => '$val =~ /^(\d(\.?\d*))/ ? $1 / 100 : 255',
+    },
+    0x199 => { #github389
+        Name => 'FlashBatteryLevel',
+        # calibration taken from ColorData3
+        PrintConv => '$val ? sprintf("%.2fV", $val * 5 / 186) : "n/a"',
+        PrintConvInv => '$val=~/^(\d+\.\d+)\s*V?$/i ? int($val*186/5+0.5) : 0',
+    },
     0x1ad => {
         Name => 'RawMeasuredRGGB',
         Condition => '$$self{ColorDataVersion} == 10',
@@ -8570,6 +8647,19 @@ my %ciMaxFocal = (
         Name => 'PerChannelBlackLevel',
         Format => 'int16u[4]',
     },
+    0x299 => { #github389
+        Name => 'FlashOutput',
+        ValueConv => '$val >= 255 ? 255 : exp(($val-200)/16*log(2))',
+        ValueConvInv => '$val == 255 ? 255 : 200 + log($val)*16/log(2)',
+        PrintConv => '$val == 255 ? "Strobe or Misfire" : sprintf("%.0f%%", $val * 100)',
+        PrintConvInv => '$val =~ /^(\d(\.?\d*))/ ? $1 / 100 : 255',
+    },
+    0x29a => { #github389
+        Name => 'FlashBatteryLevel',
+        # calibration taken from ColorData3
+        PrintConv => '$val ? sprintf("%.2fV", $val * 5 / 186) : "n/a"',
+        PrintConvInv => '$val=~/^(\d+\.\d+)\s*V?$/i ? int($val*186/5+0.5) : 0',
+    },
     # 0x326 - PerChannelBlackLevel again
     0x32a => {
         Name => 'NormalWhiteLevel',
@@ -8812,6 +8902,19 @@ my %ciMaxFocal = (
         Name => 'PerChannelBlackLevel',
         Format => 'int16u[4]',
     },
+    0x203 => { #github389
+        Name => 'FlashOutput',
+        ValueConv => '$val >= 255 ? 255 : exp(($val-200)/16*log(2))',
+        ValueConvInv => '$val == 255 ? 255 : 200 + log($val)*16/log(2)',
+        PrintConv => '$val == 255 ? "Strobe or Misfire" : sprintf("%.0f%%", $val * 100)',
+        PrintConvInv => '$val =~ /^(\d(\.?\d*))/ ? $1 / 100 : 255',
+    },
+    0x204 => { #github389
+        Name => 'FlashBatteryLevel',
+        # calibration taken from ColorData3
+        PrintConv => '$val ? sprintf("%.2fV", $val * 5 / 186) : "n/a"',
+        PrintConvInv => '$val=~/^(\d+\.\d+)\s*V?$/i ? int($val*186/5+0.5) : 0',
+    },
     # 0x290 - PerChannelBlackLevel again
     0x294 => {
         Name => 'NormalWhiteLevel',

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

@@ -77,10 +77,10 @@ my %unicode2byte = (
     PDFDoc       => 0x181,
     Unicode      => 0x200, # (UCS2)
     UCS2         => 0x200,
-    UTF16        => 0x200,
+    UTF16        => 0x200, # (UCS2 with surrogate pairs added)
     Symbol       => 0x201,
     JIS          => 0x201,
-    UCS4         => 0x400,
+    UCS4         => 0x400, # (UTF32)
     MacChineseCN => 0x803,
     MacChineseTW => 0x803,
     MacHebrew    => 0x803, # (directional characters not supported)

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

@@ -18,7 +18,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 use Image::ExifTool::Protobuf;
 
-$VERSION = '1.16';
+$VERSION = '1.17';
 
 sub ProcessDJIInfo($$$);
 sub ProcessSettings($$$);
@@ -36,7 +36,9 @@ sub ProcessSettings($$$);
     'dvtm_PP-101.proto' => 1,       # Osmo Pocket 3
     'dvtm_oq101.proto' => 1,        # Osmo 360
     'dvtm_wa345e.proto' => 1,       # Matrice 4E
-    'dvtm_wm261.proto' => 1,        # Mavic Pro 3
+    'dvtm_wm261.proto' => 1,        # Mavic 3 Pro
+    'dvtm_Mavic4.proto' => 1,       # Mavic 4 Pro
+    'dvtm_Mini5Pro.proto' => 1,     # Mini 5 Pro
 # dvtm_wm169.proto seems to be DJI O3 but the structure is unknown
 );
 
@@ -246,8 +248,9 @@ my %convFloat2 = (
         dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30),
         dvtm_Mini4_Pro.proto (Mini 4 Pro), dvtm_dji_neo.proto (DJI Neo),
         dvtm_Air3.proto (Air 3), dvtm_Air3s.proto (Air 3s), dvtm_PP-101.proto (Osmo
-        Pocket 3), dvtm_oq101.proto (Osmo 360), dvtm_wa345e.proto (Matrice 4E) and
-        dvtm_wm261.proto (Mavic Pro 3).
+        Pocket 3), dvtm_oq101.proto (Osmo 360), dvtm_wa345e.proto (Matrice 4E),
+        dvtm_wm261.proto (Mavic 3 Pro), dvtm_Mavic4.proto (Mavic 4 Pro) and
+        dvtm_Mini5Pro.proto (Mini 5 Pro).
 
         Note that with the protobuf format, numerical tags missing from the output
         for a given protocol should be considered to have the default value of 0.
@@ -255,7 +258,7 @@ my %convFloat2 = (
     Protocol => {
         Notes => "typically protobuf field 1-1-1, but ExifTool doesn't rely on this",
         RawConv => q{
-            unless ($Image::ExifTool::DJI::knownProtocol{$val}) {
+            unless ($Image::ExifTool::DJI::knownProtocol{$val} or $val =~ /^dbginfo/) {
                 $self->Warn("Unknown protocol $val (please submit sample for testing)");
             }
             return $val;
@@ -473,7 +476,7 @@ my %convFloat2 = (
         PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
     },
     'dvtm_Mini4_Pro_3-2-32-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
-   # dvtm_Mini4_Pro_3-2-37-1 - something to do with battery level or time remaining?
+    'dvtm_Mini4_Pro_3-2-37-1' => { Name => 'Temperature', Format => 'float' }, # (NC)
     'dvtm_Mini4_Pro_3-3-4-1' => {
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
@@ -714,9 +717,9 @@ my %convFloat2 = (
         PrintConv => '$self->ConvertDateTime($val)',
     },
 #
-# Mavic Pro 3
+# Mavic 3 Pro
 #
-    'dvtm_wm261_1-1-5' => { Name => 'SerialNumber', Notes => 'Mavic Pro 3' },
+    'dvtm_wm261_1-1-5' => { Name => 'SerialNumber', Notes => 'Mavic 3 Pro' },
     'dvtm_wm261_1-1-10' => 'Model',
     'dvtm_wm261_2-3' => {
         Name => 'FrameInfo',
@@ -761,8 +764,67 @@ my %convFloat2 = (
         ValueConv => '$val =~ tr/-/:/; $val',
         PrintConv => '$self->ConvertDateTime($val)',
     },
+#
+# Mavic 4 Pro
+#
+    'dvtm_Mavic4_1-1-5' => { Name => 'SerialNumber', Notes => 'Mavic 4 Pro' },
+    'dvtm_Mavic4_1-1-10' => 'Model',
+   # dvtm_Mavic4_2-2-1-4 - model code?
+   # dvtm_Mavic4_2-2-1-5 - frame rate again
+    'dvtm_Mavic4_2-3' => {
+        Name => 'FrameInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_Mavic4_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+   # dvtm_Mavic4_3-2-1-4 - string: model code?
+   # dvtm_Mavic4_3-2-1-5 - float: frame rate again
+    'dvtm_Mavic4_3-2-9-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_Mavic4_3-2-10-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_Mavic4_3-2-24-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
+   # dvtm_Mavic4_3-2-32-1 - unsigned: color temperature again
+    'dvtm_Mavic4_3-2-37-1' => { Name => 'Temperature', Format => 'float' }, # (NC)
+    'dvtm_Mavic4_3-3-3' => { # (NC)
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_Mavic4_3-3-4-1' => {
+        Name => 'GPSInfo',
+        Condition => '$$self{CoordUnits} = 1', # (stores in degrees)
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_Mavic4_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' }, # (NC)
+    'dvtm_Mavic4_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' }, # (NC)
+   # dvtm_Mavic4_3-4-1-4 - string: model code?
+#
+# Mini 5 Pro
+#
+    'dvtm_Mini5Pro_1-1-5' => { Name => 'SerialNumber', Notes => 'Mini 5 Pro' }, # (NC)
+    'dvtm_Mini5Pro_1-1-10' => 'Model', # (NC)
+    'dvtm_Mini5Pro_3-2-37-1' => { Name => 'Temperature', Format => 'float' }, # (NC)
+    'dvtm_Mini5Pro_3-3-4-1' => {
+        Name => 'GPSInfo',
+        Condition => '$$self{CoordUnits} = 1', # (NC)
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_Mini5Pro_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' }, # (NC)
 );
 
+# debug info (not yet extracted)
+# Mavic 4 Pro (ref forum17855)
+# dbginfo_wa341_2-1-29-12 - Absolute Altitude
+# dbginfo_wa341_2-1-29-14 - Relative Altitude
+# dbginfo_wa341_2-1-29-16 - VPS Height (Ultrasonic)
+# dbginfo_wa341_2-1-4-200-198 - Sensor Temperature
+
 %Image::ExifTool::DJI::DroneInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,

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

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.25';
+$VERSION = '1.26';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -942,7 +942,7 @@ sub ReadUnicodeStr($$$;$)
     }
     $pos += 2 if $pos & 0x03;
     my $to = $et ? $et->Options('Charset') : 'UTF8';
-    return (Image::ExifTool::Decode(undef,$str,'UCS2','II',$to), $pos);
+    return (Image::ExifTool::Decode(undef,$str,'UTF16','II',$to), $pos);
 }
 
 #------------------------------------------------------------------------------
@@ -1355,7 +1355,7 @@ sub ProcessEXE($$)
                         } else { # misc debug info
                             next unless $n > 12;
                             my $exe = substr($buf2,12);
-                            $exe = $et->Decode($exe, 'UCS2') if Get32u(\$buf2,8);
+                            $exe = $et->Decode($exe, 'UTF16') if Get32u(\$buf2,8);
                             $exe =~ s/\0.*//; # truncate at null
                             $tagTablePtr = GetTagTable('Image::ExifTool::EXE::Misc');
                             $et->HandleTag($tagTablePtr, 12, $exe, DataPt => \$buf2, DataPos => $of);