exiftool_vendored 13.33.0 → 13.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5188f2fb9bb03c179101219cd17d5129411b4f517c3e6acd10c915336d0fa89e
-  data.tar.gz: 953b6ce7f3f1a259cbc4f34e7b72a4851460d762297132f9498306644aede5e5
+  metadata.gz: 48115655191684a1376bb6803a1831f0364e3561b84fef9227979c762d840a9f
+  data.tar.gz: f8297fca14ffbfb66f8c5eca245f8096a940df011ae4a41dbe6ce4120c34b90b
 SHA512:
-  metadata.gz: 6bc2708043ba0de2e7f492c456f0257a342771e7d962a306620ded3ce97a30727087a0d5200ed615ac083b394f8dee318b4e7e68e472739028df1c98d91e17fa
-  data.tar.gz: b2ce97b5597a47050ed22df9baec8a3b760f3da83956fd7c842e0d4eddbcc6b44597b0c40f024bfca54421141f27c954aae6bee6f51dbdb3eba271fa84cfb69f
+  metadata.gz: 3a122b46c9c3a876d70c732db1e2e5c7e039c7d1c7cf4735c41a1ceac1384a4ce4f9f42a04c7156932e105fbc8bfa3cef366f9fd17452ecb6fab41f78247f2f3
+  data.tar.gz: 6b105de18581c29ea2c56882113ada5e8519861f575e37be65282db903a6d49812c6b0b544d1bf3c3e1f35fb34bc9633bfd798b852e79c6020a113767c2db65d

data/bin/Changes

