exiftool-vendored.exe 13.36.0 → 13.38.0

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.36';
+my $version = '13.38';
 
 $^W = 1;    # enable global warnings
 

package/bin/exiftool_files/lib/Image/ExifTool/Audible.pm

@@ -88,7 +88,7 @@ sub ProcessAudible_cvrx($$$);
     PROCESS_PROC => \&ProcessAudible_cvrx,
     GROUPS => { 0 => 'QuickTime', 2 => 'Audio' },
     NOTES => 'Audible cover art information in M4B audio books.',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     CoverArtType => 'CoverArtType',
     CoverArt     => {
         Name => 'CoverArt',

package/bin/exiftool_files/lib/Image/ExifTool/BMP.pm

@@ -234,7 +234,7 @@ my %fixed2_30 = (
 %Image::ExifTool::BMP::Extra = (
     GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
     NOTES => 'Extra information extracted from some BMP images.',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     LinkedProfileName => { },
     ICC_Profile => { SubDirectory => { TagTable => 'Image::ExifTool::ICC_Profile::Main' } },
     EmbeddedJPG => {
@@ -248,7 +248,7 @@ my %fixed2_30 = (
 );
 
 #------------------------------------------------------------------------------
-# Extract EXIF information from a BMP image
+# Extract metadata from a BMP image
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
 # Returns: 1 on success, 0 if this wasn't a valid BMP file
 sub ProcessBMP($$)

package/bin/exiftool_files/lib/Image/ExifTool/BuildTagLookup.pm

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.62';
+$VERSION = '3.63';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -74,7 +74,8 @@ my %tweakOrder = (
     DJI     => 'Casio',
     FLIR    => 'DJI',
     FujiFilm => 'FLIR',
-    GoPro   => 'GE',
+    Google  => 'GE',
+    GoPro   => 'Google',
     Kodak   => 'JVC',
     Leaf    => 'Kodak',
     Lytro   => 'Leaf',
@@ -867,15 +868,15 @@ sub new
         $longID{$tableName} = 0;
         $longName{$tableName} = 0;
         # save all tag names
-        my ($tagID, $binaryTable, $noID, $hexID, $isIPTC, $isXMP);
+        my ($tagID, $binaryTable, $noID, $prtID, $isIPTC, $isXMP);
         $isIPTC = 1 if $writeProc and $writeProc eq \&Image::ExifTool::IPTC::WriteIPTC;
         # generate flattened tag names for structure fields if this is an XMP table
         if ($$table{GROUPS} and $$table{GROUPS}{0} eq 'XMP' or $$vars{ADD_FLATTENED}) {
             Image::ExifTool::XMP::AddFlattenedTags($table);
             $isXMP = 1;
         }
-        $noID = 1 if $isXMP or $short =~ /^(Shortcuts|ASF.*)$/ or $$vars{NO_ID};
-        $hexID = $$vars{HEX_ID};
+        $prtID = $$vars{ID_FMT};
+        $noID = 1 if $isXMP or $short =~ /^(Shortcuts|ASF.*)$/ or $prtID and $prtID eq 'none';
         if ($$table{WRITE_PROC} and $$table{WRITE_PROC} eq \&Image::ExifTool::WriteBinaryData
             and not $$table{CHECK_PROC})
         {
@@ -1104,7 +1105,7 @@ TagID:  foreach $tagID (@keys) {
                         $note = 'NOT a flattened tag!';
                     } else {
                         # add note about different XMP Tag ID
-                        $note = $$tagInfo{RootTagInfo} ? $tagID : "called $tagID by the spec";
+                        $note = $$tagInfo{RootTagInfo} ? $tagID : "tag ID is '${tagID}'";
                     }
                     if ($$tagInfo{Notes}) {
                         $values[-1] =~ s/^\(/($note; /;
@@ -1492,8 +1493,14 @@ TagID:  foreach $tagID (@keys) {
             if ($tagID =~ /^(-)?\d+(\.\d+)?$/) {
                 if ($1) {
                     $tagIDstr = $tagID;
-                } elsif (defined $hexID) {
-                    $tagIDstr = $hexID ? sprintf('0x%.4x',$tagID) : $tagID;
+                } elsif (defined $prtID) {
+                    if ($prtID eq 'hex') {
+                        $tagIDstr = sprintf('0x%.4x',$tagID);
+                    } elsif ($prtID eq 'str') {
+                        $tagIDstr = "'${tagID}'";
+                    } else {
+                        $tagIDstr = $tagID;
+                    }
                 } elsif (not $2 and not $binaryTable and not $isIPTC and
                          not ($short =~ /^CanonCustom/ and $tagID < 256))
                 {
@@ -1911,7 +1918,7 @@ sub SortedTagTableKeys($)
     my $table = shift;
     my $vars = $$table{VARS} || { };
     my @keys = TagTableKeys($table);
-    if ($$vars{NO_ID}) {
+    if ($$vars{ID_FMT} and $$vars{ID_FMT} eq 'none') {
         # sort by tag name if ID not shown
         my ($key, %name);
         foreach $key (@keys) {

package/bin/exiftool_files/lib/Image/ExifTool/CBOR.pm

@@ -62,7 +62,7 @@ my %cborType7 = (
 
 %Image::ExifTool::CBOR::Main = (
     GROUPS => { 0 => 'JUMBF', 1 => 'CBOR', 2 => 'Other' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     PROCESS_PROC => \&ProcessCBOR,
     NOTES => q{
         The tags below are extracted from CBOR (Concise Binary Object

package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.96';
+$VERSION = '4.97';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -561,7 +561,8 @@ $VERSION = '4.96';
     4159 => 'Canon EF-M 32mm f/1.4 STM', #42
     4160 => 'Canon EF-S 35mm f/2.8 Macro IS STM', #42
     4208 => 'Sigma 56mm f/1.4 DC DN | C or other Sigma Lens', #forum10603
-    4208.1 => 'Sigma 30mm F1.4 DC DN | C', #git issue#83 (016)
+    4208.1 => 'Sigma 30mm F1.4 DC DN | C', #github#83 (016)
+    6512 => 'Sigma 12mm F1.4 DC | C', #github#352 (025)
     # (Nano USM lenses - 0x90xx)
     36910 => 'Canon EF 70-300mm f/4-5.6 IS II USM', #42
     36912 => 'Canon EF-S 18-135mm f/3.5-5.6 IS USM', #42
@@ -640,6 +641,7 @@ $VERSION = '4.96';
    '61182.62' => 'Canon RF 50mm F1.4 L VCM', #42
    '61182.63' => 'Canon RF 24mm F1.4 L VCM', #42
    '61182.64' => 'Canon RF 20mm F1.4 L VCM', #42
+   '61182.65' => 'Canon RF 85mm F1.4 L VCM', #github350
     65535 => 'n/a',
 );
 
@@ -892,6 +894,7 @@ $VERSION = '4.96';
 
 # (see http://cweb.canon.jp/e-support/faq/answer/digitalcamera/10447-1.html for PowerShot/IXUS/IXY names)
 
+    0x40000227 => 'EOS C50', #github350
     0x4007d673 => 'DC19/DC21/DC22',
     0x4007d674 => 'XH A1',
     0x4007d675 => 'HV10',
@@ -7048,6 +7051,7 @@ my %ciMaxFocal = (
             325 => 'Canon RF 50mm F1.4 L VCM', #42
             326 => 'Canon RF 24mm F1.4 L VCM', #42
             327 => 'Canon RF 20mm F1.4 L VCM', #42
+            328 => 'Canon RF 85mm F1.4 L VCM', #42/github350
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -9125,7 +9129,7 @@ my %filterConv = (
         RawConv => '$val == 0x7fffffff ? undef : $val',
     },
     7 => {  # -4 to 4
-        Name => 'Saturation', 
+        Name => 'Saturation',
         RawConv => '$val == 0x7fffffff ? undef : $val',
         %Image::ExifTool::Exif::printParameter,
     },
@@ -9175,6 +9179,7 @@ my %filterConv = (
         ValueConvInv => '$val - 1',
         PrintHex => 1,
         PrintConv => {
+            11 => 'Case A',  #KG instead of 'Case 11'. Canon use A for Auto
             0x80000000 => 'n/a',
             OTHER => sub { 'Case ' . shift },
         },
@@ -9184,6 +9189,7 @@ my %filterConv = (
         Name => 'AFTrackingSensitivity',
         PrintHex => 1,
         PrintConv => {
+            127 => 'Auto', #KG
             0x7fffffff => 'n/a',
             OTHER => sub { shift },
         },
@@ -9193,6 +9199,7 @@ my %filterConv = (
         Description => 'AF Accel/Decel Tracking',
         PrintHex => 1,
         PrintConv => {
+            127 => 'Auto', #KG
             0x7fffffff => 'n/a',
             OTHER => sub { shift },
         },
@@ -9353,6 +9360,7 @@ my %filterConv = (
             1 => 'People',
             2 => 'Animals',
             3 => 'Vehicles',
+            4 => 'Auto',  #KG (R1, R5m2)
         },
     },
     21 => { #github344 (R6)
@@ -9363,9 +9371,55 @@ my %filterConv = (
             2 => 'Switch Subject',
         },
     },
-    24 => { #forum16068
+    24 => { #forum16068  #KG extensions for 'left' and 'right'
         Name => 'EyeDetection',
-        PrintConv => \%offOn,
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Auto',
+            2 => 'Left Eye',
+            3 => 'Right Eye',
+         },
+    },
+    # ---------------
+    # Entries 25..31 exist for recent models only (R1, R5m2, ...)
+    # ---------------
+    26 => { #KG
+        Name => 'WholeAreaTracking',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
+    },
+    27 => { #KG
+        Name => 'ServoAFCharacteristics',
+        PrintConv => {
+            0 => 'Case Auto',
+            1 => 'Case Manual',
+        },
+    },
+    28 => { #KG
+        Name => 'CaseAutoSetting',
+        PrintConv => {
+           -1 => 'Locked On',
+            0 => 'Standard',
+            1 => 'Responsive',
+            0x7fffffff => 'n/a',
+        },
+    },
+    29 => { #KG
+        Name => 'ActionPriority',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
+    },
+    30 => { #KG
+        Name => 'SportEvents',
+        PrintConv => {
+            0 => 'Soccer',
+            1 => 'Basketball',
+            2 => 'Volleyball',
+        }
     },
 );
 

package/bin/exiftool_files/lib/Image/ExifTool/CanonVRD.pm

@@ -1004,7 +1004,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     WRITABLE => 1,
     PERMANENT => 1, # (can't add/delete these individually)
     GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
-    VARS => { HEX_ID => 1, SORT_PROC => \&SortDR4 },
+    VARS => { ID_FMT => 'hex', SORT_PROC => \&SortDR4 },
     NOTES => q{
         Tags written by Canon DPP version 4 in CanonVRD trailers and DR4 files. Each
         tag has three associated flag words which are stored with the directory

package/bin/exiftool_files/lib/Image/ExifTool/CaptureOne.pm

@@ -25,7 +25,7 @@ $VERSION = '1.04';
 %Image::ExifTool::CaptureOne::Main = (
     GROUPS => { 0 => 'XML', 1 => 'XML', 2 => 'Image' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     ColorCorrections => { ValueConv => '\$val' }, # (long list of floating point numbers)
 );
 

package/bin/exiftool_files/lib/Image/ExifTool/DJI.pm

@@ -140,7 +140,7 @@ my %convFloat2 = (
     GROUPS => { 0 => 'XMP', 1 => 'XMP-drone-dji', 2 => 'Location' },
     NAMESPACE => 'drone-dji',
     TABLE_DESC => 'XMP DJI',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'XMP tags used by DJI for images from drones.',
     AbsoluteAltitude  => { Writable => 'real' },
     RelativeAltitude  => { Writable => 'real' },
@@ -530,7 +530,7 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::DroneInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
+    VARS => { ID_FMT => 'dec', ID_LABEL => 'Field #' },
     1 => { Name => 'DroneRoll',  Format => 'int64s', ValueConv => '$val / 10' },
     2 => { Name => 'DronePitch', Format => 'int64s', ValueConv => '$val / 10' },
     3 => { Name => 'DroneYaw',   Format => 'int64s', ValueConv => '$val / 10' },
@@ -539,7 +539,7 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::GimbalInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
+    VARS => { ID_FMT => 'dec', ID_LABEL => 'Field #' },
     1 => { Name => 'GimbalPitch',Format => 'int64s', ValueConv => '$val / 10' },
     2 => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' }, # usually 0, so missing
     3 => { Name => 'GimbalYaw',  Format => 'int64s', ValueConv => '$val / 10' },
@@ -548,7 +548,7 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::FrameInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Video' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
+    VARS => { ID_FMT => 'dec', ID_LABEL => 'Field #' },
     1 => { Name => 'FrameWidth',  Format => 'unsigned' },
     2 => { Name => 'FrameHeight', Format => 'unsigned' },
     3 => { Name => 'FrameRate',   Format => 'float' },
@@ -558,7 +558,7 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::GPSInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Location' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
+    VARS => { ID_FMT => 'dec', ID_LABEL => 'Field #' },
     1 => {
         Name => 'CoordinateUnits',
         Format  => 'unsigned',

package/bin/exiftool_files/lib/Image/ExifTool/DSF.pm

@@ -0,0 +1,138 @@
+#------------------------------------------------------------------------------
+# File:         DSF.pm
+#
+# Description:  Read DSF meta information
+#
+# Revisions:    2025-09-24 - P. Harvey Created
+#
+# References:   1) https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::DSF;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+
+$VERSION = '1.00';
+
+# DSF header format
+%Image::ExifTool::DSF::Main = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Audio' },
+    FORMAT => 'int32u',
+    NOTES => q{
+        Tags read from the 'fmt ' header of a DSF (DSD Stream File) audio files. As
+        well, ID3 metadata may also exist in these files. See
+        L<https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf>
+        for the specification.
+    },
+    3 => 'FormatVersion',
+    4 => { Name => 'FormatID', PrintConv => { 0 => 'DSD Raw' }},
+    5 => {
+        Name => 'ChannelType',
+        PrintConv => {
+            1 => 'Mono',
+            2 => 'Stereo (Left, Right)',
+            3 => '3 Channels (Left, Right, Center)',
+            4 => 'Quad (Left, Right, Back L, Back R)',
+            5 => '4 Channels (Left, Right, Center, Bass)',
+            6 => '5 Channels (Left, Right, Center, Back L, Back R)',
+            7 => '5.1 Channels (Left, Right, Center, Bass, Back L, Back R)',
+        },
+    },
+    6 => 'ChannelCount',
+    7 => 'SampleRate',
+    8 => 'BitsPerSample',
+    9 => { Name => 'SampleCount', Format => 'int64u' },
+    11 => 'BlockSize',
+);
+
+#------------------------------------------------------------------------------
+# Extract metadata from a DSF file
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid DSF file
+sub ProcessDSF($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($buff, $buf2, $tagTablePtr);
+
+    # verify this is a valid DSF file
+    return 0 unless $raf->Read($buff, 40) == 40;
+    return 0 unless $buff =~ /^DSD \x1c\0{7}.{16}fmt /s;
+    $et->SetFileType();   # set the FileType tag
+    my $tagTbl = GetTagTable('Image::ExifTool::DSF::Main');
+    SetByteOrder('II');
+    my $fmtLen = Get64u(\$buff,32);
+    unless ($fmtLen > 12 and $fmtLen < 1000 and
+        $raf->Read($buf2, $fmtLen - 12) == $fmtLen - 12)
+    {
+        $et->Warn('Error reading DSF fmt chunk');
+        return 1;
+    }
+    my $fileSize = Get64u(\$buff, 12);
+    my $metaPos = Get64u(\$buff, 20);
+    $buff = substr($buff, 28) . $buf2;
+#
+# process the DSF 'fmt ' chunk
+#
+    my %dirInfo = (
+        DataPt => \$buff,
+        DirStart => 0,
+        DirLen => length($buff),
+    );
+    $et->ProcessBinaryData(\%dirInfo, $tagTbl);
+#
+# process ID3v2 if it exists
+#
+    my $metaLen = $fileSize - $metaPos;
+    if ($metaPos and $metaLen > 0 and $metaLen < 20000000 and
+        $raf->Seek($metaPos, 0) and $raf->Read($buff, $metaLen) == $metaLen)
+    {
+        $dirInfo{DataPos} = $metaPos;
+        $dirInfo{DirLen}  = $metaLen;
+        my $id3Tbl = GetTagTable('Image::ExifTool::ID3::Main');
+        $et->ProcessDirectory(\%dirInfo, $id3Tbl);
+    }
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::DSF - Read DSF meta information
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read DSF
+(DSD Stream File) audio files.
+
+=head1 AUTHOR
+
+Copyright 2003-2025, 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.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/DSF Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

package/bin/exiftool_files/lib/Image/ExifTool/DV.pm

@@ -123,7 +123,7 @@ my @dvTags = (
 # DV tags
 %Image::ExifTool::DV::Main = (
     GROUPS => { 2 => 'Video' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'The following tags are extracted from DV videos.',
     DateTimeOriginal => {
         Description => 'Date/Time Original',

package/bin/exiftool_files/lib/Image/ExifTool/EXE.pm

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.23';
+$VERSION = '1.25';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -450,7 +450,7 @@ my %int32uTime = (
 # (see http://msdn.microsoft.com/en-us/library/aa381049.aspx)
 %Image::ExifTool::EXE::PEString = (
     GROUPS => { 2 => 'Other' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Resource strings found in Windows PE files.  The B<TagID>'s are not shown
         because they are the same as the B<Tag Name>.  ExifTool will extract any
@@ -962,6 +962,7 @@ sub ProcessPEVersion($$)
         $pos = ($pos + 3) & 0xfffffffc;  # align on a 4-byte boundary
         last if $pos + 6 > $end;
         $len = Get16u($dataPt, $pos);
+        return 0 if $pos + $len > $end;
         $valLen = Get16u($dataPt, $pos + 2);
         $type = Get16u($dataPt, $pos + 4);
         return 0 unless $len or $valLen;  # prevent possible infinite loop
@@ -985,9 +986,11 @@ sub ProcessPEVersion($$)
             my $tagTablePtr = GetTagTable('Image::ExifTool::EXE::PEString');
             for ($index = 0; $pt + 6 < $pos; ++$index) {
                 $len = Get16u($dataPt, $pt);
+                $len or $et->Warn('Invalid PEString entry'), last;
                 $valLen = Get16u($dataPt, $pt + 2);
                 # $type = Get16u($dataPt, $pt + 4);
                 my $entryEnd = $pt + $len;
+                return 0 if $entryEnd > $end;
                 # get tag ID (converted to UTF8)
                 ($string, $pt) = ReadUnicodeStr($dataPt, $pt + 6, $entryEnd);
                 unless ($index) {

package/bin/exiftool_files/lib/Image/ExifTool/FLIF.pm

@@ -36,7 +36,7 @@ my %flifMap = (
 # FLIF tags
 %Image::ExifTool::FLIF::Main = (
     GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
-    VARS => { HEX_ID => 0 },
+    VARS => { ID_FMT => 'dec' },
     NOTES => q{
         Information extracted from Free Lossless Image Format files.  See
         L<http://flif.info/> for more information.

package/bin/exiftool_files/lib/Image/ExifTool/FLIR.pm

@@ -476,7 +476,7 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     GROUPS => { 0 => 'APP1', 2 => 'Image' },
     PROCESS_PROC => \&ProcessMeasInfo,
     FORMAT => 'int16u',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Tags listed below are only for the first measurement tool, however multiple
         measurements may be added, and information is extracted for all of them. 
@@ -548,7 +548,7 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
 %Image::ExifTool::FLIR::TextInfo = (
     GROUPS => { 0 => 'APP1', 2 => 'Image' },
     PROCESS_PROC => \&ProcessFLIRText,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     Label0 => { },
     Value0 => { },
     Label1 => { },
@@ -564,7 +564,7 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
 %Image::ExifTool::FLIR::ParamInfo = (
     GROUPS => { 0 => 'APP1', 2 => 'Image' },
     PROCESS_PROC => \&ProcessFLIRText,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     Generated => {
         Name => 'DateTimeGenerated',
         Description => 'Date/Time Generated',

package/bin/exiftool_files/lib/Image/ExifTool/FlashPix.pm

@@ -1093,7 +1093,7 @@ my %fpxFileType = (
 %Image::ExifTool::FlashPix::DocTable = (
     GROUPS => { 1 => 'MS-DOC', 2 => 'Document' },
     NOTES => 'Tags extracted from the Microsoft Word document table.',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     CommentBy => {
         Groups => { 2 => 'Author' },
         Notes => 'enable L<Duplicates|../ExifTool.html#Duplicates> option to extract all entries',

package/bin/exiftool_files/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.99';
+$VERSION = '2.00';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -643,8 +643,8 @@ my %faceCategories = (
         Writable => 'int16u',
         PrintConv => {
             1 => 'Right',
-            2 => 'Up', # (or Left?, forum17591)
-            3 => 'Left', # (or Up?, forum17591)
+            2 => 'Left', #forum17591
+            3 => 'Up', #forum17591
             4 => 'Down',
         },
     },
@@ -960,6 +960,7 @@ my %faceCategories = (
             3 => 'Right Eye',
             7 => 'Body',
             8 => 'Head',
+            9 => 'Both Eyes', #forum17635
             11 => 'Bike',
             12 => 'Body of Car',
             13 => 'Front of Car',
@@ -1190,7 +1191,7 @@ my %faceCategories = (
 %Image::ExifTool::FujiFilm::FaceRecInfo = (
     PROCESS_PROC => \&ProcessFaceRec,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'Face recognition information.',
     Face1Name => { },
     Face2Name => { },

package/bin/exiftool_files/lib/Image/ExifTool/GIF.pm

@@ -33,7 +33,7 @@ my @appExtensions = ( 'XMP Data/XMP', 'ICCRGBG1/012' );
 
 %Image::ExifTool::GIF::Main = (
     GROUPS => { 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         This table lists information extracted from GIF images. See
         L<http://www.w3.org/Graphics/GIF/spec-gif89a.txt> for the official GIF89a

package/bin/exiftool_files/lib/Image/ExifTool/GM.pm

@@ -136,7 +136,7 @@ my %channelStruct = (
 %Image::ExifTool::GM::marl = (
     PROCESS_PROC => \&Process_marl,
     GROUPS => { 2 => 'Other' },
-    VARS => { NO_ID => 1, NO_LOOKUP => 1 },
+    VARS => { ID_FMT => 'none', NO_LOOKUP => 1 },
     NOTES => q{
         Tags extracted from the 'ctbx' 'marl' (Marlin) box of timed PDR metadata
         from GM cars.  Use the -ee (L<API ExtractEmbedded|../ExifTool.html#ExtractEmbedded>) option to extract this

package/bin/exiftool_files/lib/Image/ExifTool/Geolocation.pm

@@ -401,11 +401,13 @@ sub GetEntry($;$$)
         my $xlat = $langLookup{$lang};
         # load language lookups if  not done already
         if (not defined $xlat) {
-            if (eval "require '$geoDir/GeoLang/$lang.pm'") {
+            unshift @INC, $geoDir;  # make sure $geoDir is first in path
+            if (eval "require 'GeoLang/$lang.pm'") {
                 my $trans = "Image::ExifTool::GeoLang::${lang}::Translate";
                 no strict 'refs';
                 $xlat = \%$trans if %$trans;
             }
+            shift @INC;
             # read user-defined language translations
             if (%Image::ExifTool::Geolocation::geoLang) {
                 my $userLang = $Image::ExifTool::Geolocation::geoLang{$lang};