exiftool_vendored 13.38.0 → 13.41.0

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

@@ -35,7 +35,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.82';
+$VERSION = '1.83';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -1345,6 +1345,23 @@ Category:       foreach $category (qw{pos track alt orient atemp err dop}) {
             if (defined $dop) {
                 $et->SetNewValue(GPSMeasureMode => $mm, %opts);
                 $et->SetNewValue(GPSDOP => $dop, %opts);
+                # also set GPSHPositioningError if specified
+                my $hposErr = $$et{OPTIONS}{GeoHPosErr};
+                if ($hposErr) {
+                    $hposErr =~ s/gpsdop/GPSDOP/i;
+                    my $GPSDOP = $dop;
+                    local $SIG{'__WARN__'} = \&Image::ExifTool::SetWarning;
+                    undef $Image::ExifTool::evalWarning;
+                    #### eval GeoHPosErr ($GPSDOP)
+                    $hposErr = eval $hposErr;
+                    my $err = Image::ExifTool::GetWarning() || $@;
+                    if ($err) {
+                        $err = Image::ExifTool::CleanWarning($err);
+                        $et->Warn("Error calculating GPSHPositioningError: $err", 1);
+                    } else {
+                        $et->SetNewValue(GPSHPositioningError => $hposErr, %opts);
+                    }
+                }
             }
         }
         unless ($xmp) {

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

@@ -26,7 +26,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 sub ProcessICC($$);
 sub ProcessICC_Profile($$$);
@@ -330,6 +330,7 @@ my %manuSig = ( #6
     'WTG2' => 'Ware To Go',
     'WYSE' => 'WYSE Technology',
     'XERX' => 'Xerox Corporation',
+    'XM  ' => 'Xiaomi',
     'XRIT' => 'X-Rite',
     'yxym' => 'YxyMaster GmbH',
     'Z123' => "Lavanya's test Company",

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

@@ -4,6 +4,7 @@
 # Description:  Read meta information from MS Shell Link files
 #
 # Revisions:    2009/09/19 - P. Harvey Created
+#               2025/10/20 - PH Added .URL file support
 #
 # References:   1) http://msdn.microsoft.com/en-us/library/dd871305(PROT.10).aspx
 #               2) http://www.i2s-lab.com/Papers/The_Windows_Shortcut_File_Format.pdf
@@ -17,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Microsoft;
 
-$VERSION = '1.11';
+$VERSION = '1.13';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -190,7 +191,7 @@ sub ProcessLinkInfo($$$);
     },
     0xa0000001 => {
         Name => 'EnvVarData',
-        SubDirectory => { TagTable => 'Image::ExifTool::LNK::UnknownData' },
+        SubDirectory => { TagTable => 'Image::ExifTool::LNK::EnvVarData' },
     },
     0xa0000002 => {
         Name => 'ConsoleData',
@@ -447,6 +448,52 @@ sub ProcessLinkInfo($$$);
     },
 );
 
