exiftool_vendored 12.56.0 → 12.58.0

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

@@ -9938,8 +9938,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
         },
     },
     217 => { Name => 'MovieMultiSelector',  %buttonsZ9, Unknown => 1}, # CSg2-h
-    221 => { Name => 'MovieAFSpeed',        ValueConv => '$val - 5', ValueConvInv => '$val + 6' }, # CSg6-a
-    223 => { Name => 'MovieAFSpeedApply',    rintConv => {0 => 'Always', 1 => 'Only During Recording'},}, # CSg6-b
+    221 => { Name => 'MovieAFSpeed',        ValueConv => '$val - 5', ValueConvInv => '$val + 5' }, # CSg6-a
+    223 => { Name => 'MovieAFSpeedApply',   PrintConv => {0 => 'Always', 1 => 'Only During Recording'},}, # CSg6-b
     225 => { # CSg7
         Name => 'MovieAFTrackingSensitivity',
         PrintConv => {

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

@@ -1512,7 +1512,7 @@ my %infoZSeries = (
             6 => 'None',
         },
     }],
-    0x0ee => { Name => 'MovieAFSpeed',                  ValueConv => '$val - 6', ValueConvInv => '$val + 6' }, # CSg4-a (Z7_2)
+    0x0ee => { Name => 'MovieAFSpeed', ValueConv => '$val - 6', ValueConvInv => '$val + 6' }, # CSg4-a (Z7_2)
     0x0ef => { # CSg4-b (Z7_2)
         Name => 'MovieAFSpeedApply',
         PrintConv => {

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.79';
+$VERSION = '2.80';
 
 sub PrintLensInfo($$$);
 
@@ -116,6 +116,7 @@ my %olympusLensTypes = (
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB
     '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 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
     # Sigma lenses
     '1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
     '1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
@@ -3191,6 +3192,7 @@ my %indexInfo = (
         }
     ],
     # 0x31a Continuous AF parameters?
+    # 0x31b ContinuousFocusMode? (ref forum78245)
     0x328 => { #PH
         Name => 'AFInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::AFInfo' },

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.41';
+$VERSION = '3.42';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -72,10 +72,7 @@ sub DecodeAFPoints($$$$;$);
     Notes => q{
         The first number gives the series of the lens, and the second identifies the
         lens model.  Note that newer series numbers may not always be properly
-        identified by cameras running older firmware versions.  Decimal values have
-        been added to differentiate lenses which would otherwise have the same
-        LensType, and are used by the Composite LensID tag when attempting to
-        identify the specific lens model.
+        identified by cameras running older firmware versions.
     },
     OTHER => sub {
         my ($val, $inv, $conv) = @_;
@@ -4081,6 +4078,7 @@ my %binaryDataAttrs = (
         ValueConvInv => '$val=~s/\.\d+$//; $val',
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     3 => { #PH
         Name => 'ExtenderStatus',
@@ -4104,6 +4102,7 @@ my %binaryDataAttrs = (
         ValueConvInv => '$val=~s/\.\d+$//; $val',
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     3 => {
         Name => 'LensData',
@@ -4139,6 +4138,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     4 => {
         Name => 'LensData',
@@ -4174,6 +4174,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     13 => {
         Name => 'LensData',
@@ -4209,6 +4210,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     12 => {
         Name => 'LensData',
@@ -4245,6 +4247,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     15 => {
         Name => 'LensData',

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

@@ -28,7 +28,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD $iptcDigestInfo %printFlags);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.67';
+$VERSION = '1.69';
 
 sub ProcessPhotoshop($$$);
 sub WritePhotoshop($$$);
@@ -74,7 +74,7 @@ my %thumbnailInfo = (
         my @tags = qw{ImageWidth ImageHeight FileType};
         my $info = $et->ImageInfo(\$val, @tags);
         my ($w, $h, $type) = @$info{@tags};
-        $w and $h and $type eq 'JPEG' or warn("Not a valid JPEG image\n"), return undef;
+        $w and $h and $type and $type eq 'JPEG' or warn("Not a valid JPEG image\n"), return undef;
         my $wbytes = int(($w * 24 + 31) / 32) * 4;
         return pack('N6n2', 1, $w, $h, $wbytes, $wbytes * $h, length($val), 24, 1) . $val;
     },
@@ -571,6 +571,13 @@ my %unicodeString = (
         ValueConv => '100 * $val / 255',
         PrintConv => 'sprintf("%d%%",$val)',
     },
+    _xvis  => {
+        Name => 'LayerVisible',
+        Format => 'int8u',
+        List => 1,
+        ValueConv => '$val & 0x02',
+        PrintConv => { 0x02 => 'No', 0x00 => 'Yes' },
+    },
     # tags extracted from additional layer information (tag ID's are real)
     # - must be able to accommodate a blank entry to preserve the list ordering
     luni => {
@@ -589,6 +596,16 @@ my %unicodeString = (
         List => 1,
         Unknown => 1,
     },
+    lclr => {
+        Name => 'LayerColors',
+        Format => 'int16u',
+        Count => 1,
+        List => 1,
+        PrintConv => {
+            0=>'None',  1=>'Red',  2=>'Orange', 3=>'Yellow',
+            4=>'Green', 5=>'Blue', 6=>'Violet', 7=>'Gray',
+        },
+    },
     shmd => { # layer metadata (undocumented structure)
         # (for now, only extract layerTime.  May also contain "layerXMP" --
         #  it would be nice to decode this but I need a sample)
@@ -603,6 +620,13 @@ my %unicodeString = (
         ValueConv => 'length $val ? ConvertUnixTime($val,1) : ""',
         PrintConv => 'length $val ? $self->ConvertDateTime($val) : ""',
     },
+    lsct => {
+        Name => 'LayerSections',
+        Format => 'int32u',
+        Count => 1,
+        List => 1,
+        PrintConv => { 0 => 'Layer', 1 => 'Folder (open)', 2 => 'Folder (closed)', 3 => 'Divider' },
+    },
 );
 
 # tags extracted from ImageSourceData found in TIFF images (ref PH)
@@ -682,7 +706,7 @@ sub ProcessLayersAndMask($$$)
     local $_;
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $raf = $$dirInfo{RAF};
-    my $fileType = $$et{VALUE}{FileType};
+    my $fileType = $$et{FileType};
     my $data;
 
     return 0 unless $fileType eq 'PSD' or $fileType eq 'PSB';   # (no layer section in CS1 files)
@@ -748,17 +772,16 @@ sub ProcessLayers($$$)
     my $pos = 0;
     return 0 if $dirLen < 2;
     $raf->Read($buff, 2) == 2 or return 0;
-    my $num = Get16s(\$buff, 0);
+    my $num = Get16s(\$buff, 0);    # number of layers
     $num = -$num if $num < 0;       # (first channel is transparency data if negative)
     $et->VerboseDir('Layers', $num, $dirLen);
     $et->HandleTag($tagTablePtr, '_xcnt', $num, Start => $pos, Size => 2, %dinfo); # LayerCount
     my $oldIndent = $$et{INDENT};
     $$et{INDENT} .= '| ';
-
     $pos += 2;
     my $psb = $$et{IsPSB};  # is PSB format?
     my $psiz = $psb ? 8 : 4;
-    for ($i=0; $i<$num; ++$i) {
+    for ($i=0; $i<$num; ++$i) { # process each layer
         $et->VPrint(0, $oldIndent.'+ [Layer '.($i+1)." of $num]\n");
         last if $pos + 18 > $dirLen;
         $raf->Read($buff, 18) == 18 or last;
@@ -776,6 +799,7 @@ sub ProcessLayers($$$)
         $sig =~ /^(8BIM|MIB8)$/ or last;    # verify signature
         $et->HandleTag($tagTablePtr, '_xbnd', undef, Start => 4, Size => 4, %dinfo);
         $et->HandleTag($tagTablePtr, '_xopc', undef, Start => 8, Size => 1, %dinfo);
+        $et->HandleTag($tagTablePtr, '_xvis', undef, Start =>10, Size => 1, %dinfo);
         my $nxt = $pos + 16 + Get32u(\$buff, 12);
         $n = Get32u(\$buff, 16);        # get size of layer mask data
         $pos += 20 + $n;                # skip layer mask data
@@ -823,7 +847,7 @@ sub ProcessLayers($$$)
                 $raf->Read($buff, $n) == $n or last;
                 $dinfo{DataPos} = $pos;
                 while ($count{$tag} < $i) {
-                    $et->HandleTag($tagTablePtr, $tag, '');
+                    $et->HandleTag($tagTablePtr, $tag, $tag eq 'lsct' ? 0 : '');
                     ++$count{$tag};
                 }
                 $et->HandleTag($tagTablePtr, $tag, undef, Start => 0, Size => $n, %dinfo);
@@ -840,6 +864,13 @@ sub ProcessLayers($$$)
         }
         $pos = $nxt;
     }
+    # pad lists if necessary to have an entry for each layer
+    foreach (sort keys %count) {
+        while ($count{$_} < $num) {
+            $et->HandleTag($tagTablePtr, $_, $_ eq 'lsct' ? 0 : '');
+            ++$count{$_};
+        }
+    }
     $$et{INDENT} = $oldIndent;
     return 1;
 }

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.83';
+$VERSION = '2.84';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -419,6 +419,18 @@ my %channelLabel = (
     0x1ffff => 'Discrete_65535',
 );
 
+my %qtFlags = ( #12
+    0 => 'undef',       22 => 'unsigned int',   71 => 'float[2] size',
+    1 => 'UTF-8',       23 => 'float',          72 => 'float[4] rect',
+    2 => 'UTF-16',      24 => 'double',         74 => 'int64s',
+    3 => 'ShiftJIS',    27 => 'BMP',            75 => 'int8u',
+    4 => 'UTF-8 sort',  28 => 'QT atom',        76 => 'int16u',
+    5 => 'UTF-16 sort', 65 => 'int8s',          77 => 'int32u',
+    13 => 'JPEG',       66 => 'int16s',         78 => 'int64u',
+    14 => 'PNG',        67 => 'int32s',         79 => 'double[3][3]',
+    21 => 'signed int', 70 => 'float[2] point',
+);
+
 # properties which don't get inherited from the parent
 my %dontInherit = (
     ispe => 1,  # size of parent may be different
@@ -1159,7 +1171,10 @@ my %eeBox2 = (
         },
         {
             Name => 'GarminGPS',
-            Condition => '$$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and $$self{OPTIONS}{ExtractEmbedded}',
+            Condition => q{
+                $$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and
+                $$self{OPTIONS}{ExtractEmbedded}
+            },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::QuickTime::Stream',
                 ProcessProc => \&ProcessGarminGPS,
@@ -1961,7 +1976,7 @@ my %eeBox2 = (
             Name => 'SanyoMOV',
             Condition => q{
                 $$valPt =~ /^SANYO DIGITAL CAMERA\0/ and
-                $self->{VALUE}->{FileType} eq "MOV"
+                $$self{FileType} eq "MOV"
             },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Sanyo::MOV',
@@ -1972,7 +1987,7 @@ my %eeBox2 = (
             Name => 'SanyoMP4',
             Condition => q{
                 $$valPt =~ /^SANYO DIGITAL CAMERA\0/ and
-                $self->{VALUE}->{FileType} eq "MP4"
+                $$self{FileType} eq "MP4"
             },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Sanyo::MP4',
@@ -7146,7 +7161,7 @@ my %eeBox2 = (
             $$self{AudioFormat} = $val;
             return undef unless $val =~ /^[\w ]{4}$/i;
             # check for protected audio format
-            $self->OverrideFileType('M4P') if $val eq 'drms' and $$self{VALUE}{FileType} eq 'M4A';
+            $self->OverrideFileType('M4P') if $val eq 'drms' and $$self{FileType} eq 'M4A';
             return $val;
         },
         # see this link for print conversions (not complete):
@@ -9656,6 +9671,7 @@ ItemID:         foreach $id (keys %$items) {
                             }
                         }
                         $langInfo or $langInfo = $tagInfo;
+                        my $str = $qtFlags{$flags} ? " ($qtFlags{$flags})" : '';
                         $et->VerboseInfo($tag, $langInfo,
                             Value   => ref $value ? $$value : $value,
                             DataPt  => \$val,
@@ -9664,7 +9680,7 @@ ItemID:         foreach $id (keys %$items) {
                             Size    => $len,
                             Format  => $format,
                             Index   => $index,
-                            Extra   => sprintf(", Type='${type}', Flags=0x%x, Lang=0x%.4x",$flags,$lang),
+                            Extra   => sprintf(", Type='${type}', Flags=0x%x%s, Lang=0x%.4x",$flags,$str,$lang),
                         ) if $verbose;
                         # use "Keys" in path instead of ItemList if this was defined by a Keys tag
                         my $isKey = $$tagInfo{Groups} && $$tagInfo{Groups}{1} && $$tagInfo{Groups}{1} eq 'Keys';
@@ -9793,7 +9809,7 @@ ItemID:         foreach $id (keys %$items) {
         ++$index if defined $index;
     }
     # tweak file type based on track content ("iso*" and "dash" ftyp only)
-    if ($topLevel and $$et{VALUE}{FileType} and $$et{VALUE}{FileType} eq 'MP4' and
+    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{HasHandler}{soun} and not $$et{HasHandler}{vide})
     {

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

@@ -1488,7 +1488,7 @@ sub ProcessFreeGPS($$$)
             # Kenwood dashcam sometimes stores absolute year and local time
             # (but sometimes year since 2000 and UTC time in same video!)
             require Time::Local;
-            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr-1900);
+            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr);
             ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
             $yr += 1900;
             ++$mon;
@@ -2924,6 +2924,7 @@ sub ProcessGarminGPS($$$)
     my $epoch = (66 * 365 + 17) * 24 * 3600; # time is relative to Jan 1, 1904
     my $scl = 180 / (32768 * 65536);         # scaling factor for lat/lon
     $et->VerboseDir('GarminGPS');
+    $$et{SET_GROUP1} = 'Garmin';
     while ($pos + 20 <= $dataLen) {
         $$et{DOC_NUM} = ++$$et{DOC_COUNT};
         my $time = Image::ExifTool::ConvertUnixTime(Get32u($dataPt, $pos) - $epoch) . 'Z';
@@ -2938,6 +2939,7 @@ sub ProcessGarminGPS($$$)
         $pos += 20;
     }
     delete $$et{DOC_NUM};
+    delete $$et{SET_GROUP1};
     return 1;
 }
 

data/bin/lib/Image/ExifTool/README

@@ -249,6 +249,13 @@ key:
                   within this atom.  Currently used only for Canon CNTH atom,
                   which contains garbage after the first contained atom.
 
+    NIKON_OFFSETS [Nikon Encrypted tables only] Pointer to int32u NumberOffsets
+                  for offset-type encrypted Nikon directories.  When set,
+                  directory and decryption lengths are calculated automatically.
+
+    ALLOW_REPROCESS Flag to allow reprocessing of another directory at this
+                  same location in the file, bypassing recursion avoidance test.
+
   DATAMEMBER : BinaryData tables only.  A reference to a list of sorted tag ID's
   which must be extracted as data members when writing.  Must also list "var_"
   format tags and tags with Hook so offsets are properly calculated if the table
@@ -404,6 +411,10 @@ numerical, and generated automatically otherwise.
 
                   'IsComposite' - flag set for Composite tags
 
+                  'IsImageData' - flag set if this is an image data offset to
+                  be included in ImageDataMD5 calculation.  Must have an
+                  OffsetPair entry which is the ID of the corresponding size.
+
                   'IsOffset' - flag set if the tag represents an offset to some
                   data, and causes value will be adjusted to an absolute file
                   offset.  If set to 2, the offset base of the parent directory
@@ -465,6 +476,10 @@ numerical, and generated automatically otherwise.
                   documentation, padded to the number of digits given by the
                   PrintHex value.
 
+                  'PrintInt' - remove decimal part of tag ID in HTML tag name
+                  documentation.  (To avoid confusing ExifTool users because
+                  the LensType decimal numbers are for internal use only.)
+
                   'PrintSort' - causes PrintConv values to be sorted by value
                   rather than key in the HTML tag name documentation.
 
@@ -713,7 +728,7 @@ numerical, and generated automatically otherwise.
                   BitShift are applied before evaluating RawConv.
 
   BitShift      : [Mask tags only] Bit shift for Mask-ed values.  If not
-                  specified, set to the number of trailing bits in the Mask.
+                  specified, set to the number of trailing zero bits in Mask.
                   When reading, the value is shifted right by this number of
                   bits after the Mask is applied.
 
@@ -1003,7 +1018,9 @@ numerical, and generated automatically otherwise.
                   current Base.  This is a Perl expression which may use
                   $valuePtr to represent the location of the tag value in the
                   file, or $val for the value itself.  If not specified, a Start
-                  of '$valuePtr' is assumed.
+                  of '$valuePtr' is assumed.  Subdirectories in BinaryData may
+                  also use $dirStart to represent the offset of the current
+                  directory start relative to the start of the data block.
 
      OffsetPt   : [EXIF directories only] If specified, this is a Perl
                   expression that gives the position of a 32-bit word in the

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.61';
+$VERSION = '1.62';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -1522,7 +1522,7 @@ my %code2charset = (
         },
         # (can't calculate duration like this for compressed audio types)
         RawConv => q{
-            return undef if $$self{VALUE}{FileType} =~ /^(LA|OFR|PAC|WV)$/;
+            return undef if $$self{FileType} =~ /^(LA|OFR|PAC|WV)$/;
             return(($val[0] and not ($val[2] or $val[3])) ? $val[1] / $val[0] : undef);
         },
         PrintConv => 'ConvertDuration($val)',
@@ -1996,7 +1996,7 @@ sub ProcessRIFF($$)
     $$raf{NoBuffer} = 1 if $et->Options('FastScan'); # disable buffering in FastScan mode
     $mime = $riffMimeType{$type} if $type;
     $et->SetFileType($type, $mime);
-    $$et{VALUE}{FileType} .= ' (RF64)' if $rf64;
+    $$et{VALUE}{FileType} .= ' (RF64)' if $rf64 and $$et{VALUE}{FileType};
     $$et{RIFFStreamType} = '';      # initialize stream type
     $$et{RIFFStreamCodec} = [];     # initialize codec array
     SetByteOrder('II');

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # currently support this version Rawzor images
 my $implementedRawzorVersion = 199; # (up to version 1.99)
@@ -138,7 +138,7 @@ sub ProcessRWZ($$)
     }
     # set OriginalFileType from FileType of original file
     # then change FileType and MIMEType to indicate a Rawzor image
-    my $origFileType = $$et{VALUE}{FileType};
+    my $origFileType = $$et{FileType};
     if ($origFileType) {
         $et->HandleTag($tagTablePtr, OriginalFileType => $origFileType);
         $et->OverrideFileType('RWZ');

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

@@ -19,15 +19,13 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.32';
+$VERSION = '1.34';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
     Notes => q{
         Sigma LensType values are hexadecimal numbers stored as a string (without
-        the leading "0x").  Decimal values have been added to differentiate lenses
-        which would otherwise have the same LensType, and are used by the Composite
-        LensID tag when attempting to identify the specific lens model.
+        the leading "0x").
     },
     # 0x0 => 'Sigma 50mm F2.8 EX Macro', (0x0 used for other lenses too)
     # 0x8 - 18-125mm LENSARANGE@18mm=22-4
@@ -255,6 +253,7 @@ $VERSION = '1.32';
     0x6023 => 'Sigma 20mm F2 DG DN | C', #IB
     0x6025 => 'Sigma 20mm F1.4 DG DN | A', #IB
     0x6026 => 'Sigma 24mm F1.4 DG DN | A', #IB
+    0x602c => "Sigma 50mm F1.4 DG DN | A (2023)", #IB
     0x8005 => 'Sigma 35mm F1.4 DG HSM | A', #PH (012)
     0x8009 => 'Sigma 18-35mm F1.8 DC HSM | A', #PH
     0x8900 => 'Sigma 70-300mm F4-5.6 DG OS', #PH (SD15)
@@ -556,6 +555,7 @@ $VERSION = '1.32';
         SeparateTable => 'LensType',
         PrintHex => 1,
         PrintConv => \%sigmaLensTypes,
+        PrintInt => 1,
     },{ #PH
         Name => 'LensType',
         Condition => '$$self{MakerNoteSigmaVer} >= 3',
@@ -564,6 +564,7 @@ $VERSION = '1.32';
         SeparateTable => 'LensType',
         PrintHex => 1,
         PrintConv => \%sigmaLensTypes,
+        PrintInt => 1,
     }],
     0x002a => { #PH
         Name => 'LensFocalRange',

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.57';
+$VERSION = '3.58';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -2045,6 +2045,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             369 => 'DSC-RX100M5A', #JR
             371 => 'ILCE-6400', #IB
             372 => 'DSC-RX0M2', #JR
+            373 => 'DSC-HX95', #github191
             374 => 'DSC-RX100M7', #IB
             375 => 'ILCE-7RM4', #IB
             376 => 'ILCE-9M2', #JR
@@ -2161,6 +2162,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         # set to 65535 for E-mount lenses (values 0x80xx)
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 65535 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0xb028 => { #2
         # (used by the DSLR-A100)
@@ -5570,6 +5572,7 @@ my %faceInfo = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x400 => { #JR
         Name => 'ImageNumber',
@@ -6603,6 +6606,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x1896 => {
         Name => 'LensType',
@@ -6612,6 +6616,7 @@ my %isoSetting2010 = (
         SeparateTable => 1,
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x1898 => {
         Name => 'DistortionCorrParamsPresent',
@@ -6809,6 +6814,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x18c2 => {
         Name => 'LensType',
@@ -6818,6 +6824,7 @@ my %isoSetting2010 = (
         SeparateTable => 1,
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x18c4 => {
         Name => 'DistortionCorrParamsPresent',
@@ -6946,6 +6953,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x18f2 => {
         Name => 'LensType',
@@ -6955,6 +6963,7 @@ my %isoSetting2010 = (
         SeparateTable => 1,
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x18f4 => {
         Name => 'DistortionCorrParamsPresent',
@@ -7075,6 +7084,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x17f6 => {
         Name => 'LensType',
@@ -7084,6 +7094,7 @@ my %isoSetting2010 = (
         SeparateTable => 1,
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x17f8 => {
         Name => 'DistortionCorrParamsPresent',
@@ -7439,6 +7450,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x0109 => {
         Name => 'LensType',
@@ -7450,6 +7462,7 @@ my %isoSetting2010 = (
         # has a value of 0 for E-mount lenses (values 0x80xx)
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x010b => {
         Name => 'DistortionCorrParamsPresent',
@@ -7726,6 +7739,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x0109 => {
         Name => 'LensType',
@@ -7737,6 +7751,7 @@ my %isoSetting2010 = (
         # has a value of 0 for E-mount lenses (values 0x80xx)
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x010b => {
         Name => 'DistortionCorrParamsPresent',
@@ -8535,6 +8550,7 @@ my %isoSetting2010 = (
         Notes => 'E-mount lenses',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x0608 => {
         Name => 'LensType',
@@ -8543,6 +8559,7 @@ my %isoSetting2010 = (
         Notes => 'A-mount lenses on SLT and NEX',
         SeparateTable => 1,
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x064a => {
         Name => 'VignettingCorrParams',
@@ -8713,6 +8730,7 @@ my %isoSetting2010 = (
         Notes => 'E-mount lenses',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x0062 => {
         Name => 'LensType',
@@ -8721,6 +8739,7 @@ my %isoSetting2010 = (
         Notes => 'A-mount lenses on SLT and NEX',
         SeparateTable => 1,
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x0064 => {
         Name => 'DistortionCorrParams',
@@ -8937,6 +8956,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x000b => {
         Name => 'CameraE-mountVersion',
@@ -9622,6 +9642,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
         SeparateTable => 'LensType2',
         PrintConv => \%sonyLensTypes2,
+        PrintInt => 1,
     },
     0x004d => {
         Name => 'LensType',
@@ -9631,6 +9652,7 @@ my %isoSetting2010 = (
         SeparateTable => 1,
         ValueConvInv => '($val & 0xff00) == 0x8000 ? 0 : int($val)',
         PrintConv => \%sonyLensTypes,
+        PrintInt => 1,
     },
     0x004f => {
         Name => 'DistortionCorrParams',