@@ -4,9 +4,56 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 13.30. (Other versions are
+Note: The most recent production release is Version 13.36. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Sept. 9, 2025 - Version 13.36 (production release)
+
+  - Added a new Nikon LensID (thanks Max, github #345)
+  - Added new Sony and Pentax camera ID's (thanks Hubert Figuiere, github #347)
+  - Tolerate 'junk' after 'WAVE' chunk in LA, PAC, OFR and WV audio files
+  - Use gnu tar 1.35 to build the .tar.gz distribution package (versions
+    13.31-13.35 used bsdtar 3.5.3, and earlier versions used bsdtar 2.8.3)
+
+Sept. 6, 2025 - Version 13.35 (production release)
+
+  - Added a new CanonModelID
+  - Added new Olympus PictureMode and LensType values (thanks Michael Meissner)
+  - Decode GPS from another DJI protobuf format (DJI Neo)
+  - Decode a few new FujiFilm tags
+  - Enhanced -ee option to extract M-RAW information from all images in FujiFilm
+    RAF files
+  - Improved handling of standard-format unknown XMP date/time tags when the API
+    XMPAutoConv option is set (which is the default) to put them in the "Time"
+    group and apply the -d date/time formatting
+  - Improved -fileNUM option so it may be used to access tags from alternate
+    files when the specified target FILE doesn't exist
+  - Improved print conversions for some Canon tags to handle "n/a" values
+  - Enhanced JSON long output (-j -l) so the API SaveBin option also returns the
+    Rational ("rat") value if available
+  - Changed -if option so the expression is evaluated even when the source file
+    doesn't exist (to allow more flexibily when using -fileNUM option or when
+    creating the output file when writing)
+  - Fixed decoding of a few new Pentax tags (thanks Karsten Gieselmann)
+  - Fixed -diff feature to report differences in binary-data values and to be
+    consistent with handling of backslashes in Windows path names
+
+Aug. 18, 2025 - Version 13.34
+
+  - Decode a number of new Pentax tags (thanks Karsten Gieselmann)
+  - Decode a new Canon tag (thanks Peter Wem, github #344)
+  - Updated Sony decoding for the ILME-FX2 and DSC-RX1RM3 (thanks Jos Roost)
+  - Minor fixes to decoding of new Olympus tags (thanks Karsten Gieselmann)
+  - Reverted change of 13.20 which changed the behaviour when writing
+    incorrectly-formatted date/time values
+  - Patched to avoid "uninitialized value $module" when using some custom config
+    files
+  - Fixed issue reading maker notes from some Sony ILCE models
+  - API Changes:
+      - Added UndefTags option to allow -m
+        and/or -f to be used without modifying the value of undef tags in -if
+        expressions (which was the behaviour prior to version 12.60)
+
 July 25, 2025 - Version 13.33
 
   - Added read support for TNEF files (eg. "winmail.dat")
@@ -14,13 +61,15 @@ July 25, 2025 - Version 13.33
   - Decode Canon FocusBracketing tag (github #340)
   - Decode more tags for newer Nikon Z models (thanks Warren Hatch)
   - Decode a few more Olympus tags (thanks Karsten Gieselmann)
+  - Decode face detection tags for the Pentax K-3III (thanks Karsten Gieselmann)
   - Decode a few more FujiFilm tags (github #343)
   - Handle Olympus RawDev2IFD tag 0x8000 (named it RawDevSubIFD)
   - Improved recognition of some Sony lenses (github #342)
-  - Enhanced the -p option to cycle through sub-subdocuments
-  - Improved extraction of GoPro timed GPS to use sub-subdocuments to separate
-    the individual fixes, allowing -p to extract all fixes at sub-second
-    resolution (althought for earlier models these don't all contain timestamps)
+  - Enhanced the -p option to cycle through sub-documents
+  - Improved extraction of GoPro timed GPS to use sub-document numbers to
+    separate the individual fixes, allowing -p to extract all fixes at
+    sub-second resolution (although for earlier models these may not contain
+    timestamps)
   - Extract EXIF information from Sigma fp MOV videos
   - Patched to avoid "multi-segment EXIF with external pointers" error when
     writing Olympus OM-1 JPG files converted by some utilities

data/bin/META.json

@@ -50,6 +50,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.33",
+   "version" : "13.36",
    "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.33'
+version: '13.36'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/Makefile.PL

@@ -46,6 +46,7 @@ WriteMakefile(
             },
         } ) : ()),
     clean         => { FILES => 't/*.tmp' },
+    dist          => { TAR => 'gtar' },
     EXE_FILES     => [ 'exiftool' ],
     ($] >= 5.005 ?
         (ABSTRACT_FROM => $ExifTool_pod,

data/bin/README

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

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.33';
+my $version = '13.36';
 
 $^W = 1;    # enable global warnings
 
@@ -57,7 +57,7 @@ sub FormatJSON($$$;$);
 sub PrintCSV(;$);
 sub AddGroups($$$$);
 sub ConvertBinary($);
-sub IsEqual($$);
+sub IsEqual($$;$);
 sub Printable($);
 sub LengthUTF8($);
 sub Infile($;$);
@@ -969,6 +969,7 @@ for (;;) {
     if (/^diff$/i) {
         $diff = shift;
         defined $diff or Error("Expecting file name for -$_ option\n"), $badCmd=1;
+        CleanFilename($diff);   # change to forward slashes if necessary
         next;
     }
     /^delete_original(!?)$/i and $deleteOrig = ($1 ? 2 : 1), next;
@@ -2150,10 +2151,12 @@ sub GetImageInfo($$)
     # set alternate file names
     foreach $g8 (sort keys %altFile) {
         my $altName = $orig;
-        # must double any '$' symbols in the original file name because
-        # they are used for tag names in a -fileNUM argument
-        $altName =~ s/\$/\$\$/g;
-        $altName = FilenameSPrintf($altFile{$g8}, $altName);
+        unless ($altFile{$g8} eq '@') {
+            # must double any '$' symbols in the original file name because
+            # they are used for tag names in a -fileNUM argument
+            $altName =~ s/\$/\$\$/g;
+            $altName = FilenameSPrintf($altFile{$g8}, $altName);
+        }
         $et->SetAlternateFile($g8, $altName);
     }
 
@@ -2178,15 +2181,7 @@ sub GetImageInfo($$)
     }
     # evaluate -if expression for conditional processing
     if (@condition) {
-        unless ($file eq '-' or $et->Exists($file)) {
-            Warn "Error: File not found - $file\n";
-            EFile($file);
-            FileNotFound($file);
-            ++$countBad;
-            return;
-        }
         my $result;
-
         unless ($failCondition) {
             # catch run time errors as well as compile errors
             undef $evalWarning;
@@ -2225,7 +2220,10 @@ sub GetImageInfo($$)
             }
             undef @foundTags if $fastCondition; # ignore if we didn't get all tags
         }
-        unless ($result) {
+        if ($result) {
+            # discard $info for non-existent file
+            undef $info unless $file eq '-' or $et->Exists($file);
+        } else {
             Progress($vout, "-------- $file (failed condition)") if $verbose;
             EFile($file, 2);
             ++$countFailed;
@@ -2922,7 +2920,7 @@ TAG:    foreach $tag (@foundTags) {
                             $val = $et->GetValue($tag, 'ValueConv');
                             $val = '' unless defined $val;
                             # go back to print ValueConv value only if different
-                            next unless IsEqual($val, $lastVal);
+                            next unless IsEqual($val, $lastVal, 1);
                             print $fp "$descClose\n </$tok>";
                             last;
                         }
@@ -2959,7 +2957,7 @@ TAG:    foreach $tag (@foundTags) {
                         $$val{desc} = $desc;
                         if ($printConv) {
                             my $num = $et->GetValue($tag, 'ValueConv');
-                            $$val{num} = $num if defined $num and not IsEqual($num, $$val{val});
+                            $$val{num} = $num if defined $num and not IsEqual($num, $$val{val}, 1);
                         }
                         my $ex = $$et{TAG_EXTRA}{$tag};
                         $$val{'fmt'} = $$ex{G6} if defined $$ex{G6};
@@ -2972,6 +2970,7 @@ TAG:    foreach $tag (@foundTags) {
                                 $$val{'hex'} = join ' ', unpack '(H2)*', $$ex{BinVal};
                             }
                         }
+                        $$val{rat} = $$ex{Rational} if defined $$ex{Rational} and $$et{OPTIONS}{SaveBin};
                     }
                 }
                 FormatJSON($fp, $val, $ind, $quote);
@@ -3945,24 +3944,29 @@ sub ConvertBinary($)
 
 #------------------------------------------------------------------------------
 # Compare ValueConv and PrintConv values of a tag to see if they are equal
-# Inputs: 0) value1, 1) value2
+# Inputs: 0) value1, 1) value2, 2) flag to return true for any scalar references
 # Returns: true if they are equal
-sub IsEqual($$)
+sub IsEqual($$;$)
 {
-    my ($a, $b) = @_;
+    my ($a, $b, $trueScalar) = @_;
     # (scalar values are not print-converted)
-    return 1 if $a eq $b or ref $a eq 'SCALAR';
+    return 1 if $a eq $b;
+    if (ref $a eq 'SCALAR') {
+        return 1 if $trueScalar;
+        return 1 if ref $b eq 'SCALAR' and $$a eq $$b;
+        return 0;
+    }
     if (ref $a eq 'HASH' and ref $b eq 'HASH') {
         return 0 if scalar(keys %$a) != scalar(keys %$b);
         my $key;
         foreach $key (keys %$a) {
-            return 0 unless IsEqual($$a{$key}, $$b{$key});
+            return 0 unless IsEqual($$a{$key}, $$b{$key}, $trueScalar);
         }
     } else {
         return 0 if ref $a ne 'ARRAY' or ref $b ne 'ARRAY' or @$a != @$b;
         my $i;
         for ($i=0; $i<scalar(@$a); ++$i) {
-            return 0 unless IsEqual($$a[$i], $$b[$i]);
+            return 0 unless IsEqual($$a[$i], $$b[$i], $trueScalar);
         }
     }
     return 1;
@@ -4380,7 +4384,7 @@ sub FindFileWindows($$)
     # recode file name as UTF-8 if necessary
     my $enc = $et->Options('CharsetFileName');
     $wildfile = $et->Decode($wildfile, $enc, undef, 'UTF8') if $enc and $enc ne 'UTF8';
-    $wildfile =~ tr/\\/\//; # use forward slashes
+    CleanFilename($wildfile); # use forward slashes
     my ($dir, $wildname) = ($wildfile =~ m{(.*[:/])(.*)}) ? ($1, $2) : ('', $wildfile);
     if (HasWildcards($dir)) {
         Warn "Wildcards don't work in the directory specification\n";
@@ -4460,7 +4464,7 @@ sub AbsPath($)
             local $SIG{'__WARN__'} = sub { };
             $path = eval { Cwd::abs_path($file) };
         }
-        $path =~ tr/\\/\// if $^O eq 'MSWin32' and defined $path;   # use forward slashes
+        CleanFilename($path) if defined $path;  # use forward slashes
     }
     return $path;
 }
@@ -5831,12 +5835,12 @@ escaped.  The inverse conversion is applied when writing tags.
 =item B<-f> (B<-forcePrint>)
 
 Force printing of tags even if they don't exist.  This option applies to
-tags specified on the command line, or with the B<-p>, B<-if> or
-B<-tagsFromFile> options.  When B<-f> is used, the value of any missing tag
-is set to a dash (C<->) by default, but this may be configured via the API
-MissingTagValue option.  B<-f> is also used to add a 'flags' attribute to
-the B<-listx> output, or to allow tags to be deleted when writing with the
-B<-csv>=I<CSVFILE> feature.
+tags specified on the command line, or with the B<-p>, B<-if> (unless the
+API UndefTags option is set), B<-fileNUM> or B<-tagsFromFile> options.  When
+B<-f> is used, the value of any missing tag is set to a dash (C<->) by
+default, but this may be configured via the API MissingTagValue option. 
+B<-f> is also used to add a 'flags' attribute to the B<-listx> output, or to
+allow tags to be deleted when writing with the B<-csv>=I<CSVFILE> feature.
 
 =item B<-g>[I<NUM>][:I<NUM>...] (B<-groupHeadings>)
 
@@ -5901,13 +5905,15 @@ Adding the B<-D> or B<-H> option changes tag values to JSON objects with
 "val" and "id" fields.  Adding B<-l> adds a "desc" field, and a "num" field
 if the numerical value is different from the converted "val", and "fmt" and
 "hex" fields for EXIF metadata if the API SaveFormat and SaveBin options are
-set respectively, and the length of the "hex" output is limited by the API
-LimitLongValues setting.  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.
+set respectively.  The length of the "hex" output is limited by the API
+LimitLongValues setting.  Setting the SaveBin option also causes the
+original values of Rational tags to be returned in string form as an extra
+"rat" field.  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.
 
 Note that ExifTool quotes JSON values only if they don't look like numbers
 (regardless of the original storage format or the relevant metadata
@@ -6001,7 +6007,7 @@ translation, follow these steps (you must have Perl installed for this):
 6. Edit the generated language module lib/Image/ExifTool/Lang/ru.pm, and
 search and replace all 'MISSING' strings in the file with your translations.
 
-7. Email the module ('ru.pm' in this example) to exiftool.team@gmail.com
+7. Email the module ('ru.pm' in this example) to exiftool@gmail.com
 
 8. Thank you!!
 
@@ -6011,7 +6017,7 @@ For list-type tags, this causes only the item with the specified index to be
 extracted.  I<INDEX> is 0 for the first item in the list.  Negative indices
 may also be used to reference items from the end of the list.  Has no effect
 on single-valued tags.  Also applies to tag values when copying from a tag,
-and in B<-if> conditions.
+and in B<-if>, B<-p> and B<-fileNUM> arguments.
 
 =item B<-n> (B<--printConv>)
 
@@ -6076,7 +6082,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.33 --
+    -- Generated by ExifTool 13.36 --
     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
@@ -6624,11 +6630,8 @@ Notes:
 
 1) The B<-n> and B<-b> options also apply to tags used in I<EXPR>.
 
-2) Some binary data blocks are not extracted unless specified explicitly.
-These tags are not available for use in the B<-if> condition unless they are
-also specified on the command line.  The alternative is to use the
-C<$GROUP:all> syntax. (eg. Use C<$exif:all> instead of C<$exif> in I<EXPR>
-to test for the existence of EXIF tags.)
+2) The API RequestTags option is automatically set for all tags used in the
+B<-if> condition.
 
 3) Tags in the string are interpolated in a similar way to B<-p> before the
 expression is evaluated.  In this interpolation, C<$/> is converted to a
