exiftool_vendored 12.13.0 → 12.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db3a7aa5240badd765f9044226898f1fdd5d89286ae3229cc33e303a07a66650
-  data.tar.gz: ed260754d2395c78de549a723c77f3231859f235d61cdd9d0c9defb5d26a537f
+  metadata.gz: d80826479c3ca8c2e3cfaf71aac23fb1d19de4d2b204fb5cce97d17315744c4c
+  data.tar.gz: b42b14d289558856c2cef660d6ff16592c814fcf3ec8f106e5edb4b62dd26e5d
 SHA512:
-  metadata.gz: d582b2f2893382ee400e160a908c685fd7b8b3e88a8dc06548bb9092b49695ca8ae109e8eae68805d710933705f1cad8ead1e159e2d0b5051d93b95677ba4a2c
-  data.tar.gz: e5225a46e4d1805467cec7bb4e23ff9e2215dffcf6f1964067455de022739b406d21ff7df9faf32ed37ebd257d2a46842519e6f096c5d0f8d86dd39b236c56f2
+  metadata.gz: 928b5a6323959d076b93102f6e7d980b2ef6936a90b77542fbbbb73e9ab767c5767c9a63d1073e8374aec816979d76f5c9e45342a50408426d43c1ee60a03b99
+  data.tar.gz: b86d1b66ca9d01bb8d4261f25cf4daaed9698a407332211559cdb253fd997ea4eaaac9535f874ee55bb1131e7729f145e3aca26d5d0d85512d957bd018c6efc7

data/bin/Changes

