exiftool_vendored 12.57.0 → 12.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c02a2a1efe1fc3f63f7527ed968432fc73d7e1ebeda7cfbf424413b8907bd0c
-  data.tar.gz: 5140c2587870d324d63d4d35beb70d1cbbecb92a78fb6ea55d9885cf9f320c1b
+  metadata.gz: daebca4fbc1adcea00bcf7dc637e328f4534a115f69a17f10bca60f8a21dee01
+  data.tar.gz: 512c1da726768d49d97b8262303f8c524b4ea23ccc8c25f1350f93a121813be4
 SHA512:
-  metadata.gz: edd012dc39bc24a6b257f147e5d698648c686aa54e1ac04229cd3cd4880a91d96e21f6f017305a6d763826470ef1f990e94221320bd1d7ee0a73fb5cb2b32ab4
-  data.tar.gz: 78856db2a60493444afe450c663d190553147b651140c2f18a2a2641e8c9bc0d5af7f31bd0db4a5f55c89f72b460119192889f4f10190cad3a21bffae976e630
+  metadata.gz: 6d29ac70643b583a0d01c512e2054700e15cdf60091042ed4de7c3de85feca75fcd94b2201691a0360875c02b293cc00632c6dce29888e735a488dac50712c70
+  data.tar.gz: cee8f9dcbe026dc2e5bb1de5db902904c460c6e71cf4ab9ac64b9f2a8357c3857be328912f1deedf3f51c00f99b50f07b463884e60f235f858ef33bf5cd417f7

data/bin/Changes

@@ -7,6 +7,20 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.50. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Mar. 15, 2023 - Version 12.58
+
+  - Added Extra ImageDataMD5 tag to calculate MD5 of image data only
+  - Added support for reading DJI APP4 and APP7 JPEG segments
+  - Added a new SonyModelID value
+  - Decode a few new Nikon tags (thanks Warren Hatch)
+  - Downgraded "Windows file times" to a minor warning when Win32::API or
+    Win32API::File is not installed while reading metadata
+  - Patched possible runtime warning when API IgnoreTags option is used to
+    ignore FileType
+  - Fixed problem extracting NetName from Windows LNK files
+  - Fixed issue where the %C filename format code would increment the count on
+    an output filename collision, but it is supposed to count the input files
+
 Feb. 23, 2023 - Version 12.57
 
   - Added two new Nikon Z lenses (thanks LibRaw)

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.57"
+   "version" : "12.58"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.57
+version: 12.58

data/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.57.tar.gz | tar -xf -
-  cd Image-ExifTool-12.57
+  gzip -dc Image-ExifTool-12.58.tar.gz | tar -xf -
+  cd Image-ExifTool-12.58
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/config_files/rotate_regions.config

@@ -17,7 +17,7 @@
 #   RotateMPRegionCW90
 #   RotateMPRegionCW180
 #   RotateMPRegionCW270
-#     These tags will rotate a MWG Region clockwise 90, 180, or 270 degrees.
+#     These tags will rotate an MP Region clockwise 90, 180, or 270 degrees.
 #     Example:
 #       exiftool -config rotate_regions.config "-RegionInfoMP<RotateMPRegionCW90" FILE
 #

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.57';
+my $version = '12.58';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -255,17 +255,15 @@ my %optArgs = (
     '-csvdelim' => 1,
     '-d' => 1, '-dateformat' => 1,
     '-D' => 0, # necessary to avoid matching lower-case equivalent
-    '-echo' => 1, '-echo1' => 1, '-echo2' => 1, '-echo3' => 1, '-echo4' => 1,
-    '-efile' => 1, '-efile1' => 1, '-efile2' => 1, '-efile3' => 1, '-efile4' => 1,
-    '-efile!' => 1, '-efile1!' => 1, '-efile2!' => 1, '-efile3!' => 1, '-efile4!' => 1,
+    '-echo' => 1, '-echo#' => 1,
+    '-efile' => 1, '-efile#' => 1, '-efile!' => 1, '-efile#!' => 1,
     '-ext' => 1, '--ext' => 1, '-ext+' => 1, '--ext+' => 1,
         '-extension' => 1, '--extension' => 1, '-extension+' => 1, '--extension+' => 1,
-    '-fileorder' => 1, '-fileorder0' => 1, '-fileorder1' => 1, '-fileorder2' => 1,
-        '-fileorder3' => 1, '-fileorder4' => 1, '-fileorder5' => 1,
+    '-fileorder' => 1, '-fileorder#' => 1,
     '-geotag' => 1,
     '-globaltimeshift' => 1,
     '-i' => 1, '-ignore' => 1,
-    '-if' => 1, '-if0' => 1, '-if1' => 1, '-if2' => 1, '-if3' => 1, '-if4' => 1, '-if5' => 1,
+    '-if' => 1, '-if#' => 1,
     '-lang' => 0, # (optional arg; cannot begin with "-")
     '-listitem' => 1,
     '-o' => 1, '-out' => 1,
@@ -4192,7 +4190,6 @@ sub NextUnusedFilename($;$)
         }
         ++$copy;
         ++$alpha;