@@ -6650,8 +6653,8 @@ C<$Copy1:TAG>, C<$Copy2:TAG>, etc).
 command when B<-execute> was used, and may be used like any other tag in the
 condition (ie. "$OK").
 
-7) The API RequestTags option is automatically set for all tags used in the
-B<-if> condition.
+7) The values of undefined tags in the expression are affected by the B<-f>
+and B<-m> options unless the API UndefTags option is also set.
 
 8) The condition fails if a Perl error occurs.  This could happen for
 instance if an undefined value (eg. a missing tag) is used improperly.
@@ -6666,8 +6669,9 @@ so ExifTool leaves it up to you to make the final decision.  Minor errors
 and warnings are indicated by "[minor]" at the start of the message.
 Warnings which affect processing when ignored are indicated by "[Minor]"
 (with a capital "M").  Note that this causes missing values in
-B<-tagsFromFile>, B<-p> and B<-if> strings to be set to an empty string
-rather than an undefined value.
+B<-tagsFromFile>, B<-p>, B<-if> and B<-fileNUM> strings to be set to an
+empty string rather than an undefined value (but this may be avoided for
+B<-if> using the API UndefTags option).
 
 =item B<-o> I<OUTFILE> or I<FMT> (B<-out>)
 
@@ -7175,6 +7179,10 @@ Subtle note:  If a B<-tagsFromFile> option is used, tags in the I<ALTFILE>
 argument come from the I<SRCFILE> that applies to the first argument
 accessing tags from the corresponding C<FileNUM> group.
 
