exiftool_vendored 12.22.0 → 12.34.0

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

@@ -0,0 +1,341 @@
+#------------------------------------------------------------------------------
+# File:         MRC.pm
+#
+# Description:  Read MRC (Medical Research Council) image files
+#
+# Revisions:    2021-04-21 - P. Harvey Created
+#
+# References:   1) https://www.ccpem.ac.uk/mrc_format/mrc2014.php
+#               2) http://legacy.ccp4.ac.uk/html/library.html
+#               3) https://github.com/ccpem/mrcfile/blob/master/mrcfile/dtypes.py
+#
+# Notes:        The header is basically identical to the older CCP4 file format
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::MRC;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+
+$VERSION = '1.00';
+
+my %bool = (
+    Format => 'int8u',
+    PrintConv => { 0 => 'No', 1 => 'Yes' } 
+);
+
+%Image::ExifTool::MRC::Main = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    FORMAT => 'int32u',
+    NOTES => q{
+        Tags extracted from Medical Research Council (MRC) format imaging files. 
+        See L<https://www.ccpem.ac.uk/mrc_format/mrc2014.php> for the specification.
+    },
+    0 => 'ImageWidth',
+    1 => 'ImageHeight',
+    2 => {
+        Name => 'ImageDepth',
+        Notes => q{
+            number of sections. Use ExtractEmbedded option to extract metadata for all
+            sections
+        },
+        RawConv => '$$self{ImageDepth} = $val',
+    },
+    3 => {
+        Name => 'ImageMode',
+        PrintConv => {
+            0 => '8-bit signed integer',
+            1 => '16-bit signed integer',
+            2 => '32-bit signed real',
+            3 => 'complex 16-bit integer',
+            4 => 'complex 32-bit real',
+            6 => '16-bit unsigned integer',
+        },
+    },
+    4 => { Name => 'StartPoint', Format => 'int32u[3]' },
+    7 => { Name => 'GridSize',   Format => 'int32u[3]' },
+    10 => { Name => 'CellWidth', Format => 'float', Notes => 'cell size in angstroms' },
+    11 => { Name => 'CellHeight',Format => 'float' },
+    12 => { Name => 'CellDepth', Format => 'float' },
+    13 => { Name => 'CellAlpha', Format => 'float' },
+    14 => { Name => 'CellBeta',  Format => 'float' },
+    15 => { Name => 'CellGamma', Format => 'float' },
+    16 => { Name => 'ImageWidthAxis',  PrintConv => { 1 => 'X', 2 => 'Y', 3 => 'Z' } },
+    17 => { Name => 'ImageHeightAxis', PrintConv => { 1 => 'X', 2 => 'Y', 3 => 'Z' } },
+    18 => { Name => 'ImageDepthAxis',  PrintConv => { 1 => 'X', 2 => 'Y', 3 => 'Z' } },
+    19 => { Name => 'DensityMin', Format => 'float' },
+    20 => { Name => 'DensityMax', Format => 'float' },
+    21 => { Name => 'DensityMean',Format => 'float' },
+    22 => 'SpaceGroupNumber',
+    23 => { Name => 'ExtendedHeaderSize', RawConv => '$$self{ExtendedHeaderSize} = $val' },
+    26 => { Name => 'ExtendedHeaderType', Format => 'string[4]', RawConv => '$$self{ExtendedHeaderType} = $val' },
+    27 => 'MRCVersion',
+    49 => { Name => 'Origin',     Format => 'float[3]' },
+    53 => { Name => 'MachineStamp', Format => 'int8u[4]', PrintConv => 'sprintf("0x%.2x 0x%.2x 0x%.2x 0x%.2x",split " ", $val)' },
+    54 => { Name => 'RMSDeviation', Format => 'float' },
+    55 => { Name => 'NumberOfLabels', RawConv => '$$self{NLab} = $val' },
+    56 => { Name => 'Label0', Format => 'string[80]', Condition => '$$self{NLab} > 0' },
+    76 => { Name => 'Label1', Format => 'string[80]', Condition => '$$self{NLab} > 1' },
+    96 => { Name => 'Label2', Format => 'string[80]', Condition => '$$self{NLab} > 2' },
+   116 => { Name => 'Label3', Format => 'string[80]', Condition => '$$self{NLab} > 3' },
+   136 => { Name => 'Label4', Format => 'string[80]', Condition => '$$self{NLab} > 4' },
+   156 => { Name => 'Label5', Format => 'string[80]', Condition => '$$self{NLab} > 5' },
+   176 => { Name => 'Label6', Format => 'string[80]', Condition => '$$self{NLab} > 6' },
+   196 => { Name => 'Label7', Format => 'string[80]', Condition => '$$self{NLab} > 7' },
+   216 => { Name => 'Label8', Format => 'string[80]', Condition => '$$self{NLab} > 8' },
+   236 => { Name => 'Label9', Format => 'string[80]', Condition => '$$self{NLab} > 9' },
+);
+
+%Image::ExifTool::MRC::FEI12 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup (way too many!)
+    NOTES => 'Tags extracted from FEI1 and FEI2 extended headers.',
+    0 => { Name => 'MetadataSize',    Format => 'int32u', RawConv => '$$self{MetadataSize} = $val' },
+    4 => { Name => 'MetadataVersion', Format => 'int32u' },
+    8 => {
+        Name => 'Bitmask1',
+        Format => 'int32u',
+        RawConv => '$$self{BitM} = $val',
+        PrintConv => 'sprintf("0x%.8x", $val)',
+    },
+    12 => {
+        Name => 'TimeStamp',
+        Format => 'double', 
+        Condition => '$$self{BitM} & 0x01',
+        Groups => { 2 => 'Time'},
+        # shift from days since Dec 30, 1899 to Unix epoch of Jan 1, 1970
+        # (my sample looks like local time, although it should be UTC)
+        ValueConv => 'ConvertUnixTime(($val-25569)*24*3600)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    20  => { Name => 'MicroscopeType',  Format => 'string[16]', Condition => '$$self{BitM} & 0x02' },
+    36  => { Name => 'MicroscopeID',    Format => 'string[16]', Condition => '$$self{BitM} & 0x04' },
+    52  => { Name => 'Application',     Format => 'string[16]', Condition => '$$self{BitM} & 0x08' },
+    68  => { Name => 'AppVersion',      Format => 'string[16]', Condition => '$$self{BitM} & 0x10' },
+    84  => { Name => 'HighTension',     Format => 'double',     Condition => '$$self{BitM} & 0x20', Notes => 'volts' },
+    92  => { Name => 'Dose',            Format => 'double',     Condition => '$$self{BitM} & 0x40', Notes => 'electrons/m2' },
+    100 => { Name => 'AlphaTilt',       Format => 'double',     Condition => '$$self{BitM} & 0x80' },
+    108 => { Name => 'BetaTilt',        Format => 'double',     Condition => '$$self{BitM} & 0x100' },
+    116 => { Name => 'XStage',          Format => 'double',     Condition => '$$self{BitM} & 0x200' },
+    124 => { Name => 'YStage',          Format => 'double',     Condition => '$$self{BitM} & 0x400' },
+    132 => { Name => 'ZStage',          Format => 'double',     Condition => '$$self{BitM} & 0x800' },
+    140 => { Name => 'TiltAxisAngle',   Format => 'double',     Condition => '$$self{BitM} & 0x1000' },
+    148 => { Name => 'DualAxisRot',     Format => 'double',     Condition => '$$self{BitM} & 0x2000' },
+    156 => { Name => 'PixelSizeX',      Format => 'double',     Condition => '$$self{BitM} & 0x4000' },
+    164 => { Name => 'PixelSizeY',      Format => 'double',     Condition => '$$self{BitM} & 0x8000' },
+    220 => { Name => 'Defocus',         Format => 'double',     Condition => '$$self{BitM} & 0x400000' },
+    228 => { Name => 'STEMDefocus',     Format => 'double',     Condition => '$$self{BitM} & 0x800000' },
+    236 => { Name => 'AppliedDefocus',  Format => 'double',     Condition => '$$self{BitM} & 0x1000000' },
+    244 => { Name => 'InstrumentMode',  Format => 'int32u',     Condition => '$$self{BitM} & 0x2000000', PrintConv => { 1 => 'TEM', 2 => 'STEM' } },
+    248 => { Name => 'ProjectionMode',  Format => 'int32u',     Condition => '$$self{BitM} & 0x4000000', PrintConv => { 1 => 'Diffraction', 2 => 'Imaging' } },
+    252 => { Name => 'ObjectiveLens',   Format => 'string[16]', Condition => '$$self{BitM} & 0x8000000' },
+    268 => { Name => 'HighMagnificationMode', Format => 'string[16]', Condition => '$$self{BitM} & 0x10000000' },
+    284 => { Name => 'ProbeMode',       Format => 'int32u',     Condition => '$$self{BitM} & 0x20000000', PrintConv => { 1 => 'Nano', 2 => 'Micro' } },
+    288 => { Name => 'EFTEMOn',         %bool,                  Condition => '$$self{BitM} & 0x40000000' },
+    289 => { Name => 'Magnification',   Format => 'double',     Condition => '$$self{BitM} & 0x80000000' },
+    297 => {
+        Name => 'Bitmask2',
+        Format => 'int32u',
+        RawConv => '$$self{BitM} = $val',
+        PrintConv => 'sprintf("0x%.8x", $val)',
+    },
+    301 => { Name => 'CameraLength',    Format => 'double',     Condition => '$$self{BitM} & 0x01' },
+    309 => { Name => 'SpotIndex',       Format => 'int32u',     Condition => '$$self{BitM} & 0x02' },
+    313 => { Name => 'IlluminationArea',Format => 'double',     Condition => '$$self{BitM} & 0x04' },
+    321 => { Name => 'Intensity',       Format => 'double',     Condition => '$$self{BitM} & 0x08' },
+    329 => { Name => 'ConvergenceAngle',Format => 'double',     Condition => '$$self{BitM} & 0x10' },
+    337 => { Name => 'IlluminationMode',Format => 'string[16]', Condition => '$$self{BitM} & 0x20' },
+    353 => { Name => 'WideConvergenceAngleRange', %bool,        Condition => '$$self{BitM} & 0x40' },
+    354 => { Name => 'SlitInserted',    %bool,                  Condition => '$$self{BitM} & 0x80' },
+    355 => { Name => 'SlitWidth',       Format => 'double',     Condition => '$$self{BitM} & 0x100' },
+    363 => { Name => 'AccelVoltOffset', Format => 'double',     Condition => '$$self{BitM} & 0x200' },
+    371 => { Name => 'DriftTubeVolt',   Format => 'double',     Condition => '$$self{BitM} & 0x400' },
+    379 => { Name => 'EnergyShift',     Format => 'double',     Condition => '$$self{BitM} & 0x800' },
+    387 => { Name => 'ShiftOffsetX',    Format => 'double',     Condition => '$$self{BitM} & 0x1000' },
+    395 => { Name => 'ShiftOffsetY',    Format => 'double',     Condition => '$$self{BitM} & 0x2000' },
+    403 => { Name => 'ShiftX',          Format => 'double',     Condition => '$$self{BitM} & 0x4000' },
+    411 => { Name => 'ShiftY',          Format => 'double',     Condition => '$$self{BitM} & 0x8000' },
+    419 => { Name => 'IntegrationTime', Format => 'double',     Condition => '$$self{BitM} & 0x10000' },
+    427 => { Name => 'BinningWidth',    Format => 'int32u',     Condition => '$$self{BitM} & 0x20000' },
+    431 => { Name => 'BinningHeight',   Format => 'int32u',     Condition => '$$self{BitM} & 0x40000' },
+    435 => { Name => 'CameraName',      Format => 'string[16]', Condition => '$$self{BitM} & 0x80000' },
+    451 => { Name => 'ReadoutAreaLeft', Format => 'int32u',     Condition => '$$self{BitM} & 0x100000' },
+    455 => { Name => 'ReadoutAreaTop',  Format => 'int32u',     Condition => '$$self{BitM} & 0x200000' },
+    459 => { Name => 'ReadoutAreaRight',Format => 'int32u',     Condition => '$$self{BitM} & 0x400000' },
+    463 => { Name => 'ReadoutAreaBottom',Format=> 'int32u',     Condition => '$$self{BitM} & 0x800000' },
+    467 => { Name => 'CetaNoiseReduct', %bool,                  Condition => '$$self{BitM} & 0x1000000' },
+    468 => { Name => 'CetaFramesSummed',Format => 'int32u',     Condition => '$$self{BitM} & 0x2000000' },
+    472 => { Name => 'DirectDetElectronCounting', %bool,        Condition => '$$self{BitM} & 0x4000000' },
+    473 => { Name => 'DirectDetAlignFrames',      %bool,        Condition => '$$self{BitM} & 0x8000000' },
+    490 => {
+        Name => 'Bitmask3',
+        Format => 'int32u',
+        RawConv => '$$self{BitM} = $val',
+        PrintConv => 'sprintf("0x%.8x", $val)',
+    },
+    518 => { Name => 'PhasePlate',      %bool,                  Condition => '$$self{BitM} & 0x40' },
+    519 => { Name => 'STEMDetectorName',Format => 'string[16]', Condition => '$$self{BitM} & 0x80' },
+    535 => { Name => 'Gain',            Format => 'double',     Condition => '$$self{BitM} & 0x100' },
+    543 => { Name => 'Offset',          Format => 'double',     Condition => '$$self{BitM} & 0x200' },
+    571 => { Name => 'DwellTime',       Format => 'double',     Condition => '$$self{BitM} & 0x8000' },
+    579 => { Name => 'FrameTime',       Format => 'double',     Condition => '$$self{BitM} & 0x10000' },
+    587 => { Name => 'ScanSizeLeft',    Format => 'int32u',     Condition => '$$self{BitM} & 0x20000' },
+    591 => { Name => 'ScanSizeTop',     Format => 'int32u',     Condition => '$$self{BitM} & 0x40000' },
+    595 => { Name => 'ScanSizeRight',   Format => 'int32u',     Condition => '$$self{BitM} & 0x80000' },
+    599 => { Name => 'ScanSizeBottom',  Format => 'int32u',     Condition => '$$self{BitM} & 0x100000' },
+    603 => { Name => 'FullScanFOV_X',   Format => 'double',     Condition => '$$self{BitM} & 0x200000' },
+    611 => { Name => 'FullScanFOV_Y',   Format => 'double',     Condition => '$$self{BitM} & 0x400000' },
+    619 => { Name => 'Element',         Format => 'string[16]', Condition => '$$self{BitM} & 0x800000' },
+    635 => { Name => 'EnergyIntervalLower', Format => 'double', Condition => '$$self{BitM} & 0x1000000' },
+    643 => { Name => 'EnergyIntervalHigher',Format => 'double', Condition => '$$self{BitM} & 0x2000000' },
+    651 => { Name => 'Method',          Format=> 'int32u',      Condition => '$$self{BitM} & 0x4000000' },
+    655 => { Name => 'IsDoseFraction',  %bool,                  Condition => '$$self{BitM} & 0x8000000' },
+    656 => { Name => 'FractionNumber',  Format => 'int32u',     Condition => '$$self{BitM} & 0x10000000' },
+    660 => { Name => 'StartFrame',      Format => 'int32u',     Condition => '$$self{BitM} & 0x20000000' },
+    664 => { Name => 'EndFrame',        Format => 'int32u',     Condition => '$$self{BitM} & 0x40000000' },
+    668 => { Name =>'InputStackFilename',Format=> 'string[80]', Condition => '$$self{BitM} & 0x80000000' },
+    748 => {
+        Name => 'Bitmask4',
+        Format => 'int32u',
+        RawConv => '$$self{BitM} = $val',
+        PrintConv => 'sprintf("0x%.8x", $val)',
+    },
+    752 => { Name => 'AlphaTiltMin',   Format => 'double',     Condition => '$$self{BitM} & 0x01' },
+    760 => { Name => 'AlphaTiltMax',   Format => 'double',     Condition => '$$self{BitM} & 0x02' },
+#
+# FEI2 header starts here
+#
+    768 => { Name => 'ScanRotation',   Format => 'double',     Condition => '$$self{BitM} & 0x04' },
+    776 => { Name => 'DiffractionPatternRotation',Format=>'double', Condition => '$$self{BitM} & 0x08' },
+    784 => { Name => 'ImageRotation',  Format => 'double',     Condition => '$$self{BitM} & 0x10' },
+    792 => { Name => 'ScanModeEnumeration',Format => 'int32u', Condition => '$$self{BitM} & 0x20', PrintConv => { 0 => 'Other', 1 => 'Raster', 2 => 'Serpentine' } },
+    796 => {
+        Name => 'AcquisitionTimeStamp',
+        Format => 'int64u',
+        Condition => '$$self{BitM} & 0x40',
+        Groups => { 2 => 'Time' },
+        # microseconds since 1970 UTC
+        ValueConv => 'ConvertUnixTime($val / 1e6, 1, 6)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    804 => { Name => 'DetectorCommercialName', Format => 'string[16]', Condition => '$$self{BitM} & 0x80' },
+    820 => { Name => 'StartTiltAngle', Format => 'double',     Condition => '$$self{BitM} & 0x100' },
+    828 => { Name => 'EndTiltAngle',   Format => 'double',     Condition => '$$self{BitM} & 0x200' },
+    836 => { Name => 'TiltPerImage',   Format => 'double',     Condition => '$$self{BitM} & 0x400' },
+    844 => { Name => 'TitlSpeed',      Format => 'double',     Condition => '$$self{BitM} & 0x800' },
+    852 => { Name => 'BeamCenterX',    Format => 'int32u',     Condition => '$$self{BitM} & 0x1000' },
+    856 => { Name => 'BeamCenterY',    Format => 'int32u',     Condition => '$$self{BitM} & 0x2000' },
+    860 => {
+        Name => 'CFEGFlashTimeStamp',
+        Format => 'int64u',
+        Condition => '$$self{BitM} & 0x4000',
+        Groups => { 2 => 'Time' },
+        ValueConv => 'ConvertUnixTime($val / 1e6, 1, 6)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    868 => { Name => 'PhasePlatePosition',Format => 'int32u',  Condition => '$$self{BitM} & 0x8000' },
+    872 => { Name => 'ObjectiveAperture', Format=>'string[16]',Condition => '$$self{BitM} & 0x10000' },
+);
+
+#------------------------------------------------------------------------------
+# Extract metadata from a MRC image
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid MRC file
+sub ProcessMRC($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($buff, $tagTablePtr, $i);
+
+    # verify this is a valid MRC file
+    return 0 unless $raf->Read($buff, 1024) == 1024;
+    # validate axes, "MAP" file type and machine stamp
+    return 0 unless $buff =~ /^.{64}[\x01\x02\x03]\0\0\0[\x01\x02\x03]\0\0\0[\x01\x02\x03]\0\0\0.{132}MAP[\0 ](\x44\x44|\x44\x41|\x11\x11)\0\0/s;
+
+    $et->SetFileType();
+    SetByteOrder('II');
+    my %dirInfo = (
+        DataPt => \$buff,
+        DirStart => 0,
+        DirLen => length($buff),
+    );
+    $tagTablePtr = GetTagTable('Image::ExifTool::MRC::Main');
+    $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
+
+    # (I don't have any samples with extended headers for testing, so these are not yet decoded)
+    if ($$et{ExtendedHeaderSize} and $$et{ExtendedHeaderType} =~ /^FEI[12]/) {
+        unless ($raf->Read($buff,4)==4 and $raf->Seek(-4,1)) { # read metadata size
+            $et->Warn('Error reading extended header'); 
+            return 1;
+        }
+        my $size = Get32u(\$buff, 0);
+        if ($size * $$et{ImageDepth} > $$et{ExtendedHeaderSize}) {
+            $et->Warn('Corrupted extended header');
+            return 1;
+        }
+        $dirInfo{DirLen} = $size;
+        $tagTablePtr = GetTagTable('Image::ExifTool::MRC::FEI12');
+        for ($i=0; ;) {
+            $dirInfo{DataPos} = $raf->Tell();
+            $raf->Read($buff, $size) == $size or $et->Warn("Error reading extended header $i"), last;
+            $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
+            last if ++$i >= $$et{ImageDepth};
+            unless ($$et{OPTIONS}{ExtractEmbedded}) {
+                $et->Warn('Use the ExtractEmbedded option to read metadata for all frames',3);
+                last;
+            }
+            $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+        }
+        delete $$et{DOC_NUM};
+    }
+
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::MRC - Read MRC meta information
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read
+metadata from Medical Research Council (MRC) images.
+
+=head1 AUTHOR
+
+Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://www.ccpem.ac.uk/mrc_format/mrc2014.php>
+
+=item L<http://legacy.ccp4.ac.uk/html/library.html>
+
+=item L<https://github.com/ccpem/mrcfile/blob/master/mrcfile/dtypes.py>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/MRC Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -460,7 +460,7 @@ my %sKeywordStruct;
     NOTES => q{
         Image region metadata defined by the MWG 2.0 specification.  These tags
         may be accessed without the need to load the MWG Composite tags above.  See
-        L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+        L<https://web.archive.org/web/20180919181934/http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf>
         for the official specification.
     },
     Regions => {
@@ -490,7 +490,7 @@ my %sKeywordStruct;
         ExifTool unrolls keyword structures to an arbitrary depth of 6 to allow
         individual levels to be accessed with different tag names, and to avoid
         infinite recursion.  See
-        L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+        L<https://web.archive.org/web/20180919181934/http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf>
         for the official specification.
     },
     # arbitrarily define only the first 6 levels of the keyword hierarchy
@@ -529,7 +529,7 @@ my %sKeywordStruct;
     NAMESPACE => 'mwg-coll',
     NOTES => q{
         Collections metadata defined by the MWG 2.0 specification.  See
-        L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/>
+        L<https://web.archive.org/web/20180919181934/http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf>
         for the official specification.
     },
     Collections => {

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

@@ -1066,7 +1066,7 @@ my %componentDataDef = (
     '060e2b34.0101.0102.04010503.08000000' => { Name => 'Palette', Type => 'DataValue', Unknown => 1 },
     '060e2b34.0101.0102.04010503.09000000' => { Name => 'PaletteLayout', Type => 'RGBALayout', Unknown => 1 },
     '060e2b34.0101.0102.04010503.0a000000' => { Name => 'ComponentDepth', Format => 'int32u' },
-    '060e2b34.0101.0102.04010601.00000000' => { Name => 'VideoCodingSchemeID', Type => 'AUID', Unknown => 1 },
+    '060e2b34.0101.0102.04010601.00000000' => { Name => 'VideoCodingSchemeID', Type => 'AUID' },
     '060e2b34.0101.0102.04010802.03000000' => { Name => 'RoundedCaptureFilmFrameRate', Format => 'int32u' },
     '060e2b34.0101.0102.04020301.02000000' => { Name => 'AudioAverageBitrate', Format => 'float', PrintConv => 'ConvertBitrate($val)', Groups => { 2 => 'Audio' } },
     '060e2b34.0101.0102.04020301.03000000' => { Name => 'AudioFixedBitrateFlag', Type => 'Boolean', Groups => { 2 => 'Audio' } },

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

@@ -52,7 +52,7 @@ my %mdDateInfo = (
     NOTES => q{
         MDItem tags are extracted using the "mdls" utility.  They are extracted if
         any "MDItem*" tag or the MacOS group is specifically requested, or by
-        setting the L<MDItemTags|../ExifTool.html#MDItemTags> API option to 1 or the L<RequestAll|../ExifTool.html#RequestAll> API option to 2 or
+        setting the API L<MDItemTags|../ExifTool.html#MDItemTags> option to 1 or the API L<RequestAll|../ExifTool.html#RequestAll> option to 2 or
         higher.  Note that these tags do not necessarily reflect the current
         metadata of a file -- it may take some time for the MacOS mdworker daemon to
         index the file after a metadata change.
@@ -244,8 +244,8 @@ my %mdDateInfo = (
     NOTES => q{
         XAttr tags are extracted using the "xattr" utility.  They are extracted if
         any "XAttr*" tag or the MacOS group is specifically requested, or by setting
-        the L<XAttrTags|../ExifTool.html#XAttrTags> API option to 1 or the L<RequestAll|../ExifTool.html#RequestAll> API option to 2 or higher.
-        And they extracted by default from MacOS "._" files when reading
+        the API L<XAttrTags|../ExifTool.html#XAttrTags> option to 1 or the API L<RequestAll|../ExifTool.html#RequestAll> option to 2 or higher.
+        And they are extracted by default from MacOS "._" files when reading
         these files directly.
     },
     'com.apple.FinderInfo' => {

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.22';
+$VERSION = '1.23';
 
 sub ProcessXtra($$$);
 sub WriteXtra($$$);
@@ -889,12 +889,14 @@ sub WriteXtraValue($$$)
         } elsif ($format eq 'date') {
             $dat = Image::ExifTool::GetUnixTime($val, 1);   # (convert to UTC, NC)
             if ($dat) {
+                # 100ns intervals since Jan 1, 1601
                 $dat = Set64u(($dat + 11644473600) * 1e7);
                 $type = 21;
             }
-        } elsif ($format eq 'vt_filetime') {
+        } elsif ($format eq 'vt_filetime') { # 'date' value inside a VT_VARIANT
             $dat = Image::ExifTool::GetUnixTime($val);  # (leave as local time, NC)
             if ($dat) {
+                # 100ns intervals since Jan 1, 1601
                 $dat = Set32u(64) . Set64u(($dat + 11644473600) * 1e7);
                 $type = 65;
             }
@@ -987,11 +989,11 @@ sub WriteXtra($$$)
             last;   # (it was a cheap goto)
         }
         if ($done{$tag}) {
+            $changed = 1;
             # write changed values
             my $buff = WriteXtraValue($et, $$newTags{$tag}, \@newVals);
             if (length $buff) {
                 $newData .= Set32u(8+length($tag)+length($buff)) . Set32u(length($tag)) . $tag . $buff;
-                $changed = 1;
             }
         } else {
             # nothing changed; just copy over

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

@@ -62,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.94';
+$VERSION = '4.00';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -272,6 +272,7 @@ sub GetAFPointGrid($$;$);
     '9F 58 44 44 14 14 A1 06' => 'AF-S DX Nikkor 35mm f/1.8G', #27
     'A0 54 50 50 0C 0C A2 06' => 'AF-S Nikkor 50mm f/1.4G',
     'A1 40 18 37 2C 34 A3 06' => 'AF-S DX Nikkor 10-24mm f/3.5-4.5G ED',
+    'A1 40 2D 53 2C 3C CB 86' => 'AF-P DX Nikkor 18-55mm f/3.5-5.6G', #30
     'A2 48 5C 80 24 24 A4 0E' => 'AF-S Nikkor 70-200mm f/2.8G ED VR II',
     'A3 3C 29 44 30 30 A5 0E' => 'AF-S Nikkor 16-35mm f/4G ED VR',
     'A4 54 37 37 0C 0C A6 06' => 'AF-S Nikkor 24mm f/1.4G ED',
@@ -495,6 +496,7 @@ sub GetAFPointGrid($$;$);
     '02 46 5C 82 25 25 02 00' => 'Sigma 70-210mm F2.8 APO', #JD
     '02 40 5C 82 2C 35 02 00' => 'Sigma APO 70-210mm F3.5-4.5',
     '26 3C 5C 82 30 3C 1C 02' => 'Sigma 70-210mm F4-5.6 UC-II',
+    '02 3B 5C 82 30 3C 02 00' => 'Sigma Zoom-K 70-210mm F4-5.6', #30
     '26 3C 5C 8E 30 3C 1C 02' => 'Sigma 70-300mm F4-5.6 DG Macro',
     '56 3C 5C 8E 30 3C 1C 02' => 'Sigma 70-300mm F4-5.6 APO Macro Super II',
     'E0 3C 5C 8E 30 3C 4B 06' => 'Sigma 70-300mm F4-5.6 APO DG Macro HSM', #22
@@ -554,6 +556,7 @@ sub GetAFPointGrid($$;$);
     'F3 54 2B 50 24 24 84 0E' => 'Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical (IF) (B005)',
     '00 3F 2D 80 2B 40 00 06' => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) (A14)',
     '00 3F 2D 80 2C 40 00 06' => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14)',
+    'EC 3E 3C 8E 2C 40 DF 0E' => 'Tamron 28-300mm f/3.5-6.3 Di VC PZD A010', #30
     '00 40 2D 80 2C 40 00 06' => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)', #NJ
     'FC 40 2D 80 2C 40 DF 06' => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)', #PH (NC)
     'E6 40 2D 80 2C 40 DF 0E' => 'Tamron 18-200mm f/3.5-6.3 Di II VC (B018)', #Tanel (removed AF designation, ref 37)
@@ -563,7 +566,7 @@ sub GetAFPointGrid($$;$);
     'F0 3F 2D 8A 2C 40 DF 0E' => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)',
     'E0 40 2D 98 2C 41 DF 4E' => 'Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)', # (removed AF designation, ref 37)
     '07 40 2F 44 2C 34 03 02' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
-    '07 40 30 45 2D 35 03 02' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
+    '07 40 30 45 2D 35 03 02.1' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
     '00 49 30 48 22 2B 00 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     '0E 4A 31 48 23 2D 0E 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     'FE 48 37 5C 24 24 DF 0E' => 'Tamron SP 24-70mm f/2.8 Di VC USD (A007)', #24
@@ -595,6 +598,7 @@ sub GetAFPointGrid($$;$);
     '00 48 5C 8E 30 3C 00 06' => 'Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17NII)', #JD
     'F1 47 5C 8E 30 3C DF 0E' => 'Tamron SP 70-300mm f/4-5.6 Di VC USD (A005)',
     'CF 47 5C 8E 31 3D DF 0E' => 'Tamron SP 70-300mm f/4-5.6 Di VC USD (A030)', #forum9773
+    'CC 44 68 98 34 41 DF 0E' => 'Tamron 100-400mm f/4.5-6.3 Di VC USD', #30
     'EB 40 76 A6 38 40 DF 0E' => 'Tamron SP AF 150-600mm f/5-6.3 VC USD (A011)',
     'E3 40 76 A6 38 40 DF 4E' => 'Tamron SP 150-600mm f/5-6.3 Di VC USD G2', #30
     '20 3C 80 98 3D 3D 1E 02' => 'Tamron AF 200-400mm f/5.6 LD IF (75D)',
@@ -612,6 +616,7 @@ sub GetAFPointGrid($$;$);
     '7A 48 1C 29 24 24 7E 06' => 'Tokina AT-X 116 PRO DX II (AF 11-16mm f/2.8)',
     '80 48 1C 29 24 24 7A 06' => 'Tokina atx-i 11-16mm F2.8 CF', #exiv2 issue 1078
     '7A 48 1C 30 24 24 7E 06' => 'Tokina AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)',
+    '8B 48 1C 30 24 24 85 06' => 'Tokina AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)', #forum12687
     '00 3C 1F 37 30 30 00 06' => 'Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)',
     '7A 3C 1F 37 30 30 7E 06.2' => 'Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)',
     '7A 3C 1F 3C 30 30 7E 06' => 'Tokina AT-X 12-28 PRO DX (AF 12-28mm f/4)',
@@ -656,6 +661,7 @@ sub GetAFPointGrid($$;$);
     '00 54 48 48 18 18 00 00' => 'Voigtlander Ultron 40mm F2 SLII Aspherical',
     '00 54 55 55 0C 0C 00 00' => 'Voigtlander Nokton 58mm F1.4 SLII',
     '00 40 64 64 2C 2C 00 00' => 'Voigtlander APO-Lanthar 90mm F3.5 SLII Close Focus',
+    '07 40 30 45 2D 35 03 02.2' => 'Voigtlander Ultragon 19-35mm F3.5-4.5 VMV', #NJ
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
@@ -717,6 +723,9 @@ sub GetAFPointGrid($$;$);
     '00 40 11 11 2C 2C 00 00' => 'Samyang 8mm f/3.5 Fish-Eye',
     '00 58 64 64 20 20 00 00' => 'Soligor C/D Macro MC 90mm f/2.5',
     '4A 58 30 30 14 0C 4D 02' => 'Rokinon 20mm f/1.8 ED AS UMC', #30
+#
+    'A0 56 44 44 14 14 A2 06' => 'Sony FE 35mm F1.8', #IB (Techart adapter)
+    'A0 37 5C 8E 34 3C A2 06' => 'Sony FE 70-300mm F4.5-5.6 G OSS', #IB (Techart adapter)
 );
 
 # text encoding used in LocationInfo (ref PH)
@@ -4719,6 +4728,9 @@ my %nikonFocalConversions = (
             21 => 'Nikkor Z 50mm f/1.2 S', #IB
             22 => 'Nikkor Z 24-50mm f/4-6.3', #IB
             23 => 'Nikkor Z 14-24mm f/2.8 S', #IB
+            24 => 'Nikkor Z MC 105mm f/2.8 VR S', #IB
+            27 => 'Nikkor Z MC 50mm f/2.8', #IB
+            29 => 'Nikkor Z 28mm f/2.8', #IB
         },
     },
     0x36 => {
@@ -8491,8 +8503,8 @@ my %nikonFocalConversions = (
     # 0x02 - undef[148]
     # 0x03 - undef[284]
     # 0x04 - undef[148,212]
-    # 0x05 - undef[84]
-    # 0x06 - undef[116]
+    # 0x05 - undef[84] (barrel distortion params at offsets 0x14,0x1c,0x24, ref 28)
+    # 0x06 - undef[116] (vignette correction params at offsets 0x24,0x34,0x44, ref 28)
     # 0x07 - undef[104]
     # 0x08 - undef[24]
     # 0x09 - undef[36]
@@ -9467,7 +9479,7 @@ sub GetAFPointGrid($$;$)
         return undef unless $val =~ /^([A-J])(\d+)$/i;
         return (ord(uc($1))-65) * $ncol + $2 - 1;
     } else {
-        my $row = int(($val + 0.5) / $ncol);
+        my $row = int(($val + 0.5) / $ncol) & 0xff;
         my $col = $val - $ncol * $row + 1;
         return chr(65+$row) . $col;
     }

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

@@ -17,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.02';
+$VERSION = '1.04';
 
 sub ProcessNikonSettings($$$);
 
@@ -592,7 +592,7 @@ my %infoD6 = (
         },
     },
     0x026 => { Name => 'AF-AssistIlluminator',      PrintConv => \%onOff }, # CSa11 (Z7_2)
-  # 0x027 => { Name => 'ManualFocusRingInAFMode',   PrintConv => \%onOff }, # CSa18 (D6,Z7_2) capability documented in manual, but visibility (& ability to test) requires a compatible lens
+    0x027 => { Name => 'ManualFocusRingInAFMode',   PrintConv => \%onOff }, # CSa12 (D6,Z7_2) capability documented in manual, but visibility (& ability to test) requires a compatible lens
     0x029 => { Name => 'ISOStepSize',               PrintConv => \%thirdHalfFull },     # CSb1 (D6)
     0x02a => { Name => 'ExposureControlStepSize',   PrintConv => \%thirdHalfFull }, # CSb2 (D6), CSb1 (Z7_2)
     0x02b => { # CSb4 (D6), CSb2 (Z7_2)
@@ -1919,6 +1919,23 @@ my %infoD6 = (
             10 => 'Auto (Animals)',
         },
     },
+    0x170 => { Name => 'PreferSubSelectorCenter', PrintConv => \%offOn }, # CSf13 (D6 firmware v1.2.0)
+    0x171 => { # CSb8 (D6 firmware v1.3.0)
+        Name => 'KeepExposureWithTeleconverter',
+        PrintConv => {
+            1 => 'Off',
+            2 => 'Shutter Speed',
+            3 => 'ISO',
+        },
+    },
+    0x174 => { # CSa17-d (D6 firmware v1.2.0)
+        Name => 'FocusPointSelectionSpeed',
+        PrintConv => {
+            1 => 'Normal',
+            2 => 'High',
+            3 => 'Very High',
+        },
+    },
 );
 
 #------------------------------------------------------------------------------

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.71';
+$VERSION = '2.75';
 
 sub PrintLensInfo($$$);
 
@@ -113,6 +113,8 @@ my %olympusLensTypes = (
     '0 34 00' => 'Olympus Zuiko Digital ED 9-18mm F4.0-5.6', #7
     '0 34 10' => 'Olympus M.Zuiko Digital ED 12-45mm F4.0 Pro', #IB
     '0 35 00' => 'Olympus Zuiko Digital 14-54mm F2.8-3.5 II', #PH
+    '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
     # Sigma lenses
     '1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
     '1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
@@ -138,7 +140,6 @@ my %olympusLensTypes = (
     '1 15 00' => 'Sigma 10-20mm F4.0-5.6 EX DC HSM', #11
     '1 16 00' => 'Sigma APO 70-200mm F2.8 II EX DG Macro HSM', #11
     '1 17 00' => 'Sigma 50mm F1.4 EX DG HSM', #11
-    '1 18 60' => 'Test',
     # Panasonic/Leica lenses
     '2 01 00' => 'Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.', #11
     '2 01 10' => 'Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS', #16
@@ -183,6 +184,7 @@ my %olympusLensTypes = (
     '2 36 10' => 'Leica DG Elmarit 200mm F2.8 Power OIS', #IB
     '2 37 10' => 'Leica DG Vario-Elmarit 50-200mm F2.8-4 Asph. Power OIS', #IB
     '2 38 10' => 'Leica DG Vario-Summilux 10-25mm F1.7 Asph.', #IB
+    '2 40 10' => 'Leica DG Vario-Summilux 25-50mm F1.7 Asph.', #IB (H-X2550)
     '3 01 00' => 'Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.', #11
     '3 02 00' => 'Leica D Summilux 25mm F1.4 Asph.', #11
     # Tamron lenses
@@ -429,6 +431,7 @@ my %olympusCameraTypes = (
     S0085 => 'E-PL10', #IB
     S0089 => 'E-M5MarkIII',
     S0092 => 'E-M1MarkIII', #IB
+    S0093 => 'E-P7', #IB
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',
@@ -3606,6 +3609,10 @@ my %indexInfo = (
         Format => 'string[24]',
         Groups => { 2 => 'Time' },
     },
+    0x17f => {
+        Name => 'LensModel',
+        Format => 'string[32]'
+    },
 );
 
 # yet a different "thmb" atom format (PH, E-M5)