exiftool_vendored 13.34.0 → 13.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee6400c2f7784efecc62e0876ee90696b3f523abbf6438ee5d3c60e56574ca11
-  data.tar.gz: 33c0b5f6228fc949cead6b4d357117227b7f5fe74a98cef2377cbfca6c8e9753
+  metadata.gz: 48115655191684a1376bb6803a1831f0364e3561b84fef9227979c762d840a9f
+  data.tar.gz: f8297fca14ffbfb66f8c5eca245f8096a940df011ae4a41dbe6ce4120c34b90b
 SHA512:
-  metadata.gz: 50d16f2dfe3be3a2c117f72f244da5b762fb7f876fec921e32f7347f002f50de235da85949121cde69175b9b0a6aa11094e80d7e3a720207c422c750f748a0f1
-  data.tar.gz: 5cc1844f04cf8a423af7e7e79403b9e817389cf7b357a482a64fa8c693d9b230018c090dcd722a9b9161e2df35184a421c5db984a2805033fc3e0b3e082b964b
+  metadata.gz: 3a122b46c9c3a876d70c732db1e2e5c7e039c7d1c7cf4735c41a1ceac1384a4ce4f9f42a04c7156932e105fbc8bfa3cef366f9fd17452ecb6fab41f78247f2f3
+  data.tar.gz: 6b105de18581c29ea2c56882113ada5e8519861f575e37be65282db903a6d49812c6b0b544d1bf3c3e1f35fb34bc9633bfd798b852e79c6020a113767c2db65d

data/bin/Changes

@@ -4,9 +4,40 @@ 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)

data/bin/META.json

@@ -50,6 +50,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.34",
+   "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.34'
+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.34.tar.gz | tar -xf -
-  cd Image-ExifTool-13.34
+  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.34';
+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;
 }
@@ -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
@@ -6076,7 +6082,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.34 --
+    -- 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
@@ -7173,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.
 

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.95';
+$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.95';
     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
@@ -9172,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 => {

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/FujiFilm.pm

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.98';
+$VERSION = '1.99';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -426,6 +426,16 @@ my %faceCategories = (
             0x300 => 'DR (Dynamic Range priority)',
         },
     },