+I<ALTFILE> may also be C<@> to access tags from the specified I<FILE>, which
+may be useful when the B<-srcfile> option is used to process a different
+source file.
+
 User-defined Composite tags may access tags from alternate files using the
 appropriate (case-sensitive) family 8 group name.
 
@@ -7279,11 +7287,11 @@ Set user parameter.  I<PARAM> is an arbitrary user parameter name.  This is
 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> (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
+B<-if>, B<-p> and B<-fileNUM> options as if they were any other tag. 
+Appending a hash 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
@@ -7293,18 +7301,20 @@ I<VAL> is omitted with C<^=>.
 =head3 Advanced formatting feature
 
 An advanced formatting feature allows modification of the value of any tag
-interpolated within a B<-if> or B<-p> option argument, or a B<-tagsFromFile>
-redirection string.  Tag names within these strings are prefixed by a C<$>
-symbol, and an arbitrary Perl expression may be applied to the tag value by
-placing braces around the tag name and inserting the expression after the
-name, separated by a semicolon (ie. C<${TAG;EXPR}>).  The expression acts on
-the value of the tag through the default input variable (C<$_>), and has
-access to the full ExifTool API through the current ExifTool object
-(C<$self>) and the tag key (C<$tag>).  It may contain any valid Perl code,
-including translation (C<tr///>) and substitution (C<s///>) operations, but
-note that braces within the expression must be balanced.  The example below
-prints the camera Make with spaces translated to underlines, and multiple
-consecutive underlines replaced by a single underline:
+interpolated within a B<-if>, B<-p> or B<-fileNUM> argument, or a
+B<-tagsFromFile> redirection string.  Tag names within these strings are
+prefixed by a C<$> symbol, and an arbitrary Perl expression may be applied
+to the tag value by placing braces around the tag name and inserting the
+expression after the name, separated by a semicolon (ie. C<${TAG;EXPR}>). 
+The expression acts on the value of the tag through the default input
+variable (C<$_>), and has access to the full ExifTool API through the
+current ExifTool object (C<$self>) and the tag key (C<$tag>).  It may
+contain any valid Perl code, including translation (C<tr///>) and
+substitution (C<s///>) operations, but note that braces within the
+expression must be balanced.  If the expression does not modify C<$_> the
+original tag value is returned.  The example below prints the camera Make
+with spaces translated to underlines, and multiple consecutive underlines
+replaced by a single underline:
 
     exiftool -p '${make;tr/ /_/;s/__+/_/g}' image.jpg
 

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.94';
+$VERSION = '4.96';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -1006,6 +1006,7 @@ $VERSION = '4.94';
     0x80000491 => 'PowerShot V10', #25
     0x80000495 => 'EOS R1', #PH
     0x80000496 => 'R5 Mark II', #forum16406
+    0x80000497 => 'PowerShot V1', #PH
     0x80000498 => 'EOS R100', #25
     0x80000516 => 'EOS R50 V', #42
     0x80000520 => 'EOS D2000C', #IB
@@ -2151,6 +2152,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             TagTable => 'Image::ExifTool::Canon::RawBurstInfo',
         }
     },
+  # 0x4049 - related to croping (forum13491) - "8 0 0 0" = no crop, "8 1 0 1" = crop enabled
     0x4059 => { #forum16111
         Name => 'LevelInfo',
         SubDirectory => {
@@ -9171,15 +9173,37 @@ my %filterConv = (
         Name => 'AFConfigTool',
         ValueConv => '$val + 1',
         ValueConvInv => '$val - 1',
-        PrintConv => '"Case $val"',
-        PrintConvInv => '$val=~/(\d+)/ ? $1 : undef',
+        PrintHex => 1,
+        PrintConv => {
+            0x80000000 => 'n/a',
+            OTHER => sub { 'Case ' . shift },
+        },
+        PrintConvInv => '$val=~/(\d+)/ ? $1 : 0x80000000',
+    },
+    2 => {
+        Name => 'AFTrackingSensitivity',
+        PrintHex => 1,
+        PrintConv => {
+            0x7fffffff => 'n/a',
+            OTHER => sub { shift },
+        },
     },
-    2 => 'AFTrackingSensitivity',
     3 => {
         Name => 'AFAccelDecelTracking',
         Description => 'AF Accel/Decel Tracking',
+        PrintHex => 1,
+        PrintConv => {
+            0x7fffffff => 'n/a',
+            OTHER => sub { shift },
+        },
+    },
+    4 => {
+        Name => 'AFPointSwitching',
+        PrintConv => {
+            0x7fffffff => 'n/a',
+            OTHER => sub { shift },
+        },
     },
-    4 => 'AFPointSwitching',
     5 => { #52
         Name => 'AIServoFirstImage',
         PrintConv => {
@@ -9331,6 +9355,14 @@ my %filterConv = (
             3 => 'Vehicles',
         },
     },
+    21 => { #github344 (R6)
+        Name => 'SubjectSwitching',
+        PrintConv => {
+            0 => 'Initial Priority',
+            1 => 'On Subject',
+            2 => 'Switch Subject',
+        },
+    },
     24 => { #forum16068
         Name => 'EyeDetection',
         PrintConv => \%offOn,

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.14';
+$VERSION = '1.15';
 
 sub ProcessDJIInfo($$$);
 sub ProcessSettings($$$);
@@ -30,6 +30,8 @@ sub ProcessSettings($$$);
     'dvtm_wm265e.proto' => 1,   # Mavic 3
     'dvtm_pm320.proto' => 1,    # Matrice 30
     'dvtm_Mini4_Pro.proto' => 1,    # Matrice 30
+    'dvtm_Mini4_Pro.proto' => 1,    # Matrice 30
+    'dvtm_dji_neo.proto' => 1,  # Neo
 );
 
 my %convFloat2 = (
@@ -234,13 +236,14 @@ my %convFloat2 = (
         ExifTool currently extracts timed GPS plus a few other tags from DJI devices
         which use the following protocols:  dvtm_AVATA2.proto (Avata 2),
         dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5),
-        dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30) and
-        dvtm_pm320.proto (Mini 4 Pro).
+        dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30),
+        dvtm_Mini4_Pro.proto (Mini 4 Pro) and dvtm_dji_neo.proto (DJI Neo).
 
         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.
     },
     Protocol => {
+        Notes => "typically protobuf field 1-1-1, but ExifTool doesn't rely on this",
         RawConv => q{
             unless ($Image::ExifTool::DJI::knownProtocol{$val}) {
                 $self->Warn("Unknown protocol $val (please submit sample for testing)");
@@ -475,6 +478,53 @@ my %convFloat2 = (
         Name => 'GimbalInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
     },
+#
+# DJI Neo (very similar to AVATA2)
+#
+   # dvtm_dji_neo_1-1-2 - some version number
+   # dvtm_dji_neo_1-1-3 - some version number
+    'dvtm_dji_neo_1-1-5' => { Name => 'SerialNumber', Notes => 'DJI Neo' }, # (NC)
+    'dvtm_dji_neo_1-1-10' => 'Model',
+   # dvtm_dji_neo_2-2-1-4 - model code?
+   # dvtm_dji_neo_2-2-2-1 - some firmware version?
+   # dvtm_dji_neo_2-2-2-2 - some version number?
+    'dvtm_dji_neo_2-2-3-1' => 'SerialNumber2', # (NC)
+    'dvtm_dji_neo_2-3' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+   # dvtm_dji_neo_3-1-1 - frame number (starting at 1)
+    'dvtm_dji_neo_3-1-2' => { # (also 3-2-1-6 and 3-4-1-6)
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        # milliseconds, but I don't know what the zero is
+        ValueConv => '$val / 1e6',
+    },
+   # dvtm_dji_neo_3-2-1-4 - model code?
+   # dvtm_dji_neo_3-2-1-5 - frame rate?
+    'dvtm_dji_neo_3-2-2-1' => { Name => 'ISO', Format => 'float' }, # (NC)
+    'dvtm_dji_neo_3-2-4-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_dji_neo_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' }, # (NC)
+    'dvtm_dji_neo_3-2-10-1' => { # (NC)
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+   # dvtm_dji_neo_3-4-1-4 - model code?
+    'dvtm_dji_neo_3-4-3' => { # (NC)
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_dji_neo_3-4-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_dji_neo_3-4-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' }, # (NC)
 );
 
 %Image::ExifTool::DJI::DroneInfo = (
@@ -502,6 +552,7 @@ my %convFloat2 = (
     1 => { Name => 'FrameWidth',  Format => 'unsigned' },
     2 => { Name => 'FrameHeight', Format => 'unsigned' },
     3 => { Name => 'FrameRate',   Format => 'float' },
+  # 4-8: seen these values respectively for DJI Neo: 1,8,4,1,4
 );
 
 %Image::ExifTool::DJI::GPSInfo = (

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.59';
+$VERSION = '4.60';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -6362,9 +6362,10 @@ sub ProcessExif($$$)
                     $et->Warn("Bad format ($format) for $dir entry $index", $inMakerNotes);
                     ++$warnCount;
                 }
-                # assume corrupted IFD if this is our first entry (except Sony ILCE-7M2 firmware 1.21)
-                return 0 unless $index or $$et{Model} eq 'ILCE-7M2';
-                next;
+                # assume corrupted IFD if this is our first entry (except Sony ILCE which have an empty first entry)
+                next if $index or $$et{Model} =~ /^ILCE/;
+                # $et->Warn(sprintf('Format code 0x%x encountered -- Possibly corrupted IFD'));
+                return 0;
             }
         }
         my $formatStr = $formatName[$format];   # get name of this format