-        ++$seq;
     }
 }
 
@@ -4398,9 +4395,13 @@ sub ReadStayOpen($)
                     undef $optArgs;
                     next unless $lastOpt eq '-stay_open' or $lastOpt eq '-@';
                 } else {
-                    $optArgs = $optArgs{$arg};
                     $lastOpt = lc $arg;
-                    $optArgs = $optArgs{$lastOpt} unless defined $optArgs;
+                    $optArgs = $optArgs{$arg};
+                    unless (defined $optArgs) {
+                        $optArgs = $optArgs{$lastOpt};
+                        # handle options with trailing numbers
+                        $optArgs = $optArgs{"$1#$2"} if not defined $optArgs and $lastOpt =~ /^(.*?)\d+(!?)$/;
+                    }
                     next unless $lastOpt =~ /^-execute\d*$/;
                 }
                 $processArgs = 1;
@@ -4765,8 +4766,9 @@ L<Image::ExifTool::TagNames|Image::ExifTool::TagNames> for documentation on
 available tag names.  A tag name may include leading group names separated
 by colons (eg. C<-EXIF:CreateDate>, or C<-Doc1:XMP:Creator>), and each group
 name may be prefixed by a digit to specify family number (eg.
-C<-1IPTC:City>).  Use the B<-listg> option to list available group names by
-family.
+C<-1IPTC:City>).  (Note that the API SavePath and SaveFormat options must be
+used for the family 5 and 6 groups respectively to be available.)  Use the
+B<-listg> option to list available group names by family.
 
 A special tag name of C<All> may be used to indicate all meta information
 (ie. B<-All>).  This is particularly useful when a group name is specified
@@ -4774,10 +4776,11 @@ to extract all information in a group (but beware that unless the B<-a>
 option is also used, some tags in the group may be suppressed by same-named
 tags in other groups).  The wildcard characters C<?> and C<*> may be used in
 a tag name to match any single character and zero or more characters
-respectively. These may not be used in a group name, with the exception that
-a group name of C<*> (or C<All>) may be used to extract all instances of a
-tag (as if B<-a> was used).  Note that arguments containing wildcards must
-be quoted on the command line of most systems to prevent shell globbing.
+respectively.  These may not be used in a group name, with the exception
+that a group name of C<*> (or C<All>) may be used to extract all instances
+of a tag (as if B<-a> was used).  Note that arguments containing wildcards
+must be quoted on the command line of most systems to prevent shell
+globbing.
 
 A C<#> may be appended to the tag name to disable the print conversion on a
 per-tag basis (see the B<-n> option).  This may also be used when writing or
@@ -4856,8 +4859,8 @@ are removed if the containing group is deleted:
   - Deleting EXIF only removes ExifIFD which also deletes
     InteropIFD and MakerNotes.
 
-  MOV/MP4 video:
-  - Deleting ItemList also deletes Keys tags
+  MOV/MP4 Video:
+  - Deleting ItemList also deletes Keys tags.
 
 Notes:
 
@@ -5491,8 +5494,9 @@ which case the string is loaded from the contents of the file.  Tag names in
 the format file or string begin with a C<$> symbol and may contain leading
 group names and/or a trailing C<#> (to disable print conversion).  Case is
 not significant.  Braces C<{}> may be used around the tag name to separate
-it from subsequent text.  Use C<$$> to represent a C<$> symbol, and C<$/>
-for a newline.
+it from subsequent text (and must be used if subsequent text begins with an
+alphanumeric character, hyphen, underline, colon or number sign).  Use C<$$>
+to represent a C<$> symbol, and C<$/> for a newline.
 
 Multiple B<-p> options may be used, each contributing a line (or more) of
 text to the output.  Lines beginning with C<#[HEAD]> and C<#[TAIL]> are
@@ -5519,7 +5523,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.57 --
+    -- Generated by ExifTool 12.58 --
     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/AIFF.pm

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::ID3;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -203,7 +203,7 @@ sub ProcessAIFF($$)
         return 1 if $fast3;
         $tagTablePtr = GetTagTable('Image::ExifTool::DjVu::Main');
         # modify FileType to indicate a multi-page document
-        $$et{VALUE}{FileType} .= " (multi-page)" if $buf2 eq 'DJVM';
+        $$et{VALUE}{FileType} .= " (multi-page)" if $buf2 eq 'DJVM' and $$et{VALUE}{FileType};
         $type = 'DjVu';
     } else {
         return 0 unless $buff =~ /^FORM....(AIF(F|C))/s;

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # APE metadata blocks
 %Image::ExifTool::APE::Main = (
@@ -133,7 +133,7 @@ sub ProcessAPE($$)
 
     # check APE signature and process audio information
     # unless this is some other type of file
-    unless ($$et{VALUE}{FileType}) {
+    unless ($$et{FileType}) {
         $raf->Read($buff, 32) == 32 or return 0;
         $buff =~ /^(MAC |APETAGEX)/ or return 0;
         $et->SetFileType();

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.51';
+$VERSION = '3.52';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -184,7 +184,8 @@ gives the order of values for a serial data stream.
 A B<Tag Name> is the handle by which the information is accessed in
 ExifTool.  In some instances, more than one name may correspond to a single
 tag ID.  In these cases, the actual name used depends on the context in
-which the information is found.  Case is not significant for tag names.  A
+which the information is found.  Valid characters in a tag name are A-Z,
+a-z, 0-9, hyphen (-) and underline (_).  Case is not significant.  A
 question mark (C<?>) after a tag name indicates that the information is
 either not understood, not verified, or not very useful -- these tags are
 not extracted by ExifTool unless the L<Unknown|../ExifTool.html#Unknown> (-u) option is enabled.  Be
@@ -1206,6 +1207,7 @@ TagID:  foreach $tagID (@keys) {
                             $sepTable{$s} = $printConv;
                             # add PrintHex flag to PrintConv so we can check it later
                             $$printConv{PrintHex} = 1 if $$tagInfo{PrintHex};
+                            $$printConv{PrintInt} = 1 if $$tagInfo{PrintInt};
                             $$printConv{PrintString} = 1 if $$tagInfo{PrintString};
                         } else {
                             $caseInsensitive = 0;
@@ -1221,22 +1223,18 @@ TagID:  foreach $tagID (@keys) {
                                 next if $_ eq '' and $$printConv{$_} eq '';
                                 $_ eq 'BITMASK' and $bits = $$printConv{$_}, next;
                                 $_ eq 'OTHER' and next;
-                                my $index;
-                                if (($$tagInfo{PrintHex} or $$printConv{BITMASK}) and /^-?\d+$/) {
+                                my $index = $_;
+                                $index =~ s/\.\d+$// if $$tagInfo{PrintInt};
+                                if (($$tagInfo{PrintHex} or $$printConv{BITMASK}) and $index =~ /^-?\d+$/) {
                                     my $dig = $$tagInfo{PrintHex} || 1;
-                                    if ($_ >= 0) {
-                                        $index = sprintf('0x%.*x', $dig, $_);
+                                    if ($index >= 0) {
+                                        $index = sprintf('0x%.*x', $dig, $index);
                                     } elsif ($format and $format =~ /int(16|32)/) {
                                         # mask off unused bits of signed integer hex value
                                         my $mask = { 16 => 0xffff, 32 => 0xffffffff }->{$1};
-                                        $index = sprintf('0x%.*x', $dig, $_ & $mask);
-                                    } else {
-                                        $index = $_;
+                                        $index = sprintf('0x%.*x', $dig, $index & $mask);
                                     }
-                                } elsif (/^[+-]?(?=\d|\.\d)\d*(\.\d*)?$/ and not $$tagInfo{PrintString}) {
-                                    $index = $_;
-                                } else {
-                                    $index = $_;
+                                } elsif ($$tagInfo{PrintString} or not /^[+-]?(?=\d|\.\d)\d*(\.\d*)?$/) {
                                     # translate unprintable values
                                     if ($index =~ s/([\x00-\x1f\x80-\xff])/sprintf("\\x%.2x",ord $1)/eg) {
                                         $index = qq{"$index"};
@@ -2210,7 +2208,7 @@ sub WriteTagNames($$)
                 my $wid = 0;
                 my @keys;
                 foreach (sort { NumbersFirst($a,$b) } keys %$printConv) {
-                    next if /^(Notes|PrintHex|PrintString|OTHER)$/;
+                    next if /^(Notes|PrintHex|PrintInt|PrintString|OTHER)$/;
                     $align = '' if $align and /[^\d]/;
                     my $w = length($_) + length($$printConv{$_});
                     $wid = $w if $wid < $w;
@@ -2238,6 +2236,7 @@ sub WriteTagNames($$)
                         if (defined $key) {
                             $index = $key;
                             $prt = '= ' . EscapeHTML($$printConv{$key});
+                            $index =~ s/\.\d+$// if $$printConv{PrintInt};
                             if ($$printConv{PrintHex}) {
                                 $index =~ s/(\.\d+)$//; # remove decimal
                                 $index = sprintf('0x%x',$index);

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

@@ -88,18 +88,13 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.65';
+$VERSION = '4.66';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
 # --> have relaxed this for new lenses because Canon has been
 #     consistent about keeping "USM" in the model name
 %canonLensTypes = ( #4
-     Notes => q{
-        Decimal values have been added to differentiate lenses which would otherwise
-        have the same LensType, and are used by the Composite LensID tag when
-        attempting to identify the specific lens model.
-     },
     -1 => 'n/a',
      1 => 'Canon EF 50mm f/1.8',
      2 => 'Canon EF 28mm f/2.8 or Sigma Lens',
@@ -2402,6 +2397,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         DataMember => 'LensType',
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     23 => {
         Name => 'MaxFocalLength',
@@ -3060,6 +3056,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x0e => {
         Name => 'MinFocalLength',
@@ -3175,6 +3172,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x11 => { %ciMinFocal }, #9
     0x13 => { %ciMaxFocal }, #9
@@ -3252,6 +3250,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x11 => { %ciMinFocal },
     0x13 => { %ciMaxFocal },
@@ -3347,6 +3346,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x113 => { %ciMinFocal },
     0x115 => { %ciMaxFocal },
@@ -3502,6 +3502,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x151 => { %ciMinFocal },
     0x153 => { %ciMaxFocal,
@@ -3610,6 +3611,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x1a9 => { %ciMinFocal },
     0x1ab => { %ciMaxFocal,
@@ -3661,6 +3663,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x17 => { %ciCameraTemperature }, #PH
     0x1b => { %ciMacroMagnification }, #PH
@@ -3721,6 +3724,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xa4 => { #PH
         Name => 'FirmwareRevision',
@@ -3936,6 +3940,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xe8 => { %ciMinFocal },
     0xea => { %ciMaxFocal,
@@ -4060,6 +4065,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x155 => { %ciMinFocal },
     0x157 => { %ciMaxFocal,
@@ -4169,6 +4175,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x163 => { %ciMinFocal }, # (5DmkIII + 0x0e)
     0x165 => { %ciMaxFocal }, # (5DmkIII + 0x0e)
@@ -4316,6 +4323,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x114 => { %ciMinFocal },
     0x116 => { %ciMaxFocal },
@@ -4405,6 +4413,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xd8 => { %ciMinFocal }, #15
     0xda => { %ciMaxFocal }, #15
@@ -4540,6 +4549,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xec => { %ciMinFocal },
     0xee => { %ciMaxFocal,
@@ -4629,6 +4639,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xea => { %ciMinFocal },
     0xec => { %ciMaxFocal },
@@ -4710,6 +4721,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x168 => { %ciMinFocal },
     0x16a => { %ciMaxFocal },
@@ -4777,6 +4789,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x18b => { %ciMinFocal },
     0x18d => { %ciMaxFocal },
@@ -4860,6 +4873,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x107 => { #PH
         Name => 'FirmwareVersion',
@@ -4975,6 +4989,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xf8 => { %ciMinFocal },
     0xfa => { %ciMaxFocal },
@@ -5070,6 +5085,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x101 => { %ciMinFocal }, # (500D + 9)
     0x103 => { %ciMaxFocal }, # (500D + 9)
@@ -5165,6 +5181,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xec => { %ciMinFocal }, # (60D + 2)
     0xee => { %ciMaxFocal }, # (60D + 2)
@@ -5247,6 +5264,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x129 => { %ciMinFocal },
     0x12b => { %ciMaxFocal },
@@ -5359,6 +5377,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x186 => { %ciMinFocal },
     0x188 => { %ciMaxFocal },
@@ -5433,6 +5452,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xe4 => { %ciMinFocal }, #PH
     0xe6 => { %ciMaxFocal }, #PH

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.06';
+$VERSION = '1.07';
 
 sub ProcessDJIInfo($$$);
 
@@ -96,6 +96,31 @@ my %convFloat2 = (
     # (nothing yet decoded from device header)
 );
 
+# thermal parameters in APP4 of DJI M3T, H20N, M2EA and some M30T images (ref PH/forum11401)
+%Image::ExifTool::DJI::ThermalParams2 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'APP4', 2 => 'Image' },
+    NOTES => 'Thermal parameters extracted from APP4 of DJI M3T RJPEG files.',
+    0x00 => { Name => 'AmbientTemperature',  Format => 'float', PrintConv => 'sprintf("%.1f C",$val)' }, # (NC)
+    0x04 => { Name => 'ObjectDistance',      Format => 'float', PrintConv => 'sprintf("%.1f m",$val)' },
+    0x08 => { Name => 'Emissivity',          Format => 'float', PrintConv => 'sprintf("%.2f",$val)' },
+    0x0c => { Name => 'RelativeHumidity',    Format => 'float', PrintConv => 'sprintf("%g %",$val*100)' },
+    0x10 => { Name => 'ReflectedTemperature',Format => 'float', PrintConv => 'sprintf("%.1f C",$val)' },
+    0x65 => { Name => 'IDString',            Format => 'string[16]' }, # (NC)
+);
+
+# thermal parameters in APP4 of some DJI M30T images (ref PH)
+%Image::ExifTool::DJI::ThermalParams3 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'APP4', 2 => 'Image' },
+    NOTES => 'Thermal parameters extracted from APP4 of some DJI RJPEG files.',
+  # 0x00 - 0xaa553800 - params3 magic number 
+    0x04 => { Name => 'RelativeHumidity',    Format => 'int16u' },
+    0x06 => { Name => 'ObjectDistance',      Format => 'int16u', ValueConv => '$val / 10' },
+    0x08 => { Name => 'Emissivity',          Format => 'int16u', ValueConv => '$val / 100' },
+    0x0a => { Name => 'ReflectedTemperature',Format => 'int16u', ValueConv => '$val / 10' },
+);
+
 %Image::ExifTool::DJI::XMP = (
     %Image::ExifTool::XMP::xmpTableDefaults,
     GROUPS => { 0 => 'XMP', 1 => 'XMP-drone-dji', 2 => 'Location' },
@@ -161,7 +186,7 @@ my %convFloat2 = (
 );
 
 #------------------------------------------------------------------------------
-# Process DJI infor (ref PH)
+# Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessDJIInfo($$$)
@@ -174,6 +199,7 @@ sub ProcessDJIInfo($$$)
         my $buff = substr($$dataPt, $dirStart, $dirLen);
         $dataPt = \$buff;
     }
+    $et->VerboseDir('DJIInfo', undef, length $$dataPt);
     while ($$dataPt =~ /\G\[(.*?)\](?=(\[|$))/sg) {
         my ($tag, $val) = split /:/, $1, 2;
         next unless defined $tag and defined $val;