+    0x1037 => { #forum17591
+        Name => 'MultipleExposure',
+        Writable => 'int16u', # (NC)
+        PrintConv => {
+            1 => 'Additive',
+            2 => 'Average',
+            3 => 'Light',
+            4 => 'Dark',
+        },
+    },
     0x1040 => { #8
         Name => 'ShadowTone',
         Writable => 'int32s',
@@ -586,16 +596,44 @@ my %faceCategories = (
         Name => 'SequenceNumber',
         Writable => 'int16u',
     },
+    0x1102 => { #forum17602
+        Name => 'WhiteBalanceBracketing',
+        Writable => 'int16u', # (NC)
+        PrintHex => 1,
+        PrintConv => {
+            0x01ff => '+/- 1',
+            0x02ff => '+/- 2',
+            0x03ff => '+/- 3',
+        },
+    },
     0x1103 => {
         Name => 'DriveSettings',
         SubDirectory => { TagTable => 'Image::ExifTool::FujiFilm::DriveSettings' },
     },
     0x1105 => { Name => 'PixelShiftShots',  Writable => 'int16u' }, #IB
     0x1106 => { Name => 'PixelShiftOffset', Writable => 'rational64s', Count => 2 }, #IB
-    # (0x1150-0x1152 exist only for Pro Low-light and Pro Focus PictureModes)
-    # 0x1150 - Pro Low-light - val=1; Pro Focus - val=2 (ref 7); HDR - val=128 (forum10799)
-    # 0x1151 - Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7); HDR - val=3 (forum10799)
-    # 0x1152 - Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7); HDR - val=3 (forum10799)
+    0x1150 => {
+        Name => 'CompositeImageMode',
+        Writable => 'int32u',
+        PrintConv => {
+            0 => 'n/a', #PH
+            1 => 'Pro Low-light', #7
+            2 => 'Pro Focus', #7
+            32 => 'Panorama', #PH
+            128 => 'HDR', #forum10799
+            1024 => 'Multi-exposure', #forum17591
+        },
+    },
+    0x1151 => {
+        Name => 'CompositeImageCount1',
+        Writable => 'int16u',
+        # Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7); HDR - val=3 (forum10799)
+    },
+    0x1152 => {
+        Name => 'CompositeImageCount2',
+        Writable => 'int16u',
+        # Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7); HDR - val=3 (forum10799)
+    },
     0x1153 => { #forum7668
         Name => 'PanoramaAngle',
         Writable => 'int16u',
@@ -605,8 +643,8 @@ my %faceCategories = (
         Writable => 'int16u',
         PrintConv => {
             1 => 'Right',
-            2 => 'Up',
-            3 => 'Left',
+            2 => 'Up', # (or Left?, forum17591)
+            3 => 'Left', # (or Up?, forum17591)
             4 => 'Down',
         },
     },
@@ -1558,20 +1596,21 @@ my %faceCategories = (
     TAG_PREFIX => 'MRAW',
     NOTES => q{
         Tags extracted from the M-RAW header of multi-image RAF files.  The family 1
-        group name for these tags is "M-RAW".
-    },
-    1 => { Name => 'RawImageNumber', Format => 'int32u' },
-    # 3 - seen "0 100", "-300 100" and "300 100" for a sequence of 3 images
-    3 => { Name => 'ExposureCompensation', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
-    # 4 - (same value as 3 in all my samples)
-    4 => { Name => 'ExposureCompensation2', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
-    # 5 - seen "10 1600", "10 6800", "10 200", "10 35000" etc
-    5 => { Name => 'ExposureTime', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)' },
-    # 6 - seen "450 100", "400 100" (all images in RAF have same value)
-    6 => { Name => 'FNumber', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)' },
-    # 7 - seen 200, 125, 250, 2000
-    7 => 'ISO',
-    # 8 - seen 0, 65536
+        group name for these tags is "M-RAW".  Additional metadata may be extracted
+        from the embedded RAW images with the ExtractEmbedded option.
+    },
+    0x2001 => { Name => 'RawImageNumber', Format => 'int32u' },
+    # 0x2003 - seen "0 100", "-300 100" and "300 100" for a sequence of 3 images
+    0x2003 => { Name => 'ExposureCompensation', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
+    # 0x2004 - (same value as 3 in all my samples)
+    0x2004 => { Name => 'ExposureCompensation2', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
+    # 0x2005 - seen "10 1600", "10 6800", "10 200", "10 35000" etc
+    0x2005 => { Name => 'ExposureTime', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)' },
+    # 0x2006 - seen "450 100", "400 100" (all images in RAF have same value)
+    0x2006 => { Name => 'FNumber', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)' },
+    # 0x2007 - seen 200, 125, 250, 2000
+    0x2007 => 'ISO',
+    # 0x2008 - seen 0, 65536
 );
 
 #------------------------------------------------------------------------------
@@ -1684,6 +1723,7 @@ sub ProcessFujiDir($$$)
 sub ProcessMRAW($$$)
 {
     my ($et, $dirInfo, $tagTablePtr) = @_;
+    return 1 if $$et{DOC_NUM};
     my $dataPt = $$dirInfo{DataPt};
     my $dataPos = $$dirInfo{DataPos};
     my $dataLen = length $$dataPt;
@@ -1697,15 +1737,16 @@ sub ProcessMRAW($$$)
     my $pos = 44;
     my ($i, $n);
     for ($n=0; ; ++$n) {
-        $pos += 16;  # skip offset/size fields
-        my $end = $pos + $size;
+        my $end = $pos + 16 + $size;
         last if $end > $dataLen;
+        my $rafStart = Get64u($dataPt, $pos);
+        my $rafLen = Get64u($dataPt, $pos+8);
+        $pos += 16;  # skip offset/size fields
         $$et{DOC_NUM} = ++$$et{DOC_COUNT} if $pos > 60;
         $et->VPrint(0, "$$et{INDENT}(Raw image $n parameters: $size bytes, $num entries)\n");
         for ($i=0; $i<$num; ++$i) {
             last if $pos + 4 > $end;
-            # (don't know what the byte at the current $pos is for, value = 0x20)
-            my $tag = Get8u($dataPt, $pos+1);
+            my $tag = Get16u($dataPt, $pos);
             my $size = Get16u($dataPt, $pos+2);
             $pos += 4;
             last if $pos + $size > $end;
@@ -1717,6 +1758,21 @@ sub ProcessMRAW($$$)
             );
             $pos += $size;
         }
+        if ($rafStart and $et->Options('ExtractEmbedded')) {
+            if ($et->Options('Verbose')) {
+                my $msg = sprintf("$$et{INDENT}(RAW image $n data: Start=0x%x, Length=0x%x)\n",$rafStart,$rafLen);
+                $et->VPrint(0, $msg);
+            }
+            my $raf = $$et{RAF};
+            my $tell = $raf->Tell();
+            my $order = GetByteOrder();
+            my $fujiWidth = $$et{FujiWidth};
+            $raf->Seek($rafStart, 0) or next;
+            ProcessRAF($et, { RAF => $raf, Base => $rafStart });
+            $$et{FujiWidth} = $fujiWidth;
+            SetByteOrder($order);
+            $raf->Seek($tell, 0);
+        }
     }
     delete $$et{DOC_NUM};
     return 1;
@@ -1816,7 +1872,6 @@ sub WriteRAF($$)
         # make sure padding is only zero bytes (can be >100k for HS10)
         # (have seen non-null padding in X-Pro1)
         if ($buff =~ /[^\0]/) {
-HexDump(\$buff);
             return 1 if $et->Error('Non-null bytes found in padding', 2);
         }
     }
@@ -1871,6 +1926,7 @@ sub ProcessRAF($$)
     my ($buff, $jpeg, $warn, $offset);
 
     my $raf = $$dirInfo{RAF};
+    my $base = $$dirInfo{Base} || 0;
     $raf->Read($buff,0x70) == 0x70    or return 0;
     $buff =~ /^FUJIFILM/              or return 0;
     # get position and size of M-RAW header and jpeg preview
@@ -1878,13 +1934,13 @@ sub ProcessRAF($$)
     my ($jpos, $jlen) = unpack('x84NN', $buff);
     $jpos & 0x8000                   and return 0;
     if ($jpos) {
-        $raf->Seek($jpos, 0)              or return 0;
+        $raf->Seek($jpos+$base, 0)        or return 0;
         $raf->Read($jpeg, $jlen) == $jlen or return 0;
     }
     SetByteOrder('MM');
-    $et->SetFileType();
+    $et->SetFileType() unless $$et{DOC_NUM};
     my $tbl = GetTagTable('Image::ExifTool::FujiFilm::RAFHeader');
-    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader' }, $tbl);
+    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader', Base => $base }, $tbl);
     
     # extract information from embedded JPEG
     my %dirInfo = (
@@ -1892,21 +1948,22 @@ sub ProcessRAF($$)
         RAF    => File::RandomAccess->new(\$jpeg),
     );
     if ($jpos) {
-        $$et{BASE} += $jpos;
+        $$et{BASE} += $jpos + $base;
         my $ok = $et->ProcessJPEG(\%dirInfo);
-        $$et{BASE} -= $jpos;
+        $$et{BASE} -= $jpos + $base;
         $et->FoundTag('PreviewImage', \$jpeg) if $ok;
     }
     # extract information from Fuji RAF and TIFF directories
     my ($rafNum, $ifdNum) = ('','');
     foreach $offset (0x48, 0x5c, 0x64, 0x78, 0x80) {
         last if $jpos and $offset >= $jpos;
-        unless ($raf->Seek($offset, 0) and $raf->Read($buff, 8)) {
+        unless ($raf->Seek($offset+$base, 0) and $raf->Read($buff, 8)) {
             $warn = 1;
             last;
         }
         my ($start, $len) = unpack('N2',$buff);
         next unless $start;
+        $start += $base;
         if ($offset == 0x64 or $offset == 0x80) {
             # parse FujiIFD directory
             %dirInfo = (

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.29';
+$VERSION = '1.30';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -557,7 +557,7 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
+    my ($buff, $pLen, $j, $fileType, $eof);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
@@ -570,10 +570,8 @@ sub ProcessM2TS($$)
     unless ($1) {
         $pLen = 188;        # no timecode
         $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-        $upkPrefix = 'N';
     } else {
         $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-        $upkPrefix = 'x4N';
     }
     my $prePos = $pLen - 188;       # byte position of packet prefix
     my $readSize = 64 * $pLen;      # size of our read buffer

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.50';
+$VERSION = '4.51';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -583,6 +583,7 @@ sub GetAFPointGrid($$;$);
     '0E 4A 31 48 23 2D 0E 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     'FE 48 37 5C 24 24 DF 0E' => 'Tamron SP 24-70mm f/2.8 Di VC USD (A007)', #24
     'CE 47 37 5C 25 25 DF 4E' => 'Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)', #forum9110
+    'CE 00 37 5C 25 25 DF 4E' => 'Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)', #github345
     '45 41 37 72 2C 3C 48 02' => 'Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro (190D)',
     '33 54 3C 5E 24 24 62 02' => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09)',
     'FA 54 3C 5E 24 24 84 06' => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)', #JD

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

@@ -41,7 +41,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.89';
+$VERSION = '2.90';
 
 sub PrintLensInfo($$$);
 
@@ -117,6 +117,7 @@ my %olympusLensTypes = (
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB (also OM System M.Zuiko Digital ED 100-400mm F5.0-6.3 IS II", forum2833)
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
     '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
+    '0 38 10' => 'Olympus M.Zuiko Digital ED 20mm F1.4 Pro',
     '0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
     '0 40 10' => 'Olympus M.Zuiko Digital ED 150-600mm F5.0-6.3', #forum15652
     # Sigma lenses
@@ -2252,12 +2253,15 @@ my %indexInfo = (
             5 => 'i-Enhance', #11
             6 => 'e-Portrait', #23
             7 => 'Color Creator', #23
+            8 => 'Underwater', #7
             9 => 'Color Profile 1', #23
             10 => 'Color Profile 2', #23
             11 => 'Color Profile 3', #23
             12 => 'Monochrome Profile 1', #23
             13 => 'Monochrome Profile 2', #23
             14 => 'Monochrome Profile 3', #23
+            17 => 'Art Mode', #7
+            18 => 'Monochrome Profile 4', #7
             256 => 'Monotone',
             512 => 'Sepia',
         }],

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

@@ -59,7 +59,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.55';
+$VERSION = '3.57';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -564,6 +564,7 @@ my %pentaxModelID = (
     0x1329a => 'GR IIIx', # (Ricoh)
     0x132b8 => 'KF', #github322 (Ricoh)
     0x132d6 => 'K-3 Mark III Monochrome', #github226 (Ricoh)
+    0x132e0 => 'GR IV', #github347 (Ricoh)
 );
 
 # Pentax city codes - (PH, Optio WP)
@@ -5120,52 +5121,52 @@ my %binaryDataAttrs = (
         PrintConv => { 0 => 'Off', 1 => 'Short', 2 => 'Medium', 3 => 'Long' },
     },
     0x021f => { #KG
-          Name => 'FirstFrameActionInAFC',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              '0'   => 'Auto',
-              '1'   => 'Release Priority',
-              '2'   => 'Focus Priority',
-              # there is at least another value '3' but I couldn't figure out the
-              # meaning. However, this occurs for a few AF-S captures, so it has
-              # no real practical meaning.
-          },
+        Name => 'FirstFrameActionInAFC',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Release Priority',
+            '2'   => 'Focus Priority',
+            # there is at least another value '3' but I couldn't figure out the
+            # meaning. However, this occurs for a few AF-S captures, so it has
+            # no real practical meaning.
+        },
     },
     0x0220 => { #KG
-          Name => 'ActionInAFCCont',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              '0'   => 'Auto',
-              '1'   => 'Focus Priority',
-              '2'   => 'FPS Priority',
-          },
+        Name => 'ActionInAFCCont',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Focus Priority',
+            '2'   => 'FPS Priority',
+        },
     },
     545 => { #KG
-          Name => 'AFCHold',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          Mask => 0x03,
-          PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
+        Name => 'AFCHold',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x03,
+        PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
     },
     545.1 => { #KG
-        Name => 'AFCSensitivity',
+        Name => 'AFCPointTracking',
         Condition => '$$self{Model} =~ /K-3 Mark III/',
         Mask => 0x0c,
-        PrintConv => '5 - $val',
-        PrintConvInv => '5 - $val',
+        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
     },
     545.2 => { #KG
-        Name => 'AFCPointTracking',
+        Name => 'AFCSensitivity',
         Condition => '$$self{Model} =~ /K-3 Mark III/',
         Mask => 0x70,
-        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
+        PrintConv => '5 - $val',
+        PrintConvInv => '5 - $val',
     },
     0x0960 => { #KG
-          Name => 'SubjectRecognition',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              0 => 'Off',
-              1 => 'On',
-          },
+        Name => 'SubjectRecognition',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
     },
 );
 

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ProcessProtobuf($$$;$);
 

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 110 different types of timed GPS metadata from video files.
+        currently reads 111 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },

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

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.71';
+$VERSION = '1.72';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -2031,6 +2031,7 @@ sub ProcessRIFF($$)
     my $validate = $et->Options('Validate');
     my $ee = $et->Options('ExtractEmbedded');
     my $hash = $$et{ImageDataHash};