@@ -4,16 +4,73 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.00. (Other versions are
+Note: The most recent production release is Version 12.16. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Feb. 3, 2021 - Version 12.17
+
+  - Added a new Canon FocusMode value
+  - Added a new FujiFilm FilmMode value
+  - Added a number of new XMP-crs tags (thanks Herb)
+  - Decode a new H264 MDPM tag
+  - Allow non-conforming lower-case XMP boolean "true" and "false" values to be
+    written, but only when print conversion is disabled
+  - Improved Validate option to warn about non-capitalized boolean XMP values
+  - Improved logic for setting GPSLatitude/LongitudeRef values when writing
+  - Changed -json and -php options so the -a option is implied even without the
+    -g option
+  - Avoid extracting audio/video data from AVI videos when -ee -u is used
+  - Patched decoding of Canon ContinuousShootingSpeed for newer firmware
+    versions of the EOS-1DXmkIII
+  - Re-worked LensID patch of version 12.00 (github issue #51)
+  - Fixed a few typos in newly-added NikonSettings tags (thanks Herb)
+  - Fixed problem where group could not be specified for PNG-pHYs tags when
+    writing
+
+Jan. 21, 2021 - Version 12.16 (production release)
+
+  - Extract another form of video subtitle text
+  - Enhanced -ee option with -ee2 and -ee3 to allow parsing of the H264 video
+    stream in MP4 files
+  - Changed a Nikon FlashMode value
+  - Fixed problem that caused a failed DPX test on Strawberry Perl
+  - API Changes:
+      - Enhanced ExtractEmbedded option
+
+Jan. 18, 2021 - Version 12.15 (production release)
+
+  - Added a couple of new Sony LensType values (thanks LibRaw and Jos Roost)
+  - Added a new Nikon FlashMode value (thanks Mike)
+  - Decode NikonSettings (thanks Warren Hatch)
+  - Decode thermal information from DJI RJPEG images
+  - Fixed extra newline in -echo3 and -echo4 outputs added in version 12.10
+  - Fixed out-of-memory problem when writing some very large PNG files under
+    Windows
+
+Jan. 6, 2021 - Version 12.14
+
+  - Added support for 2 more types of timed GPS in video files (that makes 49
+    different formats now supported)
+  - Added validity check for PDF trailer dictionary Size
+  - Added a new Pentax LensType
+  - Extract metadata from Jpeg2000 Association box
+  - Changed -g:XX:YY and -G:XX:YY options to show empty strings for non-existent
+    groups
+  - Patched to issue warning and avoid writing date/time values with a zero
+    month or day number
+  - Patched to avoid runtime warnings if trying to set FileName to an empty
+    string
+  - Fixed issue that could cause GPS test number 12 to fail on some systems
+  - Fixed problem extracting XML as a block from Jpeg2000 images, and extract
+    XML tags in the XML group instead of XMP
+
 Dec. 24, 2020 - Version 12.13
 
-  - Add time zone automatically to most string-based QuickTime date/time tags
-    when writing unless the PrintConv option is disabled
   - Added -i HIDDEN option to ignore files with names that start with "."
   - Added a few new Nikon ShutterMode values (thanks Jan Skoda)
   - Added ability to write Google GCamera MicroVideo XMP tags
+  - Add time zone automatically to most string-based QuickTime date/time tags
+    when writing unless the PrintConv option is disabled
   - Decode a new Sony tag (thanks LibRaw)
   - Changed behaviour when writing only pseudo tags to return an error and avoid
     writing any other tags if writing FileName fails
@@ -185,7 +242,7 @@ July 27, 2020 - Version 12.02
   - Improved decoding of some Canon EOS 1DXmkIII custom functions
   - Allow integer QuickTime TrackNumber and DiskNumber values
   - Relax validity check of QuickTime:ContentCreateDate when writing with -n
-  - Removed "Com" from the start of some unknown ItemList tag names
+  - Removed "Com" from the start of some unknown QuickTime ItemList tag names
   - Patched CanonCustom decoding for bug in Canon EOS-1DX firmware
   - Changed QuickTime CleanAperture tags decode as signed rationals
 

data/bin/MANIFEST

@@ -115,6 +115,7 @@ html/TagNames/Motorola.html
 html/TagNames/Nikon.html
 html/TagNames/NikonCapture.html
 html/TagNames/NikonCustom.html
+html/TagNames/NikonSettings.html
 html/TagNames/Nintendo.html
 html/TagNames/OOXML.html
 html/TagNames/Ogg.html
@@ -337,6 +338,7 @@ lib/Image/ExifTool/Motorola.pm
 lib/Image/ExifTool/Nikon.pm
 lib/Image/ExifTool/NikonCapture.pm
 lib/Image/ExifTool/NikonCustom.pm
+lib/Image/ExifTool/NikonSettings.pm
 lib/Image/ExifTool/Nintendo.pm
 lib/Image/ExifTool/OOXML.pm
 lib/Image/ExifTool/Ogg.pm
@@ -603,6 +605,7 @@ t/Jpeg2000.t
 t/Jpeg2000_2.out
 t/Jpeg2000_3.out
 t/Jpeg2000_4.out
+t/Jpeg2000_5.out
 t/Kodak.t
 t/Kodak_2.out
 t/Kodak_3.out

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.13"
+   "version" : "12.17"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.13
+version: 12.17

data/bin/README

@@ -106,8 +106,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.13.tar.gz | tar -xf -
-  cd Image-ExifTool-12.13
+  gzip -dc Image-ExifTool-12.17.tar.gz | tar -xf -
+  cd Image-ExifTool-12.17
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -161,7 +161,7 @@ for calculating digest values and providing other features listed below:
 
 COPYRIGHT AND LICENSE
 
-Copyright 2003-2020, Phil Harvey
+Copyright 2003-2021, Phil Harvey
 
 This is free software; you can redistribute it and/or modify it under the
 same terms as Perl itself.

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.13';
+my $version = '12.17';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -371,12 +371,12 @@ if (grep /^-common_args$/i, @ARGV) {
 Command: for (;;) {
 
 if (@echo3) {
-    my $str = join "\n", @echo3, "\n";
+    my $str = join("\n", @echo3) . "\n";
     $str =~ s/\$\{status\}/$rtnVal/ig;
     print STDOUT $str;
 }
 if (@echo4) {
-    my $str = join "\n", @echo4, "\n";
+    my $str = join("\n", @echo4) . "\n";
     $str =~ s/\$\{status\}/$rtnVal/ig;
     print STDERR $str;
 }
@@ -894,8 +894,8 @@ for (;;) {
         $helped = 1;
         next;
     }
-    if (/^(ee|extractembedded)$/i) {
-        $mt->Options(ExtractEmbedded => 1);
+    if (/^(ee|extractembedded)(\d*)$/i) {
+        $mt->Options(ExtractEmbedded => $2 || 1);
         $mt->Options(Duplicates => 1);
         next;
     }
@@ -1264,7 +1264,7 @@ for (;;) {
     if (/^php$/i) {
         $json = 2;
         $html = $xml = 0;
-        $mt->Options(Duplicates=>1);
+        $mt->Options(Duplicates => 1);
         next;
     }
     if (/^z(ip)?$/i) {
@@ -1505,7 +1505,6 @@ if ($xml) {
         require Image::ExifTool::XMP if $json == 1;  # (for EncodeBase64)
     }
     $mt->Options(List => 1) unless $joinLists;
-    $mt->Options(Duplicates => 0) unless defined $showGroup;
     $showTagID = 'D' if $tabFormat and not $showTagID;
 } elsif ($structOpt) {
     $mt->Options(List => 1);
@@ -2304,7 +2303,7 @@ TAG:    foreach $tag (@foundTags) {
                 $group = $et->GetGroup($tag, $showGroup);
                 # look ahead to see if this tag may suppress a priority tag in
                 # the same group, and if so suppress this tag instead
-                next if $noDups and $tag =~ /^(.*?) ?\(/ and defined $$info{$1} and
+                next if $noDups and $tag =~ /^(.*?) \(/ and defined $$info{$1} and
                         $group eq $et->GetGroup($1, $showGroup);
                 $group = 'Unknown' if not $group and ($xml or $json or $csv);
                 if ($fp and not ($allGroup or $csv)) {
@@ -2327,6 +2326,9 @@ TAG:    foreach $tag (@foundTags) {
                     }
                     undef $group;   # undefine so we don't print it below
                 }
+            } elsif ($noDups) {
+                # don't allow duplicates, but avoid suppressing the priority tag
+                next if $tag =~ /^(.*?) \(/ and defined $$info{$1};
             }
 
             ++$lineCount;           # we are printing something meaningful
@@ -2858,6 +2860,10 @@ sub SetImageInfo($$$)
         # determine what our output file name should be
         my $newFileName = $et->GetNewValues('FileName');
         my $newDir = $et->GetNewValues('Directory');
+        if (defined $newFileName and not length $newFileName) {
+            Warn "Warning: New file name is empty - $ infile\n";
+            undef $newFileName;
+        }
         if (defined $testName) {
             my $err;
             $err = "You shouldn't write FileName or Directory with TestFile" if defined $newFileName or defined $newDir;
@@ -4569,7 +4575,7 @@ L<Processing control|/Processing control>
 
   -a          (-duplicates)        Allow duplicate tags to be extracted
   -e          (--composite)        Do not generate composite tags
-  -ee         (-extractEmbedded)   Extract information from embedded files
+  -ee[NUM]    (-extractEmbedded)   Extract information from embedded files
   -ext[+] EXT (-extension)         Process files with specified extension
   -F[OFFSET]  (-fixBase)           Fix the base for maker notes offsets
   -fast[NUM]                       Increase speed when extracting metadata
@@ -4913,7 +4919,7 @@ and the value is written to all possible groups/tags.  For example, the
 string form must be used in the following command since the intent is to set
 the value of all existing date/time tags from C<CreateDate>:
 
-    exiftool "-time:all<$createdate" -wm w FILE
+    exiftool '-time:all<$createdate' -wm w FILE
 
 =item B<-x> I<TAG> (B<-exclude>)
 
@@ -4939,7 +4945,7 @@ between images, but allows the metadata to be altered by editing the
 intermediate file (C<out.args> in this example):
 
     exiftool -args -G1 --filename --directory src.jpg > out.args
-    exiftool -@ out.args -sep ", " dst.jpg
+    exiftool -@ out.args -sep ', ' dst.jpg
 
 Note:  Be careful when copying information with this technique since it is
 easy to write tags which are normally considered "unsafe".  For instance,
@@ -5203,18 +5209,18 @@ JSON arrays unless B<-sep> is used.  By default XMP structures are flattened
 into individual tags in the JSON output, but the original structure may be
 preserved with the B<-struct> option (this also causes all list-type XMP
 tags to be output as JSON arrays, otherwise single-item lists would be
-output as simple strings).  The B<-a> option is implied if the B<-g> or
-B<-G> options are used, otherwise it is ignored and tags with identical
-JSON names are suppressed. (B<-g4> may be used to ensure that all tags have
-unique JSON names.)  Adding the B<-D> or B<-H> option changes tag values to
-JSON objects with "val" and "id" fields, and adding B<-l> adds a "desc"
-field, and a "num" field if the numerical value is different from the
-converted "val".  The B<-b> option may be added to output binary data,
-encoded in base64 if necessary (indicated by ASCII "base64:" as the first 7
-bytes of the value), and B<-t> may be added to include tag table information
-(see B<-t> for details).  The JSON output is UTF-8 regardless of any B<-L>
-or B<-charset> option setting, but the UTF-8 validation is disabled if a
-character set other than UTF-8 is specified.
+output as simple strings).  The B<-a> option is implied when B<-json> is
+used, but entries with identical JSON names are suppressed in the output. 
+(B<-G4> may be used to ensure that all tags have unique JSON names.)  Adding
+the B<-D> or B<-H> option changes tag values to JSON objects with "val" and
+"id" fields, and adding B<-l> adds a "desc" field, and a "num" field if the
+numerical value is different from the converted "val".  The B<-b> option may
+be added to output binary data, encoded in base64 if necessary (indicated by
+ASCII "base64:" as the first 7 bytes of the value), and B<-t> may be added
+to include tag table information (see B<-t> for details).  The JSON output
+is UTF-8 regardless of any B<-L> or B<-charset> option setting, but the
+UTF-8 validation is disabled if a character set other than UTF-8 is
+specified.
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
@@ -5363,7 +5369,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.13 --
+    -- Generated by ExifTool 12.17 --
     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
@@ -5523,18 +5529,18 @@ Notes:
 argument like C<%d%f.txt> is written as C<%%d%%f.txt>.
 
 2) If the argument for B<-w> does not contain a valid format code (eg. %f),
-then it is interpreted as a file extension.  It is not possible to specify a
-simple filename as an argument -- creating a single output file from
-multiple source files is typically done by shell redirection, ie)
+then it is interpreted as a file extension, but there are three different
+ways to create a single output file from multiple source files:
 
+    # 1. Shell redirection
     exiftool FILE1 FILE2 ... > out.txt
 
-But if necessary, an empty format code may be used to force the argument to
-be interpreted as a format string, and the same result may be obtained
-without the use of shell redirection:
-
+    # 2. With the -w option and a zero-width format code
     exiftool -w+! %0fout.txt FILE1 FILE2 ...
 
+    # 3. With the -W option (see the -W option below)
+    exiftool -W+! out.txt FILE1 FILE2 ...
+
 Advanced features:
 
 A substring of the original file name, directory or extension may be taken
@@ -5702,7 +5708,7 @@ when copying.
 
 Extract existing tags only -- don't generate composite tags.
 
-=item B<-ee> (B<-extractEmbedded>)
+=item B<-ee>[I<NUM>] (B<-extractEmbedded>)
 
 Extract information from embedded documents in EPS files, embedded EPS
 information and JPEG and Jpeg2000 images in PDF files, embedded MPF images
@@ -5720,6 +5726,11 @@ document as if it were a separate input file.  This allows, for example,
 generation of GPS track logs from timed metadata in videos.  See
 L<https://exiftool.org/geotag.html#Inverse> for examples.
 
+Setting I<NUM> to 2 causes the H264 video stream in MP4 videos to be parsed
+until the first Supplemental Enhancement Information (SEI) message is
+decoded, or 3 to parse the entire H624 stream and decode all SEI
+information.
+
 =item B<-ext>[+] I<EXT>, B<--ext> I<EXT> (B<-extension>)
 
 Process only files with (B<-ext>) or without (B<--ext>) a specified
@@ -6369,10 +6380,10 @@ name and directory.
 
 =item B<-stay_open> I<FLAG>
 
-If I<FLAG> is C<1> or C<True>, causes exiftool keep reading from the B<-@>
-I<ARGFILE> even after reaching the end of file.  This feature allows calling
-applications to pre-load exiftool, thus avoiding the overhead of loading
-exiftool for each command.  The procedure is as follows:
+If I<FLAG> is C<1> or C<True> (case insensitive), causes exiftool keep
+reading from the B<-@> I<ARGFILE> even after reaching the end of file.  This
+feature allows calling applications to pre-load exiftool, thus avoiding the
+overhead of loading exiftool for each command.  The procedure is as follows:
 
 1) Execute C<exiftool -stay_open True -@ I<ARGFILE>>, where I<ARGFILE> is the
 name of an existing (possibly empty) argument file or C<-> to pipe arguments
@@ -6395,8 +6406,9 @@ signals back to your application.)
 
 4) Repeat steps 2 and 3 for each command.
 
-5) Write C<-stay_open\nFalse\n> to I<ARGFILE> when done.  This will cause
-exiftool to process any remaining command-line arguments then exit normally.
+5) Write C<-stay_open\nFalse\n> (or C<-stay_open\n0\n>) to I<ARGFILE> when
+done.  This will cause exiftool to process any remaining command-line
+arguments then exit normally.
 
 The input I<ARGFILE> may be changed at any time before step 5 above by
 writing the following lines to the currently open I<ARGFILE>:
@@ -6424,10 +6436,11 @@ an interface to the API UserParam option (see the
 L<Image::ExifTool Options|Image::ExifTool/Options> documentation), and
 provides a method to access user-defined parameters in arguments to the
 B<-if> and B<-p> options as if they were any other tag.  Appending a hash
-tag (C<#>) to I<PARAM> also causes the parameter to be extracted as a normal
-tag (in the UserParam group).  Similar to the B<-api> option, the parameter
-value is set to 1 if I<=VAL> is omitted, undef if just I<VAL> is omitted
-with C<=>, or an empty string if I<VAL> is omitted with C<^=>.
+tag (C<#>) to I<PARAM> (eg. C<-userParam MyTag#=yes>) also causes the
+parameter to be extracted as a normal tag in the UserParam group.  Similar
+to the B<-api> option, the parameter value is set to 1 if I<=VAL> is
+omitted, undef if just I<VAL> is omitted with C<=>, or an empty string if
+I<VAL> is omitted with C<^=>.
 
     exiftool -p '$test from $filename' -userparam test=Hello FILE
 
@@ -7137,6 +7150,13 @@ flexibility of ExifTool.)
 
 =back
 
+=head1 INTERRUPTING EXIFTOOL
+
+Interrupting exiftool with a CTRL-C or SIGINT will not result in partially
+written files or temporary files remaining on the hard disk.  The exiftool
+application traps SIGINT and defers it until the end of critical processes
+if necessary, then does a proper cleanup before exiting.
+
 =head1 EXIT STATUS
 
 The exiftool application exits with a status of 0 on success, or 1 if an
@@ -7145,7 +7165,7 @@ the commands if B<-execute> was used).
 
 =head1 AUTHOR
 
-Copyright 2003-2020, Phil Harvey
+Copyright 2003-2021, Phil Harvey
 
 This is free software; you can redistribute it and/or modify it under the
 same terms as Perl itself.

data/bin/lib/File/RandomAccess.pm

@@ -25,7 +25,7 @@
 #
 #               May also be used for string i/o (just pass a scalar reference)
 #
-# Legal:        Copyright (c) 2003-2020 Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2021 Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------

data/bin/lib/File/RandomAccess.pod

@@ -3,7 +3,7 @@
 #
 # Description:  Buffer to support random access reading of sequential file
 #
-# Legal:        Copyright (c) 2003-2020 Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2021 Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------
@@ -236,7 +236,7 @@ the end of file is not allowed.
 
 =head1 AUTHOR
 
-Copyright 2003-2020 Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2021 Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool.pm

@@ -8,7 +8,7 @@
 # Revisions:    Nov. 12/2003 - P. Harvey Created
 #               (See html/history.html for revision history)
 #
-# Legal:        Copyright (c) 2003-2020, Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2021, Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------
@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '12.13';
+$VERSION = '12.17';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -3395,7 +3395,11 @@ sub GetGroup($$;$)
         my @grps;
         # create list of group names (without identical adjacent groups if simplifying)
         foreach (@families) {
-            my $grp = $groups[$_] or next;
+            my $grp = $groups[$_];
+            unless ($grp) {
+                next if $simplify;
+                $grp = '';
+            }
             push @grps, $grp unless $simplify and @grps and $grp eq $grps[-1];
         }
         # remove leading "Main:" if simplifying
@@ -6691,6 +6695,22 @@ sub ProcessJPEG($$)
                 # extract the Stim information (it is in standard TIFF format)
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Stim::Main');
                 $self->ProcessTIFF(\%dirInfo, $tagTablePtr);
+            } elsif ($$self{Make} eq 'DJI') {
+                $dumpType = 'DJI ThermalData';
+                # add this data to the combined data if it exists
+                my $dataPt = $segDataPt;
+                if (defined $combinedSegData) {
+                    $combinedSegData .= $$segDataPt;
+                    $dataPt = \$combinedSegData;
+                }
+                if ($nextMarker == $marker) {
+                    $combinedSegData = $$segDataPt unless defined $combinedSegData;
+                } else {
+                    # process DJI FLIR thermal data
+                    my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::Main');
+                    $self->HandleTag($tagTablePtr, 'APP3', $$dataPt);
+                    undef $combinedSegData;
+                }
             } elsif ($$segDataPt =~ /^\xff\xd8\xff\xdb/) {
                 $dumpType = 'PreviewImage'; # (Samsung, HP, BenQ)
                 $preview = $$segDataPt;
@@ -6725,6 +6745,11 @@ sub ProcessJPEG($$)
                 # set flag if this is the last FPXR segment
                 $dirInfo{LastFPXR} = not ($nextMarker==$marker and $$nextSegDataPt=~/^FPXR\0/),
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
+            } elsif ($$self{Make} eq 'DJI' and $$segDataPt =~ /^\xaa\x55\x12\x06/) {
+                $dumpType = 'DJI ThermalParams';
+                DirStart(\%dirInfo, 0, 0);
+                my $tagTablePtr = GetTagTable('Image::ExifTool::DJI::ThermalParams');
+                $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($preview) {
                 # continued Samsung S1060 preview from APP3
                 $dumpType = 'PreviewImage';
@@ -6747,6 +6772,10 @@ sub ProcessJPEG($$)
             } elsif ($$segDataPt =~ /^ssuniqueid\0/) {
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Samsung::APP5');
                 $self->HandleTag($tagTablePtr, 'ssuniqueid', substr($$segDataPt, 11));
+            } elsif ($$self{Make} eq 'DJI') {
+                $dumpType = 'DJI ThermalCal';
+                my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::Main');
+                $self->HandleTag($tagTablePtr, 'APP5', $$segDataPt);
             } elsif ($preview) {
                 $dumpType = 'PreviewImage';
                 $preview .= $$segDataPt;
@@ -6782,6 +6811,10 @@ sub ProcessJPEG($$)
                 my $tagTablePtr = GetTagTable('Image::ExifTool::GoPro::GPMF');
                 DirStart(\%dirInfo, 6);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
+            } elsif ($$segDataPt =~ /^DTAT\0\0.\{/s) {
+                $dumpType = 'DJI_DTAT';
+                my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::Main');
+                $self->HandleTag($tagTablePtr, 'APP6', $$segDataPt);
             }
         } elsif ($marker == 0xe7) {         # APP7 (Pentax, Huawei, Qualcomm)
             if ($$segDataPt =~ /^PENTAX \0(II|MM)/) {