+%Image::ExifTool::LNK::EnvVarData = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Other' },
+    8 => {
+        Name => 'EnvironmentTarget',
+        Format => 'string[260]',
+    },
+    268 => {
+        Name => 'EnvironmentTargetUnicode',
+        Format => 'unicode[260]',
+    },
+);
+
+%Image::ExifTool::LNK::INI = (
+    GROUPS => { 2 => 'Document' },
+    VARS => { ID_FMT => 'none' },
+    NOTES => 'Tags found in INI-format Windows .URL files.',
+    URL         => { },
+    IconFile    => { },
+    IconIndex   => { },
+    WorkingDirectory => { },
+    HotKey      => { },
+    ShowCommand => { PrintConv => { 1 => 'Normal', 2 => 'Minimized', 3 => 'Maximized' } },
+    Modified    => {
+        Groups => { 2 => 'Time' },
+        Format => 'int64u',
+        Groups => { 2 => 'Time' },
+        # convert time from 100-ns intervals since Jan 1, 1601 (NC)
+        RawConv => q{
+            my $dat = pack('H*', $val);
+            return undef if length $dat < 8;
+            my ($lo, $hi) = unpack('V2', $dat);
+            return undef unless $lo or $hi;
+            return $hi * 4294967296 + $lo;
+        },
+        ValueConv => '$val=$val/1e7-11644473600; ConvertUnixTime($val,1)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    Author      => { Groups => { 2 => 'Author' } },
+    WhatsNew    => { },
+    Comment     => { },
+    Desc        => { },
+    Roamed      => { Notes => '1 if synced across multiple devices' },
+    IDList      => { },
+);
+
 #------------------------------------------------------------------------------
 # Extract null-terminated ASCII or Unicode string from buffer
 # Inputs: 0) buffer ref, 1) start position, 2) flag for unicode string
@@ -588,6 +635,27 @@ sub ProcessLinkInfo($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Extract information from a INI-format file
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid INI file
+sub ProcessINI($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+    local $/ = "\x0d\x0a";
+    my $tagTablePtr = GetTagTable('Image::ExifTool::LNK::INI');
+    while ($raf->ReadLine($buff)) {
+        if ($buff =~ /^\[(.*?)\]/) {
+            $et->VPrint(0, "$1 section:\n");
+        } elsif ($buff =~ /^\s*(\w+)=(.*)\x0d\x0a$/) {
+            $et->HandleTag($tagTablePtr, $1, $2, MakeTagInfo => 1);
+        }
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Extract information from a MS Shell Link (Windows shortcut) file
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
@@ -600,7 +668,13 @@ sub ProcessLNK($$)
 
     # read LNK file header
     $raf->Read($buff, 0x4c) == 0x4c or return 0;
-    $buff =~ /^.{4}\x01\x14\x02\0{5}\xc0\0{6}\x46/s or return 0;
+    unless ($buff =~ /^.{4}\x01\x14\x02\0{5}\xc0\0{6}\x46/s) {
+        # check for INI-format LNK file (eg. .URL file)
+        return undef unless $buff =~ /^\[[InternetShortcut\][\x0d\x0a]/;
+        $raf->Seek(0,0) or return 0;
+        $et->SetFileType('URL', 'application/x-mswinurl');
+        return ProcessINI($et, $dirInfo);
+    };
     $len = unpack('V', $buff);
     $len >= 0x4c or return 0;
     if ($len > 0x4c) {

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

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::ZIP;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 # test for recognized OOXML document extensions
 my %isOOXML = (
@@ -27,6 +27,7 @@ my %isOOXML = (
     XLAM => 1,
     XLSX => 1,  XLSM => 1,  XLSB => 1,
     XLTX => 1,  XLTM => 1,
+    VSDX => 1,
 );
 
 # generate reverse lookup for file type based on MIME
@@ -57,7 +58,7 @@ my @vectorVals;
     VARS => { ID_FMT => 'none' },
     NOTES => q{
         The Office Open XML (OOXML) format was introduced with Microsoft Office 2007
-        and is used by file types such as DOCX, PPTX and XLSX.  These are
+        and is used by file types such as DOCX, PPTX, XLSX and VSDX.  These are
         essentially ZIP archives containing XML files.  The table below lists some
         tags which have been observed in OOXML documents, but ExifTool will extract
         any tags found from XML files of the OOXML document properties ("docProps")

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

@@ -31,6 +31,7 @@
 #              25) Karsten Gieselmann private communication (OM series)
 #              IB) Iliah Borg private communication (LibRaw)
 #              NJ) Niels Kristian Bech Jensen private communication
+#              KG) Karsten Gieselmann private communication
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Olympus;
@@ -41,7 +42,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.91';
+$VERSION = '2.93';
 
 sub PrintLensInfo($$$);
 
@@ -200,7 +201,9 @@ my %olympusLensTypes = (
   # '65535 07 40' - Seen for LUMIX S 16-35/F4 on Panasonic DC-S1H (ref PH)
     # Other makes
     '24 01 10' => 'Venus Optics Laowa 50mm F2.8 2x Macro', #DonKomarechka
-    'f7 03 10' => 'LAOWA C&D-Dreamer MFT 7.5mm F2.0', #forum3833
+    '247 03 10' => 'LAOWA C&D-Dreamer MFT 7.5mm F2.0', #forum3833
+    '247 10 10' => 'LAOWA C&D-Dreamer MFT 6.0mm F2.0', #KG
+    '65522 02 10' => 'Xiaoyi 42.5mm F1.8', #github363
 );
 
 # lookup for Olympus camera types (ref PH)

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.58';
+$VERSION = '3.59';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -1947,7 +1947,8 @@ my %binaryDataAttrs = (
             '0 28' => 'Quick Macro', # (Q)
             '0 29' => 'Forest', # (Q)
             '0 30' => 'Backlight Silhouette', # (Q)
-            '0 32' => 'DOF', #PH (GR III)
+            '0 31' => 'Max. Aperture Priority', #KG (Ricoh GR III)
+            '0 32' => 'DOF', #PH (GR III)       #KG ???? GR III 'DOF Priority (Deep)' is mapped to '0 2' ???
             # AUTO PICT modes (auto-selected)
             '1 4'  => 'Auto PICT (Standard)', #13
             '1 5'  => 'Auto PICT (Portrait)', #7 (K100D)
@@ -1962,7 +1963,11 @@ my %binaryDataAttrs = (
             '2 22' => 'Shallow DOF (HyP)', #PH (K-5)
             '3 0'  => 'Green Mode', #16
             '4 0'  => 'Shutter Speed Priority',
+            '4 2'  => 'Shutter Speed Priority 2', #KG  Coding error? 'DOF Priority' in Tv makes no sense
+            '4 31' => 'Shutter Speed Priority 31',#KG  Coding error? 'Max Aperture' in Tv makes no sense
             '5 0'  => 'Aperture Priority',
+            '5 2'  => 'Aperture Priority 2',      #KG  Coding error? 'DOF Priority' in Av makes no sense
+            '5 31' => 'Aperture Priority 31',     #KG  Coding error? 'DOF Priority' in Av makes no sense
             '6 0'  => 'Program Tv Shift',
             '7 0'  => 'Program Av Shift', #19
             '8 0'  => 'Manual',

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.21';
+$VERSION = '3.23';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -578,11 +578,29 @@ my %userDefined = (
                 return substr($val, 8, $len-8);
             },
             Binary => 1,
+        },{
+            Name => 'HighlightMarkers',
+            # (DJI Action 4, forum17700)
+            Notes => 'written by some DJI models',
+            Condition => '$$valPt =~ /^data.{4}hglg.{5}/s',
+            RawConv => q{
+                my $len = unpack 'x4N', $val;
+                return undef if $len < 13 or $len + 4 > length($val);
+                my $n = int(($len - 13) / 5);
+                my @a = map $_/1000, unpack "x17(xV)$n", $val;
+                return \@a;
+            },
         },{
             Unknown => 1,
             Binary => 1,
         },
-        # (also Samsung WB750 uncompressed thumbnail data starting with "SDIC\0")
+        # DJI videos also have block of offset/size of various atoms, eg)
+        #        Atom name   ????        Offset      Size
+        #  0000: 63 6f 76 72 00 00 00 00 00 ed 6f da 00 0a 46 e0 [covr......o...F.]
+        #  0010: 73 6e 61 6c 00 00 00 00 00 f7 b6 d2 00 0a 46 e0 [snal..........F.]
+        #  0020: 68 67 6c 67 00 00 00 00 01 02 0a a2 00 00 00 21 [hglg...........!]
+        #  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        # (also Samsung WB750 uncompressed thumbnail data starting with "SDIC\0")        
     ],
     # fre1 - 4 bytes: "june" (Kodak PixPro SP360)
     frea => {
@@ -10515,9 +10533,9 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             $et->Warn($warnStr);
         }
     }
-    # tweak file type based on track content ("iso*" and "dash" ftyp only)
+    # tweak file type based on track content ("iso*" and "dash" ftyp only ["mp42" added in 13.39])
     if ($topLevel and $$et{FileType} and $$et{FileType} eq 'MP4' and
-        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and
+        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash|mp42)/ and
         $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
     {
         $et->OverrideFileType('M4A', 'audio/mp4');

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 111 different types of timed GPS metadata from video files.
+        currently reads 116 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")' },
@@ -1006,6 +1006,28 @@ sub HandleTextTags($$$)
     undef %$tags;   # clear the hash
 }
 
+#------------------------------------------------------------------------------
+# Handle new time in NMEA stream and store queued tags if necessary
+# Inputs: 0) ExifTool ref, 1) time string, 2) tag table ref, 3) tags hash
+sub HandleNewTime($$$$)
+{
+    my ($et, $time, $tagTbl, $tags) = @_;
+    if ($$et{LastTime}) {
+        if ($$et{LastTime} eq $time) {
+            # combine with the previous NMEA sentence
+            $$et{DOC_NUM} = $$et{LastDoc};
+        } elsif (%$tags) {
+            # handle existing tags and start a new document
+            # (see https://exiftool.org/forum/index.php?msg=75422)
+            HandleTextTags($et, $tagTbl, $tags);
+            # increment document number and update document count if necessary
+            $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
+        }
+    }
+    $$et{LastTime} = $time;
+    $$et{LastDoc} = $$et{DOC_NUM};
+}
+
 #------------------------------------------------------------------------------
 # Process subtitle 'text'
 # Inputs: 0) ExifTool ref, 1) data ref or dirInfo ref, 2) tag table ref
@@ -1032,41 +1054,18 @@ sub Process_text($$$;$)
                 next;
             }
             my $time = "$1:$2:$3";
-            if ($$et{LastTime}) {
-                if ($$et{LastTime} eq $time) {
-                    # combine with the previous NMEA sentence
-                    $$et{DOC_NUM} = $$et{LastDoc};
-                } elsif (%tags) {
-                    # handle existing tags and start a new document
-                    # (see https://exiftool.org/forum/index.php?msg=75422)
-                    HandleTextTags($et, $tagTbl, \%tags);
-                    undef %tags;
-                    # increment document number and update document count if necessary
-                    $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
-                }
-            }
-            $$et{LastTime} = $time;
-            $$et{LastDoc} = $$et{DOC_NUM};
+            HandleNewTime($et, $time, $tagTbl, \%tags);
             my $year = $14 + ($14 >= 70 ? 1900 : 2000);
-            my $dateTime = sprintf('%.4d:%.2d:%.2d %sZ', $year, $13, $12, $time);
-            $tags{GPSDateTime} = $dateTime;
+            my $date = sprintf('%.4d:%.2d:%.2d', $year, $13, $12);
+            $$et{LastDate} = $date;
+            $tags{GPSDateTime} = "$date ${time}Z";
             $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
             $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
             $tags{GPSSpeed} = $10 * $knotsToKph if length $10;
             $tags{GPSTrack} = $11 if length $11;
         } elsif ($tag =~ /^[A-Z]{2}GGA$/ and $dat =~ /^,(\d{2})(\d{2})(\d+(?:\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?/s) {
             my $time = "$1:$2:$3";
-            if ($$et{LastTime}) {
-                if ($$et{LastTime} eq $time) {
-                    $$et{DOC_NUM} = $$et{LastDoc};
-                } elsif (%tags) {
-                    HandleTextTags($et, $tagTbl, \%tags);
-                    undef %tags;
-                    $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
-                }
-            }
-            $$et{LastTime} = $time;
-            $$et{LastDoc} = $$et{DOC_NUM};
+            HandleNewTime($et, $time, $tagTbl, \%tags);
             $tags{GPSTimeStamp} = $time;
             $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
             $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
@@ -1114,6 +1113,11 @@ sub Process_text($$$;$)
                 }
             }
         }
+        if ($tags{GPSTimeStamp} and not $tags{GPSDateTime} and $$et{LastDate}) {
+            # hack to fill in missing date for NextBase 662GW
+            # (note: this doesn't necessarily handle day rollover properly)
+            $tags{GPSDateTime} = "$$et{LastDate} $tags{GPSTimeStamp}Z";
+        }
         HandleTextTags($et, $tagTbl, \%tags);
         return;
     }
@@ -3490,14 +3494,17 @@ sub ProcessGarminGPS($$$)
     while ($pos + 20 <= $dataLen) {
         $$et{DOC_NUM} = ++$$et{DOC_COUNT};
         my $time = Image::ExifTool::ConvertUnixTime(Get32u($dataPt, $pos) - $epoch) . 'Z';
-        my $lat = Get32s($dataPt, $pos + 12) * $scl;
-        my $lon = Get32s($dataPt, $pos + 16) * $scl;
+        my $lat = Get32s($dataPt, $pos + 12);
+        my $lon = Get32s($dataPt, $pos + 16);
         my $spd = Get16u($dataPt, $pos + 4); # (in mph)
         $et->HandleTag($tagTbl, 'GPSDateTime',  $time);
-        $et->HandleTag($tagTbl, 'GPSLatitude',  $lat);
-        $et->HandleTag($tagTbl, 'GPSLongitude', $lon);
-        $et->HandleTag($tagTbl, 'GPSSpeed',     $spd);
-        $et->HandleTag($tagTbl, 'GPSSpeedRef', 'M');
+        # skip bad GPS fixes
+        if ($lat != -2147483648 or $lon != -2147483648) {
+            $et->HandleTag($tagTbl, 'GPSLatitude',  $lat * $scl);
+            $et->HandleTag($tagTbl, 'GPSLongitude', $lon * $scl);
+            $et->HandleTag($tagTbl, 'GPSSpeed',     $spd);
+            $et->HandleTag($tagTbl, 'GPSSpeedRef', 'M');
+        }
         $pos += 20;
     }
     delete $$et{DOC_NUM};

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub ProcessR3D($$);
 
@@ -45,7 +45,8 @@ my $errTrunc = 'Truncated R3D file';
     RED2 => { Name => 'Red2Header', SubDirectory => { TagTable => 'Image::ExifTool::Red::RED2' } },
 
     # (upper 4 bits of tag ID are the format code)
-    # ---- format 1 ----
+    # ---- format 0 (int8u) ----
+    # ---- format 1 (string) ----
     0x1000 => 'StartEdgeCode', #1
     0x1001 => { Name => 'StartTimecode', Groups => { 2 => 'Time' } }, #1
     0x1002 => { #1
@@ -104,6 +105,7 @@ my $errTrunc = 'Truncated R3D file';
   # 0x1041 - seen 'NA'
     0x1042 => 'Revision', # ? (seen "TODO, rev EPIC-1.0" and "MYSTERIUM X, rev EPIC-1.0")
   # 0x1051 - seen 'C', 'L'
+  # 0x1052 - seen 'E9'
     0x1056 => 'OriginalFileName',
     0x106e => 'LensMake',
     0x106f => 'LensNumber', # (last 2 hex digits are LensType)
@@ -120,7 +122,8 @@ my $errTrunc = 'Truncated R3D file';
     0x1096 => 'Filter', # optical low-pass filter
     0x10a0 => 'Brain',
     0x10a1 => 'Sensor',
-    # ---- format 2 ----
+    0x10be => 'Quality',
+    # ---- format 2 (float) ----
     0x200d => 'ColorTemperature',
   # 0x200e - (sometimes this is frame rate)
   # 0x2015 - seen '1 1 1' (RGBGain or RGBGamma?)
@@ -130,7 +133,8 @@ my $errTrunc = 'Truncated R3D file';
         Groups => { 2 => 'Video' },
         PrintConv => 'int($val * 1000 + 0.5) / 1000',
     },
-    # ---- format 4 ----
+    # ---- format 3 (int8u?) ----
+    # ---- format 4 (int16u) ----
     0x4037 => { Name => 'CropArea' }, # (NC)
     0x403b => 'ISO',
   # 0x404e - related to CropArea (or "0 0 0 0")
@@ -138,8 +142,12 @@ my $errTrunc = 'Truncated R3D file';
     0x406b => 'FocalLength',
   # 0x4084 - related to ISO?
   # 0x4087 - related to ISO?
-    # ---- format 6 ----
+    # ---- format 5 (int8s?) ----
+    # ---- format 6 (int32s) ----
     0x606c => { Name => 'FocusDistance', ValueConv => '$val/1000', PrintConv => '"$val m"' },
+    # ---- format 7 (undef? structure?) ----
+    # ---- format 8 (int32u?) ----
+    # ---- format 9 (undef?) ----
 );
 
 # RED1 file header (ref PH)
@@ -240,9 +248,11 @@ sub ProcessR3D($$)
         $pos = 0x22;    # directory starts at offset 0x22
     } else {
         # calculate position of Red directory start
-        length($buff) < 0x41 and return $et->Warn($errTrunc);
-        my $n = Get8u(\$buff, 0x40);    # number of "rdi" records
-        $pos = 0x44 + $n * 0x18;
+        $pos = 0x44;
+        length($buff) < $pos and return $et->Warn($errTrunc);
+        $pos += Get8u(\$buff, 0x40) * 0x18;   # skip "rdi" records
+        $pos += Get8u(\$buff, 0x41) * 0x14;   # skip "rda" records
+        $pos += Get8u(\$buff, 0x42) * 0x10;   # skip "rdx" records
     }
     if ($pos + 8 > length $buff) {
         $dirLen = 0;    # find directory the hard way
@@ -253,7 +263,7 @@ sub ProcessR3D($$)
     # do sanity check on the directory size (in case our assumptions were wrong)
     if ($dirLen < 300 or $dirLen >= 2048 or $pos + $dirLen > length $buff) {
         # tag 0x1000 with length 0x000f should be near the directory start
-        $buff =~ /\0\x0f\x10\0/g or return $et->Warn("Can't find Red directory");
+        $buff =~ /\0\x0f\x10[\0\x06]/g or return $et->Warn("Can't find Red directory. Please submit sample for testing");
         $pos = pos($buff) - 4;
         $dirEnd = length $buff;
         undef $dirLen;

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.78';
+$VERSION = '3.79';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -180,6 +180,9 @@ sub PrintInvLensSpec($;$$);
     32889 => 'Sony FE 28-70mm F2 GM',
     32890 => 'Sony FE 400-800mm F6.3-8 G OSS', #JR
     32891 => 'Sony FE 50-150mm F2 GM', #github335
+    32893 => 'Sony FE 100mm F2.8 Macro GM OSS', #JR
+    33093 => 'Sony FE 100mm F2.8 Macro GM OSS + 1.4X Teleconverter', #JR (NC)
+    33094 => 'Sony FE 100mm F2.8 Macro GM OSS + 2X Teleconverter', #JR
 
   # (comment this out so LensID will report the LensModel, which is more useful)
   # 32952 => 'Metabones Canon EF Speed Booster Ultra', #JR (corresponds to 184, but 'Advanced' mode, LensMount reported as E-mount)
@@ -1135,7 +1138,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010h' },
     },{
         Name => 'Tag2010i', # ?
-        Condition => '$$self{Model} =~ /^(ILCE-(6100A?|6400A?|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7|HX95|HX99|RX0M2)|ZV-(1F?|1M2|E10))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6100A?|6400A?|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7A?|HX95|HX99|RX0M2)|ZV-(1[AF]?|1M2|E10))\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010i' },
     },{
         Name => 'Tag_0x2010',
@@ -2209,8 +2212,10 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             400 => 'ILCE-1M2', #PH
             401 => 'DSC-RX1RM3', #JR
             402 => 'ILCE-6400A', #github347
+            403 => 'ILCE-6100A', #JR
             404 => 'DSC-RX100M7A', #github347
             406 => 'ILME-FX2', #JR
+            408 => 'ZV-1A', #JR
         },
     },
     0xb020 => { #2
@@ -8525,7 +8530,7 @@ my %isoSetting2010 = (
     },
     0x002a => [{
         Name => 'Quality2',
-        Condition => '$$self{Model} !~ /^(DSC-RX1RM3|ILCE-(1|1M2|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX2|FX3|FX30)|ZV-(E1|E10M2))\b/',
+        Condition => '$$self{Model} !~ /^(DSC-RX1RM3|ILCE-(1|1M2|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX2|FX3A?|FX30)|ZV-(E1|E10M2))\b/',
         PrintConv => {
             0 => 'JPEG',
             1 => 'RAW',
@@ -8544,13 +8549,13 @@ my %isoSetting2010 = (
     }],
 #    0x0047 => { # often incorrect, requires 16x for some models
 #        Name => 'SonyImageHeight',
-#        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3|FX30)|ZV-E1)\b/',
+#        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3A?|FX30)|ZV-E1)\b/',
 #        Format => 'int16u',
 #        PrintConv => '$val > 0 ? 8*$val : "n.a."',
 #    },
     0x0053 => {
         Name => 'ModelReleaseYear',
-        Condition => '$$self{Model} !~ /^(DSC-RX1RM3|ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX2|FX3|FX30)|ZV-(E1|E10M2))\b/',
+        Condition => '$$self{Model} !~ /^(DSC-RX1RM3|ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX2|FX3A?|FX30)|ZV-(E1|E10M2))\b/',
         Format => 'int8u',
         PrintConv => 'sprintf("20%.2d", $val)',
     },
@@ -8572,7 +8577,7 @@ my %isoSetting2010 = (
     },
     0x013f => {
         Name => 'ShutterType',
-        Condition => '$$self{Model} =~ /^(DSC-RX100M7|ZV-(1|1F|1M2))\b/',
+        Condition => '$$self{Model} =~ /^(DSC-RX100M7A?|ZV-(1A?|1F|1M2))\b/',
         PrintConv => {
             7 => 'Electronic',
             23 => 'Mechanical',
@@ -10087,7 +10092,7 @@ my %isoSetting2010 = (
     },
     0x088f => {
         Name => 'VignettingCorrParams',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3A?)\b/',
         Format => 'int16s[16]',
     },
     0x0891 => {
@@ -10102,7 +10107,7 @@ my %isoSetting2010 = (
     },
     0x08b5 => {
         Name => 'APS-CSizeCapture',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3A?)\b/',
         PrintConv => {
             0 => 'Off',
             1 => 'On',
@@ -10126,7 +10131,7 @@ my %isoSetting2010 = (
     },
     0x0914 => {
         Name => 'ChromaticAberrationCorrParams',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3A?)\b/',
         Format => 'int16s[32]',
     },
     0x0916 => {