+    my $base = 0;
 
     # verify this is a valid RIFF file
     return 0 unless $raf->Read($buff, 12) == 12;
@@ -2042,7 +2043,8 @@ sub ProcessRIFF($$)
         return 0 unless $buff =~ /^(LA0[234]|OFR |LPAC|wvpk)/ and $raf->Read($buf2, 1024);
         $type = $riffType{$1};
         $buff .= $buf2;
-        return 0 unless $buff =~ /WAVE(.{4})?fmt /sg and $raf->Seek(pos($buff) - 4, 0);
+        return 0 unless $buff =~ /WAVE(.{4})?(junk|fmt )/sg and $raf->Seek(pos($buff) - 4, 0);
+        $base = pos($buff) - 16;
     }
     $$raf{NoBuffer} = 1 if $et->Options('FastScan'); # disable buffering in FastScan mode
     $mime = $riffMimeType{$type} if $type;
@@ -2159,7 +2161,7 @@ sub ProcessRIFF($$)
                 DataPos => 0,   # (relative to Base)
                 Start   => 0,
                 Size    => $len,
-                Base    => $pos,
+                Base    => $pos + $base,
             );
             if ($setGroups) {
                 delete $$et{SET_GROUP0};

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.75';
+$VERSION = '3.76';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -2193,6 +2193,8 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             399 => 'ZV-E10M2', #JR
             400 => 'ILCE-1M2', #PH
             401 => 'DSC-RX1RM3', #JR
+            402 => 'ILCE-6400A', #github347
+            404 => 'DSC-RX100M7A', #github347
             406 => 'ILME-FX2', #JR
         },
     },

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

