exiftool_vendored 12.60.0 → 12.62.0

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.33';
+$VERSION = '1.34';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -34,6 +34,9 @@ my %resolutionUnit = (
      6 => 'um',
 );
 
+# top-level boxes containing image data
+my %isImageData = ( jp2c=>1, jbrd=>1, jxlp=>1, jxlc=>1 );
+
 # map of where information is written in JPEG2000 image
 my %jp2Map = (
     IPTC         => 'UUID-IPTC',
@@ -428,6 +431,7 @@ my %j2cMarker = (
 # stuff seen in JPEG XL images:
 #
   # jbrd - JPEG Bitstream Reconstruction Data (allows lossless conversion back to original JPG)
+  # jxlp - partial JXL codestream
     jxlc => {
         Name => 'JXLCodestream',
         Format => 'undef',
@@ -930,7 +934,7 @@ sub ProcessJpeg2000Box($$$)
     my $raf = $$dirInfo{RAF};
     my $outfile = $$dirInfo{OutFile};
     my $dirEnd = $dirStart + $dirLen;
-    my ($err, $outBuff, $verbose, $doColour);
+    my ($err, $outBuff, $verbose, $doColour, $md5);
 
     if ($outfile) {
         unless ($raf) {
@@ -948,6 +952,8 @@ sub ProcessJpeg2000Box($$$)
         # (must not set verbose flag when writing!)
         $verbose = $$et{OPTIONS}{Verbose};
         $et->VerboseDir($$dirInfo{DirName}) if $verbose;
+        # do MD5 if requested, but only for top-level image data
+        $md5 = $$et{ImageDataMD5} if $raf;
     }
     # loop through all contained boxes
     my ($pos, $boxLen, $lastBox);
@@ -971,6 +977,11 @@ sub ProcessJpeg2000Box($$$)
         }
         $boxLen = unpack("x$pos N",$$dataPt);   # (length includes header and data)
         $boxID = substr($$dataPt, $pos+4, 4);
+        # (ftbl box contains flst boxes with absolute file offsets, not currently handled)
+        if ($outfile and $boxID eq 'ftbl') {
+            $et->Error("Can't yet handle fragmented JPX files");
+            return -1;
+        }
         # remove old colr boxes if necessary
         if ($doColour and $boxID eq 'colr') {
             if ($doColour == 1) { # did we successfully write the new colr box?
@@ -1007,9 +1018,14 @@ sub ProcessJpeg2000Box($$$)
                     while ($raf->Read($buff, 65536)) {
                         Write($outfile, $buff) or $err = 1;
                     }
-                } elsif ($verbose) {
-                    my $msg = sprintf("offset 0x%.4x to end of file", $dataPos + $base + $pos);
-                    $et->VPrint(0, "$$et{INDENT}- Tag '${boxID}' ($msg)\n");
+                } else {
+                    if ($verbose) {
+                        my $msg = sprintf("offset 0x%.4x to end of file", $dataPos + $base + $pos);
+                        $et->VPrint(0, "$$et{INDENT}- Tag '${boxID}' ($msg)\n");
+                    }
+                    if ($md5 and $isImageData{$boxID}) {
+                        $et->ImageDataMD5($raf, undef, $boxID);
+                    }
                 }
                 last;   # (ignore the rest of the file when reading)
             }
@@ -1026,6 +1042,8 @@ sub ProcessJpeg2000Box($$$)
                     Write($outfile, $$dataPt) or $err = 1;
                     $raf->Read($buff,$boxLen) == $boxLen or $err = '', last;
                     Write($outfile, $buff) or $err = 1;
+                } elsif ($md5 and $isImageData{$boxID}) {
+                    $et->ImageDataMD5($raf, $boxLen, $boxID);
                 } else {
                     $raf->Seek($boxLen, 1) or $err = 'Seek error', last;
                 }
@@ -1038,6 +1056,10 @@ sub ProcessJpeg2000Box($$$)
             # read the box data
             $dataPos = $raf->Tell() - $base;
             $raf->Read($buff,$boxLen) == $boxLen or $err = '', last;
+            if ($md5 and $isImageData{$boxID}) {
+                $md5->add($buff);
+                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $boxLen bytes of $boxID data)\n");
+            }
             $valuePtr = 0;
             $dataLen = $boxLen;
         } elsif ($pos + $boxLen > $dirEnd) {
@@ -1311,7 +1333,7 @@ sub ProcessJP2($$)
 }
 
 #------------------------------------------------------------------------------
-# Read meta information from a JPEG XL image
+# Read/write meta information in a JPEG XL image
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
 # Returns: 1 on success, 0 if this wasn't a valid JPEG XL file, -1 on write error
 sub ProcessJXL($$)
@@ -1340,6 +1362,9 @@ sub ProcessJXL($$)
             $$dirInfo{RAF} = new File::RandomAccess(\$buff);
         } else {
             $et->SetFileType('JXL Codestream','image/jxl', 'jxl');
+            if ($$et{ImageDataMD5} and $raf->Seek(0,0)) {
+                $et->ImageDataMD5($raf, undef, 'JXL');
+            }
             return ProcessJXLCodestream($et, \$hdr);
         }
     } else {

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Minolta;
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
 sub ProcessMRW($$;$);
 sub WriteMRW($$;$);
@@ -489,7 +489,7 @@ sub ProcessMRW($$;$)
         $err and $et->Error("MRW format error", $$et{TIFF_TYPE} eq 'ARW');
     } else {
         $err and $et->Warn("MRW format error");
-        $et->ImageDataMD5($raf, undef, 'raw');
+        $et->ImageDataMD5($raf, undef, 'raw') unless $$et{A100DataOffset};
     }
     return $rtnVal;
 }

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

@@ -64,7 +64,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.21';
+$VERSION = '4.22';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -2300,8 +2300,8 @@ my %base64coord = (
             },
         },
         { # (Z6_2 firmware version 1.00 and Z7II firmware versions 1.00 & 1.01, ref 28)
-            # 0800=Z6/Z7  0801=Z50  0802=Z5   0803=Z6II/Z7II  0804=Zfc
-            Condition => '$$valPt =~ /^080[01234]/',
+            # 0800=Z6/Z7  0801=Z50  0802=Z5   0803=Z6II/Z7II  0804=Zfc  0807=Z30
+            Condition => '$$valPt =~ /^080[012347]/',
             Name => 'ShotInfoZ7II',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ7II',

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.55';
+$VERSION = '1.56';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -41,7 +41,7 @@ my $cryptStream;    # flag that streams are encrypted
 my $lastOffset;     # last fetched object offset
 my %streamObjs;     # hash of stream objects
 my %fetched;        # dicts fetched in verbose mode (to avoid cyclical recursion)
-my $pdfVer;         # version of PDF file being processed
+my $pdfVer;         # version of PDF file being processed (from header)
 
 # filters supported in DecodeStream()
 my %supportedFilter = (
@@ -115,6 +115,7 @@ my %supportedFilter = (
     CreationDate => {
         Name => 'CreateDate',
         Writable => 'date',
+        PDF2 => 1,  # not deprecated in PDF 2.0
         Groups => { 2 => 'Time' },
         Shift => 'Time',
         PrintConv => '$self->ConvertDateTime($val)',
@@ -123,6 +124,7 @@ my %supportedFilter = (
     ModDate => {
         Name => 'ModifyDate',
         Writable => 'date',
+        PDF2 => 1,  # not deprecated in PDF 2.0
         Groups => { 2 => 'Time' },
         Shift => 'Time',
         PrintConv => '$self->ConvertDateTime($val)',
@@ -168,7 +170,10 @@ my %supportedFilter = (
     Lang       => 'Language',
     PageLayout => { },
     PageMode   => { },
-    Version    => 'PDFVersion',
+    Version    => {
+        Name => 'PDFVersion',
+        RawConv => '$$self{PDFVersion} = $val if $$self{PDFVersion} < $val; $val',
+    },
 );
 
 # tags extracted from the PDF Encrypt dictionary
@@ -1754,7 +1759,7 @@ sub ProcessDict($$$$;$$)
     my $unknown = $$tagTablePtr{EXTRACT_UNKNOWN};
     my $embedded = (defined $unknown and not $unknown and $et->Options('ExtractEmbedded'));
     my @tags = @{$$dict{_tags}};
-    my ($next, %join);
+    my ($next, %join, $validInfo);
     my $index = 0;
 
     $nesting = ($nesting || 0) + 1;
@@ -1775,6 +1780,7 @@ sub ProcessDict($$$$;$$)
             last;
         }
     }
+    $validInfo = ($et->Options('Validate') and $tagTablePtr eq \%Image::ExifTool::PDF::Info);
 #
 # extract information from all tags in the dictionary
 #
@@ -1810,6 +1816,10 @@ sub ProcessDict($$$$;$$)
                 $isSubDoc = 1;  # treat as a sub-document
             }
         }
+        if ($validInfo and $$et{PDFVersion} >= 2.0 and (not $tagInfo or not $$tagInfo{PDF2})) {
+            my $name = $tagInfo ? ":$$tagInfo{Name}" : " Info tag '${tag}'";
+            $et->Warn("PDF$name is deprecated in PDF 2.0");
+        }
         if ($verbose) {
             my ($val2, $extra);
             if (ref $val eq 'SCALAR') {
@@ -2118,9 +2128,8 @@ sub ReadPDF($$)
     $raf->Read($buff, 1024) >= 8 or return 0;
     $buff =~ /^(\s*)%PDF-(\d+\.\d+)/ or return 0;
     $$et{PDFBase} = length $1 and $et->Warn('PDF header is not at start of file',1);
-    $pdfVer = $2;
+    $pdfVer = $$et{PDFVersion} = $2;
     $et->SetFileType();   # set the FileType tag
-    $et->Warn("The PDF $pdfVer specification is held hostage by the ISO") if $pdfVer >= 2.0;
     # store PDFVersion tag
     my $tagTablePtr = GetTagTable('Image::ExifTool::PDF::Root');
     $et->HandleTag($tagTablePtr, 'Version', $pdfVer);
@@ -2384,8 +2393,8 @@ This module is loaded automatically by Image::ExifTool when required.
 This code reads meta information from PDF (Adobe Portable Document Format)
 files.  It supports object streams introduced in PDF-1.5 but only with a
 limited set of Filter and Predictor algorithms, however all standard
-encryption methods through PDF-1.7 extension level 3 are supported,
-including AESV2 (AES-128) and AESV3 (AES-256).
+encryption methods through PDF-2.0 are supported, including AESV2 (AES-128)
+and AESV3 (AES-256).
 
 =head1 AUTHOR
 

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.84';
+$VERSION = '2.85';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -470,6 +470,9 @@ my %eeBox2 = (
     vide => { avcC => 'stsd' }, # (parses H264 video stream)
 );
 
+# image types in AVIF and HEIC files
+my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
+
 # QuickTime atoms
 %Image::ExifTool::QuickTime::Main = (
     PROCESS_PROC => \&ProcessMOV,
@@ -2884,7 +2887,7 @@ my %eeBox2 = (
                 7 => 'SMPTE 240',
                 8 => 'Generic film (color filters using illuminant C)',
                 9 => 'BT.2020, BT.2100',
-                10 => 'SMPTE 428 (CIE 1921 XYZ)',
+                10 => 'SMPTE 428 (CIE 1931 XYZ)', #forum14766
                 11 => 'SMPTE RP 431-2',
                 12 => 'SMPTE EG 432-1',
                 22 => 'EBU Tech. 3213-E',
@@ -8784,15 +8787,15 @@ sub HandleItemInfo($)
                     $et->VPrint(0, "$$et{INDENT}    [snip $snip bytes]\n") if $snip;
                 }
             }
-            # do MD5 checksum of AVIF "av01" image data
-            if ($type eq 'av01' and $$et{ImageDataMD5}) {
+            # do MD5 checksum of AVIF "av01" and HEIC image data
+            if ($isImageData{$type} and $$et{ImageDataMD5}) {
                 my $md5 = $$et{ImageDataMD5};
                 my $tot = 0;
                 foreach $extent (@{$$item{Extents}}) {
-                    $raf->Seek($$extent[1] + $base, 0) or $et->Warn('Seek error in av01 image data'), last;
-                    $tot += $et->ImageDataMD5($raf, $$extent[2], 'av01 image', 1);
+                    $raf->Seek($$extent[1] + $base, 0) or $et->Warn("Seek error in $type image data"), last;
+                    $tot += $et->ImageDataMD5($raf, $$extent[2], "$type image", 1);
                 }
-                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $tot bytes of av01 data)\n") if $tot;
+                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $tot bytes of $type data)\n") if $tot;
             }
             next unless $name;
             # assemble the data for this item

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

@@ -28,7 +28,7 @@ sub Process360Fly($$$);
 sub ProcessFMAS($$$);
 sub ProcessCAMM($$$);
 
-my $debug;  # set to 1 for extra debugging messages
+my $debug;  # set to 'tEST' (all caps) for extra debugging messages
 
 # QuickTime data types that have ExifTool equivalents
 # (ref https://developer.apple.com/library/content/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW35)
@@ -89,6 +89,7 @@ my %insvDataLen = (
     0x600 => 8,     # timestamps (ref 6)
     0x700 => 53,    # GPS
   # 0x900 => 48,    # ? (Insta360 X3)
+  # 0xa00 => 5?,    # ? (Insta360 ONE RS)
   # 0xb00 => 10,    # ? (Insta360 X3)
 );
 
@@ -1134,6 +1135,7 @@ sub ProcessSamples($)
     my $et = shift;
     my ($raf, $ee) = @$et{qw(RAF ee)};
     my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent, $md5);
+    my ($mdatOffset, $mdatSize); # (for range-checking samples when MD5 is done)
 
     return unless $ee;
     delete $$et{ee};    # use only once
@@ -1230,6 +1232,10 @@ Sample:     for ($i=0; ; ) {
         $oldIndent = $$et{INDENT};
         $$et{INDENT} = '';
     }
+    if ($md5) {
+        $mdatSize = $$et{MediaDataSize};
+        $mdatOffset = $$et{MediaDataOffset} if defined $mdatSize;
+    }
     # get required information from avcC box if parsing video data
     if ($type eq 'avcC') {
         $hdrLen = (Get8u(\$$ee{avcC}, 4) & 0x03) + 1;
@@ -1243,10 +1249,25 @@ Sample:     for ($i=0; ; ) {
         delete $$et{FoundGPSLatitude};
         delete $$et{FoundGPSDateTime};
 
-        # read the sample data
+        # range check the sample data for MD5 if necessary
         my $size = $$size[$i];
-        next unless $raf->Seek($$start[$i], 0) and $raf->Read($buff, $size) == $size;
-
+        if (defined $mdatOffset) {
+            if ($$start[$i] < $mdatOffset) {
+                $et->Warn("Sample $i for '${type}' data is before start of mdat");
+            } elsif ($$start[$i] + $size > $mdatOffset + $mdatSize) {
+                $et->Warn("Sample $i for '${type}' data runs off end of mdat");
+                $size = $mdatOffset + $mdatSize - $$start[$i];
+                $size = 0 if $size < 0;
+            }
+        }
+        # read the sample data
+        $raf->Seek($$start[$i], 0) or $et->WarnOnce("Seek error in $type data"), next;
+        my $n = $raf->Read($buff, $size);
+        unless ($n == $size) {
+            $et->WarnOnce("Error reading $type data");
+            next unless $n;
+            $size = $n;
+        }
         if ($md5) {
             $md5->add($buff);
             $md5size += length $buff;
@@ -1455,16 +1476,15 @@ sub ProcessFreeGPS($$$)
             $et->VerboseDump(\$buf2);
         }
         # (extract longitude as 9 digits, not 8, ref PH)
-        return 0 unless $buf2 =~ /^.{8}(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}).(.{15})([NS])(\d{8})([EW])(\d{9})(\d{8})?/s;
-        ($yr,$mon,$day,$hr,$min,$sec,$lbl,$latRef,$lat,$lonRef,$lon,$spd) = ($1,$2,$3,$4,$5,$6,$7,$8,$9/1e4,$10,$11/1e4,$12);
-        if (defined $spd) { # (Azdome)
-            $spd += 0;  # remove leading 0's
-        } elsif ($buf2 =~ /^.{57}([-+]\d{4})(\d{3})/s) { # (EEEkit)
-            # $alt = $1 + 0;  (doesn't look right for my sample, but the Ambarella A12 text has this)
-            $spd = $2 + 0;
-        }
-        $lbl =~ s/\0.*//s;  $lbl =~ s/\s+$//;  # truncate at null and remove trailing spaces
-        push @xtra, UserLabel => $lbl if length $lbl;
+        if ($buf2 =~ /^.{8}(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}).(.{15})([NS])(\d{8})([EW])(\d{9})(\d{8})?/s) {
+            ($yr,$mon,$day,$hr,$min,$sec,$lbl,$latRef,$lat,$lonRef,$lon,$spd) = ($1,$2,$3,$4,$5,$6,$7,$8,$9/1e4,$10,$11/1e4,$12);
+            if (defined $spd) { # (Azdome)
+                $spd += 0;  # remove leading 0's
+            } elsif ($buf2 =~ /^.{57}([-+]\d{4})(\d{3})/s) { # (EEEkit)
+                # $alt = $1 + 0;  (doesn't look right for my sample, but the Ambarella A12 text has this)
+                $spd = $2 + 0;
+            }
+        }
         # extract accelerometer data (ref PH)
         if ($buf2 =~ /^.{65}(([-+]\d{3})([-+]\d{3})([-+]\d{3})([-+]\d{3})*)/s) {
             $_ = $1;
@@ -1472,7 +1492,15 @@ sub ProcessFreeGPS($$$)
             s/([-+])/ $1/g;  s/^ //;
             push @xtra, AccelerometerData => $_;
         } elsif ($buf2 =~ /^.{173}([-+]\d{3})([-+]\d{3})([-+]\d{3})/s) { # (Azdome)
+            # (Adzome may contain acc and date/time/label even if GPS doesn't exist)
             @acc = ($1/100, $2/100, $3/100);
+            if (not defined $yr and $buf2 =~ /^.{8}(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}).(.{15})/s) {
+                ($yr,$mon,$day,$hr,$min,$sec,$lbl) = ($1,$2,$3,$4,$5,$6,$7);
+            }
+        }
+        if (defined $lbl) {
+            $lbl =~ s/\0.*//s;  $lbl =~ s/\s+$//;  # truncate at null and remove trailing spaces
+            push @xtra, UserLabel => $lbl if length $lbl;
         }
 
     } elsif ($$dataPt =~ /^.{52}(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/s) {
@@ -1741,8 +1769,6 @@ sub ProcessFreeGPS($$$)
 # save tag values extracted by above code
 #
     FoundSomething($et, $tagTbl, $$dirInfo{SampleTime}, $$dirInfo{SampleDuration});
-    # lat/long are in DDDMM.MMMM format
-    ConvertLatLon($lat, $lon) unless $ddd;
     $sec = '0' . $sec unless $sec =~ /^\d{2}/;   # pad integer part of seconds to 2 digits
     if (defined $yr) {
         my $time = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%sZ',$yr,$mon,$day,$hr,$min,$sec);
@@ -1751,8 +1777,12 @@ sub ProcessFreeGPS($$$)
         my $time = sprintf('%.2d:%.2d:%sZ',$hr,$min,$sec);
         $et->HandleTag($tagTbl, GPSTimeStamp => $time);
     }
-    $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
-    $et->HandleTag($tagTbl, GPSLongitude => $lon * ($lonRef eq 'W' ? -1 : 1));
+    if (defined $lat) {
+        # lat/long are in DDDMM.MMMM format unless $ddd is set
+        ConvertLatLon($lat, $lon) unless $ddd;
+        $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
+        $et->HandleTag($tagTbl, GPSLongitude => $lon * ($lonRef eq 'W' ? -1 : 1));
+    }
     $et->HandleTag($tagTbl, GPSAltitude  => $alt) if defined $alt;
     $et->HandleTag($tagTbl, GPSSpeed     => $spd) if defined $spd;
     $et->HandleTag($tagTbl, GPSTrack     => $trk) if defined $trk;
@@ -2835,7 +2865,7 @@ sub ProcessInsta360($;$)
         $raf->Read($buff, $len) == $len or last;
         $et->VerboseDump(\$buff) if $verbose > 2;
         if ($dlen) {
-            if ($len % $dlen) {
+            if ($len % $dlen and $id != 0x700) { # (have seen one 0x700 record which was expected format but not multiple of 53 bytes)
                 $et->Warn(sprintf('Unexpected Insta360 record 0x%x length',$id));
             } elsif ($id == 0x200) {
                 $et->FoundTag(PreviewImage => $buff);
@@ -2865,10 +2895,9 @@ sub ProcessInsta360($;$)
                     $et->HandleTag($tagTbl, VideoTimeStamp => sprintf('%.3f', Get64u(\$buff, $p) / 1000));
                 }
             } elsif ($id == 0x700) {
-                for ($p=0; $p<$len; $p+=$dlen) {
+                for ($p=0; $p+$dlen<=$len; $p+=$dlen) {
                     my $tmp = substr($buff, $p, $dlen);
                     my @a = unpack('VVvaa8aa8aa8a8a8', $tmp);
-                    next unless $a[3] eq 'A';   # (ignore void fixes)
                     unless (($a[5] eq 'N' or $a[5] eq 'S') and # (quick validation)
                             ($a[7] eq 'E' or $a[7] eq 'W' or 
                              # (odd, but I've seen "O" instead of "W".  Perhaps
@@ -2878,6 +2907,7 @@ sub ProcessInsta360($;$)
                         $et->Warn('Unrecognized INSV GPS format');
                         last;
                     }
+                    next unless $a[3] eq 'A';   # (ignore void fixes)
                     $$et{DOC_NUM} = ++$$et{DOC_COUNT};
                     $a[$_] = GetDouble(\$a[$_], 0) foreach 4,6,8,9,10;
                     $a[4] = -abs($a[4]) if $a[5] eq 'S'; # (abs just in case it was already signed)

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.59';
+$VERSION = '3.60';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -161,6 +161,7 @@ sub PrintInvLensSpec($;$$);
     32876 => 'Sony E 11mm F1.8', #JR
     32877 => 'Sony E 15mm F1.4 G', #JR
     32878 => 'Sony FE 20-70mm F4 G', #JR
+    32879 => 'Sony FE 50mm F1.4 GM', #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)
@@ -259,7 +260,10 @@ sub PrintInvLensSpec($;$$);
     50534 => 'Sigma 20mm F1.4 DG DN | A', #JR (022)
     50535 => 'Sigma 24mm F1.4 DG DN | A', #JR (022)
     50536 => 'Sigma 60-600mm F4.5-6.3 DG DN OS | S', #JR (023)
+    50537 => 'Sigma 50mm F2 DG DN | C', #JR (023)
+    50538 => 'Sigma 17mm F4 DG DN | C', #JR (023)
     50539 => 'Sigma 50mm F1.4 DG DN | A', #JR (023)
+    50544 => 'Sigma 23mm F1.4 DC DN | C', #JR (023)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
@@ -1165,7 +1169,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             },
         },{
             Name => 'AFAreaModeSetting',
-            Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
+            Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|ZV-E|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
             Notes => 'NEX, ILCE and some DSC models',
             RawConv => '$$self{AFAreaILCE} = $val',
             DataMember => 'AFAreaILCE',
@@ -1201,7 +1205,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         # observed values in range (0 0) to (640 480), with center (320 240) often seen
         # for NEX-5R/6, positions appear to be in an 11x9 grid
         Name => 'FlexibleSpotPosition',
-        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
+        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|ZV-E|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
         Writable => 'int16u',
         Count => 2,
         Notes => q{
@@ -1669,6 +1673,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     # 0x28 (e) for ILCE-7RM4/9M2, DSC-RX100M7, ZV-1/E10
     # 0x31 (e) for ILCE-1/7M4/7SM3, ILME-FX3
     # 0x32 (e) for ILCE-7RM5, ILME-FX30
+    # 0x33 (e) for ZV-E1
     # first byte decoded: 40, 204, 202, 27, 58, 62, 48, 215, 28, 106, 89 respectively
     {
         Name => 'Tag9400a',
@@ -1683,7 +1688,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9400b' },
     },{
         Name => 'Tag9400c',
-        Condition => '$$valPt =~ /^[\x23\x24\x26\x28\x31\x32]/',
+        Condition => '$$valPt =~ /^[\x23\x24\x26\x28\x31\x32\x33]/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9400c' },
     },{
         Name => 'Sony_0x9400',
@@ -1896,7 +1901,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     },
     0x940c => [{
         Name => 'Tag940c',
-        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|Lunar|ZV-E10)\b/',
+        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|Lunar|ZV-E10|ZV-E1)\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag940c' },
     },{
         Name => 'Sony_0x940c',
@@ -2064,6 +2069,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             389 => 'ZV-1F', #IB
             390 => 'ILCE-7RM5', #IB
             391 => 'ILME-FX30', #JR
+            393 => 'ZV-E1', #JR
         },
     },
     0xb020 => { #2
@@ -8238,7 +8244,7 @@ my %isoSetting2010 = (
     },
     0x002a => [{
         Name => 'Quality2',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-(FX3|FX30)|ZV-E1)\b/',
         PrintConv => {
             0 => 'JPEG',
             1 => 'RAW',
@@ -8247,7 +8253,6 @@ my %isoSetting2010 = (
         },
     },{
         Name => 'Quality2',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
         PrintConv => {
             1 => 'JPEG',
             2 => 'RAW',
@@ -8258,13 +8263,13 @@ my %isoSetting2010 = (
     }],
     0x0047 => {
         Name => 'SonyImageHeight',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-(FX3|FX30)|ZV-E1)\b/',
         Format => 'int16u',
         PrintConv => '$val > 0 ? 8*$val : "n.a."',
     },
     0x0053 => {
         Name => 'ModelReleaseYear',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-(FX3|FX30)|ZV-E1)\b/',
         Format => 'int8u',
         PrintConv => 'sprintf("20%.2d", $val)',
     },
@@ -8279,9 +8284,10 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x03e2, 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
+    0x03e2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 181',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x044e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 178',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },

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

@@ -2498,6 +2498,9 @@ my %tagLookup = (
 	'energysavingmode' => { 238 => 0x648, 239 => 0x678 },
 	'engineer' => { 521 => 'engineer' },
 	'enhancedarktones' => { 280 => 0x8 },
+	'enhancedenoisealreadyapplied' => { 491 => 'EnhanceDenoiseAlreadyApplied' },
+	'enhancedenoiselumaamount' => { 491 => 'EnhanceDenoiseLumaAmount' },
+	'enhancedenoiseversion' => { 491 => 'EnhanceDenoiseVersion' },
 	'enhancedetailsalreadyapplied' => { 491 => 'EnhanceDetailsAlreadyApplied' },
 	'enhancedetailsversion' => { 491 => 'EnhanceDetailsVersion' },
 	'enhancement' => { 112 => 0x16, 113 => 0x3016 },
@@ -9489,6 +9492,7 @@ my %tagExists = (
 	'imagefullheight' => 1,
 	'imagefullwidth' => 1,
 	'imageheader' => 1,
+	'imageheightinches' => 1,
 	'imagehorizonpixelpack' => 1,
 	'imageid' => 1,
 	'imageinfo' => 1,
@@ -9522,6 +9526,7 @@ my %tagExists = (
 	'imagetoolbar' => 1,
 	'imageuidlist' => 1,
 	'imageversion' => 1,
+	'imagewidthinches' => 1,
 	'imageworkstationmake' => 1,
 	'imagingdata' => 1,
 	'imdb' => 1,
@@ -11103,6 +11108,7 @@ my %tagExists = (
 	'rafdata' => 1,
 	'rafversion' => 1,
 	'rangeimagelocalset' => 1,
+	'rarversion' => 1,
 	'rasterpadding' => 1,
 	'rate' => 1,
 	'rated' => 1,
@@ -11192,6 +11198,8 @@ my %tagExists = (
 	'recordingtimeyear' => 1,
 	'recordingtimeyearmonth' => 1,
 	'recordingtimeyearmonthday' => 1,
+	'records' => 1,
+	'recordsv2' => 1,
 	'rect' => 1,
 	'rectangleofinterest' => 1,
 	'red1header' => 1,
@@ -12468,6 +12476,7 @@ my %tagExists = (
 	'worldtime' => 1,
 	'worldtocamera' => 1,
 	'worldtondc' => 1,
+	'wpgversion' => 1,
 	'wrapmodes' => 1,
 	'writername' => 1,
 	'writers' => 1,