exiftool_vendored 10.01.0 → 10.04.0

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/README

@@ -548,7 +548,7 @@ numerical.
                   ExifTool and saved as Warning tags, but since ValueConv and
                   PrintConv conversions are done on demand, the warnings may be
                   generated after the list of extracted tags is returned, so may
-                  easily be missed.  
+                  easily be missed.
 
   PrintConv     : This entry is similar to ValueConv above, except that it is
                   used to further convert the tag value to a human readable

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/RIFF.pm

@@ -306,7 +306,7 @@ my %riffMimeType = (
         C<exif>, and information about the audio content is stored in the C<fmt >
         chunk.  As well as this information, some video information and proprietary
         manufacturer-specific information is also extracted.
-        
+
         Large AVI videos may be a concatenation of two or more RIFF chunks.  For
         these files, information is extracted from subsequent RIFF chunks as
         sub-documents, but the Duration is calculated for the full video.

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Ricoh.pm

@@ -19,7 +19,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.30';
+$VERSION = '1.31';
 
 sub ProcessRicohText($$$);
 sub ProcessRicohRMETA($$$);
@@ -87,7 +87,7 @@ my %ricohLensIDs = (
             2 => 'JPEG',
             3 => 'DNG',
         },
-    },            
+    },
     0x1001 => [{
         Name => 'ImageInfo',
         Condition => '$format ne "int16u"',
@@ -116,7 +116,7 @@ my %ricohLensIDs = (
             1 => 'Continuous',
             8 => 'AF-priority Continuous',
         },
-    },            
+    },
     0x1003 => [{
         Name => 'Sharpness',
         Condition => '$format ne "int16u"',
@@ -603,6 +603,7 @@ my %ricohLensIDs = (
     # the significance of the following 2 dates is not known.  They are usually
     # within a month of each other, but I have seen differences of nearly a year.
     # Sometimes the first is more recent, and sometimes the second.
+    # 0x0003 - int32u[1]
     0x0004 => { # (NC)
         Name => 'ManufactureDate1',
         Groups => { 2 => 'Time' },
@@ -615,8 +616,10 @@ my %ricohLensIDs = (
         Writable => 'string',
         Count => 20,
     },
+    # 0x0006 - undef[16] ?
+    # 0x0007 - int32u[1] ?
     # 0x000c - int32u[2] 1st number is a counter (file number? shutter count?) - PH
-    # 0x0014 - int8u[338] - could contain some data related to face detection? - PH
+    # 0x0014 - int8u[338] could contain some data related to face detection? - PH
     # 0x0015 - int8u[2]: related to noise reduction?
     0x001a => { #PH
         Name => 'FaceInfo',
@@ -644,14 +647,13 @@ my %ricohLensIDs = (
     # 0x000E ProductionNumber? (ref 2) [no. zero for most models - PH]
 );
 
-
 # Ricoh Theta subdirectory tags - Contains orientation information (ref 4)
 %Image::ExifTool::Ricoh::ThetaSubdir = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
     CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
-    # 0x0001 => Unknown
-    # 0x0002 => Unknown
+    # 0x0001 - int16u[1] ?
+    # 0x0002 - int16u[1] ?
     0x0003 => {
         Name => 'Accelerometer',
         Writable => 'rational64s',
@@ -661,12 +663,20 @@ my %ricohLensIDs = (
         Name => 'Compass',
         Writable => 'rational64u',
     },
-    # 0x0005 => Unknown
-    # 0x0101 => Unknown - ISO Speed?
-    # 0x0102 => Unknown - F Number?
-    # 0x0103 => Unknown - Exposure?
-    # 0x0104 => Unknown - Serial Number?
-    # 0x0105 => Unknown - Serial Number?
+    # 0x0005 - int16u[1] ?
+    # 0x0006 - int16u[1] ?
+    # 0x0007 - int16u[1] ?
+    # 0x0008 - int16u[1] ?
+    # 0x0009 - int16u[1] ?
+    0x000a => {
+        Name => 'TimeZone',
+        Writable => 'string',
+    },
+    # 0x0101 - int16u[4] ISO (why 4 values?)
+    # 0x0102 - rational64s[2] FNumber (why 2 values?)
+    # 0x0103 - rational64u[2] ExposureTime (why 2 values?)
+    # 0x0104 - string[9] SerialNumber?
+    # 0x0105 - string[9] SerialNumber?
 );
 
 # face detection information (ref PH, CX4)
@@ -976,9 +986,11 @@ sub ProcessRicohRMETA($$$)
     my $verbose = $et->Options('Verbose');
 
     $et->VerboseDir('Ricoh RMETA') if $verbose;
-    $dirLen > 6 or $et->Warn('Truncated Ricoh RMETA data', 1), return 0;
+    $dirLen < 20 and $et->Warn('Truncated Ricoh RMETA data', 1), return 0;
     my $byteOrder = substr($$dataPt, $dirStart, 2);
+    $byteOrder = GetByteOrder() if $byteOrder eq "\0\0"; # (same order as container)
     SetByteOrder($byteOrder) or $et->Warn('Bad Ricoh RMETA data', 1), return 0;
+    # get the RMETA segment number
     my $rmetaNum = Get16u($dataPt, $dirStart+4);
     if ($rmetaNum != 0) {
         # not sure how to recognize audio, so do it by checking for "RIFF" header
@@ -999,9 +1011,13 @@ sub ProcessRicohRMETA($$$)
         }
         return 1;
     }
-    # standard RMETA tag directory
-    my (@tags, @vals, @nums, $valPos);
-    my $pos = $dirStart + 6;
+    # decode standard RMETA tag directory
+    my (@tags, @vals, @nums, $valPos, $numPos);
+    my $pos = $dirStart + Get16u($dataPt, $dirStart+8);
+    my $numEntries = Get16u($dataPt, $pos);
+    $numEntries > 100 and $et->Warn('Bad RMETA entry count'), return 0;
+    $pos += 10; # start of first RMETA section
+    # loop through RMETA sections
     while ($pos <= $dataLen - 4) {
         my $type = Get16u($dataPt, $pos);
         my $size = Get16u($dataPt, $pos + 2);
@@ -1012,67 +1028,78 @@ sub ProcessRicohRMETA($$$)
             $et->Warn('Corrupted Ricoh RMETA data', 1);
             last;
         }
-        if ($type eq 1) {
+        my $dat = substr($$dataPt, $pos, $size);
+        if ($verbose) {
+            $et->VPrint(2, "$$et{INDENT}RMETA section type=$type size=$size\n");
+            if ($verbose > 2) {
+                my %dumpParms = ( Addr => $$dirInfo{DataPos} + $pos, Prefix => $$et{INDENT} );
+                $dumpParms{MaxLen} = 96 if $verbose == 3;
+                Image::ExifTool::HexDump(\$dat, undef, %dumpParms);
+            }
+        }
+        if ($type == 1) {                       # section 1: tag names
             # save the tag names
-            my $tags = substr($$dataPt, $pos, $size);
-            $tags =~ s/\0+$//;  # remove trailing nulls
-            @tags = split /\0/, $tags;
-        } elsif ($type eq 2) {
-            # save the ASCII tag values
-            my $vals = substr($$dataPt, $pos, $size);
-            $vals =~ s/\0+$//;
-            @vals = split /\0/, $vals;
-            $valPos = $pos; # save position of first ASCII value
-        } elsif ($type eq 3) {
-            # save the numerical tag values
-            my $nums = substr($$dataPt, $pos, $size);
-            @nums = unpack($byteOrder eq 'MM' ? 'n*' : 'v*', $nums);
-        } elsif ($type eq 0) {
-            $pos += 2;  # why 2 extra bytes?
+            @tags = split /\0/, $dat, $numEntries+1;
+        } elsif ($type == 2 || $type == 18) {   # section 2/18: string values (G800 uses type 18)
+            # save the tag values (assume "ASCII\0" encoding since others never seen)
+            @vals = split /\0/, $dat, $numEntries+1;
+            $valPos = $pos; # save position of first string value
+        } elsif ($type == 3) {                  # section 3: numerical values
+            if ($size < $numEntries * 2) {
+                $et->Warn('Truncated RMETA section 3');
+            } else {
+                # save the numerical tag values
+                # (0=empty, 0xffff=text input, otherwise menu item number)
+                @nums = unpack(($byteOrder eq 'MM' ? 'n' : 'v').$numEntries, $dat);
+                $numPos = $pos; # save position of numerical values
+            }
+        } elsif ($type != 16) {
+            $et->Warn("Unrecognized RMETA section (type $type, len $size)");
         }
         $pos += $size;
     }
-    if (@tags or @vals) {
-        if (@tags < @vals) {
-            my ($nt, $nv) = (scalar(@tags), scalar(@vals));
-            $et->Warn("Fewer tags ($nt) than values ($nv) in Ricoh RMETA", 1);
+    return 1 unless @tags or @vals;
+    $valPos or $valPos = 0; # (just in case there was no value section)
+    # find next tag in null-delimited list
+    # unpack numerical values from block of int16u values
+    my ($i, $name);
+    for ($i=0; $i<$numEntries; ++$i) {
+        my $tag = $tags[$i];
+        my $val = $vals[$i];
+        $val = '' unless defined $val;
+        unless (defined $tag and length $tag) {
+            length $val or ++$valPos, next;     # (skip empty entries)
+            $tag = '';
         }
-        # find next tag in null-delimited list
-        # unpack numerical values from block of int16u values
-        my ($tag, $name, $val);
-        foreach $tag (@tags) {
-            $val = shift @vals;
-            $val = '' unless defined $val;
-            ($name = $tag) =~ s/\b([a-z])/\U$1/gs;  # make capitalize all words
-            $name =~ s/ (\w)/\U$1/g;                # remove special characters
-            $name = 'RMETA_Unknown' unless length($name);
-            my $num = shift @nums;
-            my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-            if ($tagInfo) {
-                # make sure print conversion is defined
-                $$tagInfo{PrintConv} = { } unless ref $$tagInfo{PrintConv} eq 'HASH';
-            } else {
-                # create tagInfo hash
-                $tagInfo = { Name => $name, PrintConv => { } };
-                AddTagToTable($tagTablePtr, $tag, $tagInfo);
-            }
-            # use string value directly if no numerical value
-            $num = $val unless defined $num;
-            # add conversion for this value (replacing any existing entry)
-            $tagInfo->{PrintConv}->{$num} = length $val ? $val : $num;
-            if ($verbose) {
-                $et->VerboseInfo($tag, $tagInfo,
-                    Table   => $tagTablePtr,
-                    Value   => $num,
-                    DataPt  => $dataPt,
-                    DataPos => $$dirInfo{DataPos},
-                    Start   => $valPos,
-                    Size    => length($val),
-                );
+        ($name = $tag) =~ s/\b([a-z])/\U$1/gs;  # capitalize all words
+        $name =~ s/ (\w)/\U$1/g;                # remove special characters
+        $name = 'RMETA_Unknown' unless length($name);
+        my $num = $nums[$i];
+        my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
+        if ($tagInfo) {
+            # make sure print conversion is defined
+            $$tagInfo{PrintConv} = { } unless ref $$tagInfo{PrintConv} eq 'HASH';
+        } else {
+            # create tagInfo hash
+            $tagInfo = { Name => $name, PrintConv => { } };
+            AddTagToTable($tagTablePtr, $tag, $tagInfo);
+        }
+        # use string value directly if no numerical value
+        $num = $val unless defined $num;
+        # add conversion for this value (replacing any existing entry)
+        $tagInfo->{PrintConv}->{$num} = length $val ? $val : $num;
+        if ($verbose) {
+            my %datParms;
+            if (length $val) {
+                %datParms = ( Start => $valPos, Size => length($val), Format => 'string' );
+            } elsif ($numPos) {
+                %datParms = ( Start => $numPos + $i * 2, Size => 2, Format => 'int16u' );
             }
-            $et->FoundTag($tagInfo, $num);
-            $valPos += length($val) + 1;
+            %datParms and $datParms{DataPt} = $dataPt, $datParms{DataPos} = $$dirInfo{DataPos};
+            $et->VerboseInfo($tag, $tagInfo, Table=>$tagTablePtr, Value=>$num, %datParms);
         }
+        $et->FoundTag($tagInfo, $num);
+        $valPos += length($val) + 1;
     }
     return 1;
 }

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Shortcuts.pm

@@ -227,7 +227,7 @@ $VERSION = '1.56';
         'IFD0:Artist',
         'IFD0:Copyright',
         # other TIFF tags
-        'IFD0:Rating', 
+        'IFD0:Rating',
         'IFD0:RatingPercent',
         'IFD0:DNGLensInfo',
         'IFD0:PanasonicTitle',

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Sony.pm

@@ -31,7 +31,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '2.24';
+$VERSION = '2.26';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -306,7 +306,7 @@ my %afPoint19 = (
     29 => 'Lower-right (vertical)',
 );
 
-# 79 AF point layout and indices for ILCA-77M2, numbered 0-78 for direct look-up from BITMASK in 0x2020, 
+# 79 AF point layout and indices for ILCA-77M2, numbered 0-78 for direct look-up from BITMASK in 0x2020,
 # E6 = Center (ref JR)
 my %afPoints79 = (
                                              0=>'A5',  1=>'A6',  2=>'A7',
@@ -491,6 +491,7 @@ my %meterInfo2 = (
             0x50 => 'Flash',
             0x60 => 'Fluorescent',
             0x70 => 'Custom',
+            0x80 => 'Underwater',
         },
     },
     # Tag 0x0116: extra hardware info (ref JR)
@@ -568,7 +569,7 @@ my %meterInfo2 = (
         # - PreviewImage start-offset is at 130 bytes inside MPImage2
         # NEX-VG20E/VG30E/VG900, ILCE-QX1: 0x2001 not present
         # ILCE-5100/ILCE-7M2             : 0x2001 present but Size 0 and Offset 0
-        # 
+        #
         WriteCheck => 'return $val=~/^(none|.{32}\xff\xd8\xff)/s ? undef : "Not a valid image"',
         RawConv => q{
             return \$val if $val =~ /^Binary/;
@@ -800,7 +801,7 @@ my %meterInfo2 = (
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010g' },
     },{
         Name => 'Tag2010h', # ?
-        Condition => '$$self{Model} =~ /^(DSC-(RX10M2|RX100M4|HX90V|WX500)|ILCE-7RM2)\b/',
+        Condition => '$$self{Model} =~ /^(DSC-(RX1RM2|RX10M2|RX100M4|HX90V|WX500)|ILCE-7RM2|ILCE-7SM2)\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010h' },
     },{
         Name => 'Tag_0x2010',
@@ -1337,6 +1338,7 @@ my %meterInfo2 = (
             '3 2 0 0' => 'ARW 2.2', #PH (NEX-5)
             '3 3 0 0' => 'ARW 2.3', #PH (SLT-A65,SLT-A77)
             '3 3 1 0' => 'ARW 2.3.1', #PH/JR (RX1R,RX100M2)
+            '3 3 2 0' => 'ARW 2.3.2', #JR (RX1RM2,ICLE-7SM2 - support for uncompressed 14-bit RAW)
             # what about cRAW images?
         },
     },
@@ -1404,8 +1406,10 @@ my %meterInfo2 = (
             340 => 'ILCE-7M2', #JR
             341 => 'DSC-RX100M4', #PH
             342 => 'DSC-RX10M2', #JR
+            344 => 'DSC-RX1RM2', #JR
             346 => 'ILCE-QX1', #14
             347 => 'ILCE-7RM2', #JR
+            350 => 'ILCE-7SM2', #JR
         },
     },
     0xb020 => { #2
@@ -1831,6 +1835,7 @@ my %meterInfo2 = (
             15 => 'Flash',
             17 => 'Underwater 1 (Blue Water)', #9
             18 => 'Underwater 2 (Green Water)', #9
+            19 => 'Underwater Auto', #JR
         },
     },
 );
@@ -3136,7 +3141,7 @@ my %meterInfo2 = (
             3 => 'Built-in Flash fired',
             4 => 'External Flash fired (4)', # what is difference with 2 ?
         },
-    }, 
+    },
     0x0078 => {
         Name => 'FlashActionExternal',
         Condition => '$$self{Model} =~ /^NEX-(3|5|5C)/',
@@ -3144,7 +3149,7 @@ my %meterInfo2 = (
             136 => 'Did not fire',
             122 => 'Fired',
         },
-    }, 
+    },
     0x007c => {
         Name => 'FlashActionExternal',
         Condition => '$$self{Model} !~ /^NEX-(3|5|5C)|DSLR-(A450|A500|A550)/',
@@ -3153,7 +3158,7 @@ my %meterInfo2 = (
             167 => 'Fired',
             182 => 'Fired, HSS',
         },
-    }, 
+    },
     0x0082 => {
         Name => 'FlashStatus',
         Condition => '$$self{Model} =~ /^NEX-(3|5|5C)/',
@@ -5612,7 +5617,7 @@ my %pictureProfile2010 = (
     #0x0134 => { Name => 'SonyImageHeight',  Format => 'int16u' },
     #0x0144 => { Name => 'SonyImageHeight',  Format => 'int16u' },
     #0x0154 => { Name => 'SonyImageHeight',  Format => 'int16u' },
-    0x0200 => { Name => 'DigitalZoomRatio', ValueConv => '$val/16', ValueConvInv => '$val*16' },
+    0x0200 => { Name => 'DigitalZoomRatio', ValueConv => '$val/16', ValueConvInv => '$val*16', Priority => 0 },
     0x0210 => { %sonyDateTime2010, Groups => { 2 => 'Time' } },
     0x0300 => { %dynamicRangeOptimizer2010 },
     0x0490 => {
@@ -5735,7 +5740,7 @@ my %pictureProfile2010 = (
     #0x00e4 => { Name => 'SonyImageHeight',  Format => 'int16u' },
     #0x01fa => { Name => 'SonyImageHeight',  Format => 'int16u' },
     #0x0200 => { Name => 'SonyImageWidth',   Format => 'int16u' },
-    0x021c => { Name => 'DigitalZoomRatio', ValueConv => '$val/16', ValueConvInv => '$val*16' },
+    0x021c => { Name => 'DigitalZoomRatio', ValueConv => '$val/16', ValueConvInv => '$val*16', Priority => 0 },
     0x022c => { %sonyDateTime2010, Groups => { 2 => 'Time' } },
     0x0328 => { %dynamicRangeOptimizer2010 },
     0x04b8 => {
@@ -6294,10 +6299,10 @@ my %pictureProfile2010 = (
 #           however, not always valid e.g. bracketing, Shutter-prio e.a.
 #           difference between 0x0002 and 0x0004 mostly 0.0, 0.1 or 0.2 stops.
 
-#### July 2015: ILCE-7RM2 offsets appear to be different ... exclude from existing tags
+#### July 2015: ILCE-(7RM2|7SM2) offsets appear to be different ... exclude from existing tags
 
     0x0031 => { #JR
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-7RM2)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(7RM2|7SM2))/',
         Name => 'FlashStatus',
         RawConv => '$$self{FlashFired} = $val',
         PrintConv => {
@@ -6315,14 +6320,14 @@ my %pictureProfile2010 = (
         # this seems to be valid for the A37,A57,A65,A77,A99, and possibly the NEX-5N/7
         # but I haven't seen a count over 65536, so the Format is not confirmed - PH
         # - not valid for the DSC-RX100 or RX1, so exclude all DSC models
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-7RM2)/', #PH
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(7RM2|7SM2))/', #PH
         Format => 'int32u',
         Notes => 'total number of image exposures made by the camera',
         RawConv => '$val & 0x00ffffff',
     },
     0x003a => { # appr. same value as Exif ExposureTime, but longer in HDR-modes
         Name => 'SonyExposureTime',
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-7RM2)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(7RM2|7SM2))/',
         Format => 'int16u',
         ValueConv => '$val ? 2 ** (16 - $val/256) : 0',
         ValueConvInv => '$val ? int((16 - log($val) / log(2)) * 256 + 0.5) : 0',
@@ -6331,7 +6336,7 @@ my %pictureProfile2010 = (
     },
     0x003c => {
         Name => 'SonyFNumber',
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-7RM2)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(7RM2|7SM2))/',
         Format => 'int16u',
         ValueConv => '2 ** (($val/256 - 16) / 2)',
         ValueConvInv => '(log($val)*2/log(2)+16)*256',
@@ -6340,7 +6345,7 @@ my %pictureProfile2010 = (
     },
     0x003f => {
         Name => 'ReleaseMode2',
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-7RM2)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(7RM2|7SM2))/',
         %releaseMode2,
     },
     0x004c => { # only ILCE-7/7R/7S/7M2/5000/5100/6000/QX1 - but appears not valid when flash is used ...
@@ -6369,9 +6374,14 @@ my %pictureProfile2010 = (
         PrintConv => '$self->ConvertDateTime($val)',
         PrintConvInv => '$self->InverseDateTime($val,0)',
     },
+    0x0067 => {
+        Name => 'ReleaseMode2',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|SLT-A(65V|77V)|Lunar|NEX-(5N|7|VG20E)|ILCE-(7RM2|7SM2))/',
+        %releaseMode2,
+    },
     0x007c => { #JR valid for ILCE and most NEX
         Name => 'InternalSerialNumber', # (NC)
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|Lunar|NEX-(5N|7|VG20E)|SLT-|HV|ILCA-|ILCE-7RM2)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|Lunar|NEX-(5N|7|VG20E)|SLT-|HV|ILCA-|ILCE-(7RM2|7SM2))/',
         Format => 'int8u[4]',
         PrintConv => 'unpack "H*", pack "C*", split " ", $val',
     },
@@ -6383,10 +6393,10 @@ my %pictureProfile2010 = (
         PrintConvInv => 'join " ", unpack "C*", pack "H*", $val',
     },
 
-##### ILCE-7RM2: offsets +8
+##### ILCE-(7RM2|7SM2): offsets +8
 
     0x0039 => {
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
         Name => 'FlashStatus',
         RawConv => '$$self{FlashFired} = $val',
         PrintConv => {
@@ -6401,17 +6411,17 @@ my %pictureProfile2010 = (
     },
     0x003a => {
         Name => 'ImageCount',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
         Format => 'int32u',
         Notes => 'total number of image exposures made by the camera',
         RawConv => '$val & 0x00ffffff',
     },
 
-##### ILCE-7RM2: offsets +12 (x0c):
+##### ILCE-(7RM2|7SM2): offsets +12 (x0c):
 
     0x0046 => { # appr. same value as Exif ExposureTime, but longer in HDR-modes
         Name => 'SonyExposureTime',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
         Format => 'int16u',
         ValueConv => '$val ? 2 ** (16 - $val/256) : 0',
         ValueConvInv => '$val ? int((16 - log($val) / log(2)) * 256 + 0.5) : 0',
@@ -6420,7 +6430,7 @@ my %pictureProfile2010 = (
     },
     0x0048 => {
         Name => 'SonyFNumber',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
         Format => 'int16u',
         ValueConv => '2 ** (($val/256 - 16) / 2)',
         ValueConvInv => '(log($val)*2/log(2)+16)*256',
@@ -6429,18 +6439,18 @@ my %pictureProfile2010 = (
     },
     0x004b => {
         Name => 'ReleaseMode2',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
         %releaseMode2,
     },
-    0x0058 => { # only ILCE-7RM2 - but appears not valid when flash is used ...
+    0x0058 => { # only ILCE-(7RM2|7SM2) - but appears not valid when flash is used ...
         Name => 'ImageCount2',
-        Condition => '($$self{Model} =~ /^(ILCE-7RM2)\b/) and (($$self{FlashFired} & 0x01) != 1)',
+        Condition => '($$self{Model} =~ /^(ILCE-(7RM2|7SM2))\b/) and (($$self{FlashFired} & 0x01) != 1)',
         Format => 'int32u',
         RawConv => '$val & 0x00ffffff',
     },
-    0x005d => { # only ILCE-7RM2, but only minutes-seconds ???
+    0x005d => { # only ILCE-(7RM2|7SM2), but only minutes-seconds ???
         Name => 'SonyDateTime2',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))\b/',
         Groups => { 2 => 'Time' },
         Shift => 'Time',
         Format => 'undef[6]',
@@ -6457,8 +6467,19 @@ my %pictureProfile2010 = (
         PrintConv => '$self->ConvertDateTime($val)',
         PrintConvInv => '$self->InverseDateTime($val,0)',
     },
+    0x0073 => {
+        Name => 'ReleaseMode2',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
+        %releaseMode2,
+    },
+    0x0088 => {
+        Name => 'InternalSerialNumber', # (NC)
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
+        Format => 'int8u[6]',
+        PrintConv => 'unpack "H*", pack "C*", split " ", $val',
+    },
 
-##### ILCE-7RM2: same offsets for lens info tags
+##### ILCE-(7RM2|7SM2): same offsets for lens info tags
 
     # 0x0104 - same as 0x0105, but has value 3 for 50mm F1.4 ZA, DT 18-135mm and for 70-400mm G II: meaning ??
     0x0105 => {
@@ -6561,7 +6582,7 @@ my %pictureProfile2010 = (
         Name => 'ImageCount3',
         Format => 'int32u',
         RawConv => '$val == 0 ? undef : $val',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))/',
     },
 
 #    0x0222 => {Name=>'9050_LensType2',Format=>'int16u',Condition =>'$$self{Model}=~/^(ILCE-(5100|7S|7M2|QX1))/'},
@@ -7221,14 +7242,14 @@ my %pictureProfile2010 = (
     },
     0x0342 => {
         Name => 'LensZoomPosition',
-        Condition => '$$self{Model} !~ /^(ILCA-|ILCE-7RM2|DSC-(HX90V|RX10M2|RX100M4|WX500))/',
+        Condition => '$$self{Model} !~ /^(ILCA-|ILCE-(7RM2|7SM2)|DSC-(HX90V|RX10M2|RX100M4|WX500))/',
         Format => 'int16u',
         PrintConv => 'sprintf("%.0f%%",$val/10.24)',
         PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
     },
     0x035a => {
         Name => 'LensZoomPosition',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2|DSC-(HX90V|RX10M2|RX100M4|WX500))/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2)|DSC-(HX90V|RX10M2|RX100M4|WX500))/',
         Format => 'int16u',
         PrintConv => 'sprintf("%.0f%%",$val/10.24)',
         PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
@@ -7672,11 +7693,11 @@ my %pictureProfile2010 = (
     #          other NEX/ILCE: 74 blocks of 164 bytes
 
     # 0x1a06 onwards - first seen for ILCE-7RM2: appears to be some kind of metering image
-    0x1a06 => { Name => 'TiffMeteringImageWidth',  Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/' },
-    0x1a07 => { Name => 'TiffMeteringImageHeight', Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/' },
+    0x1a06 => { Name => 'TiffMeteringImageWidth',  Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))\b/' },
+    0x1a07 => { Name => 'TiffMeteringImageHeight', Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))\b/' },
     0x1a08 => { # (2640 bytes: 1 set of 44x30 int16u values)
         Name => 'TiffMeteringImage',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7RM2|7SM2))\b/',
         Format => 'undef[2640]',
         Notes => q{
             13(?)-bit intensity data from 1320 (1200) metering segments, extracted as a
@@ -8256,7 +8277,7 @@ my %pictureProfile2010 = (
             # if this value is the 35mm equivalent magnification, then the formula could
             # be (1.5 * 2**($val/16-5)+1) * FocalLength, but this tends to underestimate
             # distance by about 18% (ref 20) (255=inf)
-            # modified 16-10-2014 based on A99V measurements: use FocalLengthIn35mmFormat and leave out the "1.5*" factor. 
+            # modified 16-10-2014 based on A99V measurements: use FocalLengthIn35mmFormat and leave out the "1.5*" factor.
         Require => {
             0 => 'Sony:FocusPosition2',
             1 => 'FocalLengthIn35mmFormat',
@@ -8479,7 +8500,7 @@ sub PrintLensSpec($)
             # add feature name as a prefix or suffix to the LensSpec
             my $str = $$feature[1]{$bits} || sprintf('Unknown(%.4x)',$bits);
             $rtnVal = $rtnVal ? ($$feature[2] ? "$str $rtnVal" : "$rtnVal $str") : $str;
-        }    
+        }
     } else {
         $rtnVal = "Unknown ($val)";
     }