@@ -751,8 +751,8 @@ my %tagLookup = (
 	'afconfidence' => { 1 => 0x3d },
 	'afconfigtool' => { 2 => 0x1 },
 	'afcoordinatesavailable' => { 203 => 0x7, 204 => 0x7 },
-	'afcpointtracking' => { 371 => '545.2' },
-	'afcsensitivity' => { 371 => '545.1' },
+	'afcpointtracking' => { 371 => '545.1' },
+	'afcsensitivity' => { 371 => '545.2' },
 	'afdefocus' => { 371 => 0x6 },
 	'afdetectionmethod' => { 200 => 0x4, 201 => 0x4, 203 => 0x4, 204 => 0x4 },
 	'afduringliveview' => { 90 => 0x511 },
@@ -1968,7 +1968,10 @@ my %tagLookup = (
 	'composerkeywords' => { 425 => "\xa9cok" },
 	'compositeimage' => { 125 => 0xa460, 539 => 'CompositeImage' },
 	'compositeimagecount' => { 125 => 0xa461, 539 => 'CompositeImageCount' },
+	'compositeimagecount1' => { 133 => 0x1151 },
+	'compositeimagecount2' => { 133 => 0x1152 },
 	'compositeimageexposuretimes' => { 125 => 0xa462, 539 => 'CompositeImageExposureTimes' },
+	'compositeimagemode' => { 133 => 0x1150 },
 	'composition' => { 520 => 'Composition' },
 	'compositionadjust' => { 397 => '0.1' },
 	'compositionadjustrotation' => { 397 => 0x7 },
@@ -5098,6 +5101,7 @@ my %tagLookup = (
 	'multiframenoisereduction' => { 455 => 0x35, 467 => 0x200b, 472 => 0x15 },
 	'multiframenreffect' => { 467 => 0x2023 },
 	'multifunctionlock' => { 90 => 0x70f },
+	'multipleexposure' => { 133 => 0x1037 },
 	'multipleexposuremode' => { 250 => 0x1bc, 252 => 0x98, 255 => 0x8c, 256 => 0x9a, 257 => 0x9a, 339 => 0x101c },
 	'multipleexposureset' => { 378 => '10.1' },
 	'multisample' => { 272 => 0x40 },
@@ -7675,7 +7679,7 @@ my %tagLookup = (
 	'whitebalancebias' => { 119 => 0x2011, 340 => 0x304, 360 => 0x23 },
 	'whitebalanceblue' => { 79 => 0x7 },
 	'whitebalancebracket' => { 335 => 0x502, 340 => 0x303 },
-	'whitebalancebracketing' => { 191 => 0x22, 194 => 0x2c, 464 => 0x2c },
+	'whitebalancebracketing' => { 133 => 0x1102, 191 => 0x22, 194 => 0x2c, 464 => 0x2c },
 	'whitebalancebuttonplaybackmode' => { 331 => 0x1c5, 332 => 0x1dd },
 	'whitebalancecomp' => { 343 => 0x1001 },
 	'whitebalancedetected' => { 145 => 0x3fb },

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 28636 tags, with 17834 unique tag names.
+They contain a total of 28650 tags, with 17839 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -11539,8 +11539,8 @@ file name combined with the hierarchical protobuf field numbers.
 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.
@@ -11596,6 +11596,18 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac204_3-4-2-1'      GPSInfo             DJI GPSInfo
   'dvtm_ac204_3-4-2-2'      GPSAltitude         no
   'dvtm_ac204_3-4-2-6-1'    GPSDateTime         no
+  'dvtm_dji_neo_1-1-5'      SerialNumber        no
+  'dvtm_dji_neo_1-1-10'     Model               no
+  'dvtm_dji_neo_2-2-3-1'    SerialNumber2       no
+  'dvtm_dji_neo_2-3'        FrameInfo           DJI FrameInfo
+  'dvtm_dji_neo_3-1-2'      TimeStamp           no
+  'dvtm_dji_neo_3-2-2-1'    ISO                 no
+  'dvtm_dji_neo_3-2-4-1'    ShutterSpeed        no
+  'dvtm_dji_neo_3-2-6-1'    ColorTemperature    no
+  'dvtm_dji_neo_3-2-10-1'   FNumber             no
+  'dvtm_dji_neo_3-4-3'      DroneInfo           DJI DroneInfo
+  'dvtm_dji_neo_3-4-4-1'    GPSInfo             DJI GPSInfo
+  'dvtm_dji_neo_3-4-4-2'    AbsoluteAltitude    no
   'dvtm_pm320_1-1-5'        SerialNumber        no
   'dvtm_pm320_1-1-10'       Model               no
   'dvtm_pm320_2-2'          FrameInfo           DJI FrameInfo
@@ -12142,6 +12154,7 @@ Tags extracted from FLIR Public image Format (FPF) files.
   0x1032   ExposureCount                        int16u
   0x1033   EXRAuto                              int16u
   0x1034   EXRMode                              int16u
+  0x1037   MultipleExposure                     int16u
   0x1040   ShadowTone                           int32s
   0x1041   HighlightTone                        int32s
   0x1044   DigitalZoom                          int32u
@@ -12159,9 +12172,13 @@ Tags extracted from FLIR Public image Format (FPF) files.
   0x1053   CropSize                             int32u
   0x1100   AutoBracketing                       int16u
   0x1101   SequenceNumber                       int16u
+  0x1102   WhiteBalanceBracketing               int16u
   0x1103   DriveSettings                        FujiFilm DriveSettings
   0x1105   PixelShiftShots                      int16u
   0x1106   PixelShiftOffset                     rational64s[2]
+  0x1150   CompositeImageMode                   int32u
+  0x1151   CompositeImageCount1                 int16u
+  0x1152   CompositeImageCount2                 int16u
   0x1153   PanoramaAngle                        int16u
   0x1154   PanoramaDirection                    int16u
   0x1201   AdvancedFilter                       int32u
@@ -12353,14 +12370,15 @@ Tags found in the FujiIFD information of RAF images from some models.
 =head3 FujiFilm MRAW Tags
 
 Tags extracted from the M-RAW header of multi-image RAF files.  The family 1
-group name for these tags is "M-RAW".
+group name for these tags is "M-RAW".  Additional metadata may be extracted
+from the embedded RAW images with the ExtractEmbedded option.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
-  0x0001   RawImageNumber                       no
-  0x0005   ExposureTime                         no
-  0x0006   FNumber                              no
-  0x0007   ISO                                  no
+  0x2001   RawImageNumber                       no
+  0x2005   ExposureTime                         no
+  0x2006   FNumber                              no
+  0x2007   ISO                                  no
 
 =head3 FujiFilm FFMV Tags
 
@@ -20734,8 +20752,8 @@ Flash information tags for the K10D, K20D and K200D.
     543    FirstFrameActionInAFC                int8u
     544    ActionInAFCCont                      int8u
     545    AFCHold                              int8u & 0x03
-  545.1    AFCSensitivity                       int8u & 0x0c
-  545.2    AFCPointTracking                     int8u & 0x70
+  545.1    AFCPointTracking                     int8u & 0x0c
+  545.2    AFCSensitivity                       int8u & 0x70
    2400    SubjectRecognition                   int8u
 
 =head3 Pentax KelvinWB Tags
@@ -30526,7 +30544,7 @@ for the official QuickTime specification.
 The tags below are extracted from timed metadata in QuickTime and other
 formats of video files when the ExtractEmbedded option is used.  Although
 most of these tags are combined into the single table below, ExifTool
-currently reads 110 different types of timed GPS metadata from video files.
+currently reads 111 different types of timed GPS metadata from video files.
 
   Tag ID                 Tag Name               Writable
   ------                 --------               --------

data/bin/lib/Image/ExifTool/Writer.pl

@@ -1352,7 +1352,8 @@ sub SetNewValuesFromFile($$;@)
         # get all tags from source file (including MakerNotes block)
         $info = $srcExifTool->ImageInfo($srcFile);
     }
-    return $info if $$info{Error} and $$info{Error} eq 'Error opening file';
+    # (allow processing to continue if we have alternate files that may have been read OK)
+    return $info if $$info{Error} and $$info{Error} eq 'Error opening file' and not $$self{ALT_EXIFTOOL};
     delete $$srcExifTool{VALUE}{Error}; # delete so we can check this later
 
     # sort tags in file order with priority tags last

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

@@ -3350,13 +3350,14 @@ sub PrintLensID(@)
 #------------------------------------------------------------------------------
 # Convert XMP date/time to EXIF format
 # Inputs: 0) XMP date/time string, 1) set if we aren't sure this is a date
-# Returns: EXIF date/time
+# Returns: EXIF date/time, and flag in list context if this was a standard date/time value
 sub ConvertXMPDate($;$)
 {
     my ($val, $unsure) = @_;
     if ($val =~ /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}:\d{2})(:\d{2})?\s*(\S*)$/) {
         my $s = $5 || '';           # seconds may be missing
         $val = "$1:$2:$3 $4$s$6";   # convert back to EXIF time format
+        return($val, 1) if wantarray;
     } elsif (not $unsure and $val =~ /^(\d{4})(-\d{2}){0,2}/) {
         $val =~ tr/-/:/;
     }
@@ -3647,7 +3648,12 @@ NoLoop:
         if (($new or $fmt eq 'rational') and ConvertRational($val)) {
             $rational = $rawVal;
         } else {
-            $val = ConvertXMPDate($val, $new) if $new or $fmt eq 'date';
+            my $stdDate;
+            ($val, $stdDate) = ConvertXMPDate($val, $new) if $new or $fmt eq 'date';
+            if ($stdDate and $added) {
+                $$tagInfo{Groups}{2} = 'Time';
+                $$tagInfo{PrintConv} = '$self->ConvertDateTime($val)';
+            }
         }
         if ($$et{XmpValidate} and $fmt and $fmt eq 'boolean' and $val!~/^True|False$/) {
             if ($val =~ /^true|false$/) {

data/bin/lib/Image/ExifTool/XMP2.pl

@@ -1934,7 +1934,7 @@ my %sACDSeeRegionStruct = (
     BurstPrimary    => { },
     PortraitNote    => { },
     PortraitRequest => {
-        Notes => 'High Definition Render Pipeline (HDRP) data', #PH (guess)
+        Notes => 'HDRPlus (HDRP) data', #NealKrawetz
         ValueConv => 'Image::ExifTool::XMP::DecodeBase64($val)',
         ValueConvInv => 'Image::ExifTool::XMP::EncodeBase64($val)',
     },

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf $configFile @configFiles $noConfig);
 
-$VERSION = '13.34';
+$VERSION = '13.36';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -2825,6 +2825,8 @@ sub ExtractInfo($;@)
                 $isDir = 1;
             } else {
                 $self->Error('Error opening file');
+                # continue to process alt files if necessary
+                $self->DoneExtract() if $$self{ALT_EXIFTOOL};
             }
         } else {
             $self->Error('No file specified');

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 13.34
+Version: 13.36
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('13.34.0')
+  VERSION = Gem::Version.new('13.36.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 13.34.0
+  version: 13.36.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-03 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool