exiftool_vendored 10.01.0 → 10.04.0

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

@@ -236,7 +236,7 @@ sub ProcessLinkInfo($$$);
     GROUPS => { 2 => 'Other' },
     PROCESS_PROC => \&ProcessItemID,
     # (can't find any documentation on these items)
-    0x0032 => { 
+    0x0032 => {
         Name => 'Item0032',
         SubDirectory => { TagTable => 'Image::ExifTool::LNK::Item0032' },
     },
@@ -647,7 +647,7 @@ sub ProcessLNK($$)
         next unless $flags & $mask;
         $raf->Read($buff, 2) or return 1;
         $len = unpack('v', $buff);
-        $len *= 2 if $flags & 0x80;  # characters are 2 bytes if Unicode flag is set   
+        $len *= 2 if $flags & 0x80;  # characters are 2 bytes if Unicode flag is set
         $raf->Read($buff, $len) or return 1;
         my $val;
         $val = $et->Decode($buff, 'UCS2') if $flags & 0x80;

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

@@ -112,7 +112,7 @@ sub ExtractTags($$$)
             $tagTablePtr or $tagTablePtr = GetTagTable('Image::ExifTool::Lytro::Main');
             unless ($$tagTablePtr{$tag}) {
                 ($name = $tag) =~ s/[^-_a-zA-Z0-9](.?)/\U$1/g;
-                $name =~ s/ParametersVendorContentComLytroTags//; 
+                $name =~ s/ParametersVendorContentComLytroTags//;
                 my %tagInfo;
                 $tagInfo{Groups} = { 2 => 'Image' } unless $name =~ s/^Devices//;
                 $tagInfo{List} = 1 if ref $$meta{$key} eq 'ARRAY';

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

@@ -270,7 +270,7 @@ sub ParsePID($$$$$)
 {
     my ($et, $pid, $type, $pidName, $dataPt) = @_;
     # can't parse until we know the type (Program Map Table may be later in the stream)
-    return -1 unless defined $type;   
+    return -1 unless defined $type;
     my $verbose = $et->Options('Verbose');
     if ($verbose > 1) {
         my $out = $et->Options('TextOut');
@@ -467,7 +467,7 @@ sub ProcessM2TS($$)
             my $name = ($tableID{$table_id} || sprintf('Unknown (0x%x)',$table_id)) . ' Table';
             my $expectedID = $pid ? 0x02 : 0x00;
             unless ($table_id == $expectedID) {
-                $verbose > 1 and printf $out "  (skipping $name)\n";
+                $verbose > 1 and print $out "  (skipping $name)\n";
                 delete $needPID{$pid};
                 $didPID{$pid} = 1;
                 next;

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

@@ -72,7 +72,7 @@ sub ProcessMPImageList($$$);
                 0x40 => 'Zigzag (column start)',
             },
         ],
-    },          
+    },
     0xb202 => 'PanOverlapH',
     0xb203 => 'PanOverlapV',
     0xb204 => 'BaseViewpointNum',

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

@@ -682,7 +682,7 @@ sub RecoverTruncatedIPTC($$$)
             push @vals, RecoverTruncatedIPTC($$iptc[$i], $$xmp[$i], $limit);
         }
         return \@vals;
-    } elsif (defined $iptc and length $iptc == $limit) {    
+    } elsif (defined $iptc and length $iptc == $limit) {
         $xmp = $$xmp[0] if ref $xmp;    # take first element of list
         return $xmp if length $xmp > $limit and $iptc eq substr($xmp, 0, $limit);
     }

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

@@ -57,7 +57,6 @@ my %knownType = (
     Label => 1,     StrongReferenceBatch => 1,
     Lat => 1,       Timestamp => 1,
     Length => 1,    UID => 1,
-           
 );
 
 # common tag info parameters
@@ -2416,7 +2415,7 @@ my %componentDataDef = (
     '060e2b34.0401.0107.0d010401.02010100' => { Name => 'CryptographicFrameworkLabel', Type => 'Label', Unknown => 1 },
 );
 
-# header information 
+# header information
 %Image::ExifTool::MXF::Header = (
     GROUPS => { 2 => 'Video' },
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

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

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '1.96';
+$VERSION = '1.97';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -636,7 +636,8 @@ my $debug;          # set to 1 to enable debugging code
     {
         Name => 'MakerNoteLeica8', # used by the Q (Type 116)
         # (Q (Typ 116) starts with "LEICA\0\x08\0", Make is "LEICA CAMERA AG")
-        Condition => '$$valPt =~ /^LEICA\0\x08\0/',
+        # (SL (Typ 601) starts with "LEICA\0\x09\0", Make is "LEICA CAMERA AG")
+        Condition => '$$valPt =~ /^LEICA\0[\x08\x09]\0/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Panasonic::Leica5',
             Start => '$valuePtr + 8',
@@ -931,7 +932,7 @@ my $debug;          # set to 1 to enable debugging code
         # (starts with "SONY PIC\0" -- DSC-H200/J20/W370/W510, MHS-TS20)
         Condition => '$$valPt=~/^SONY PIC\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::PIC' },
-    },    
+    },
     {
         Name => 'MakerNoteSony5', # used in SR2 and ARW images
         Condition => '$$self{Make}=~/^SONY/ and $$valPt!~/^\x01\x00/',
@@ -1373,7 +1374,7 @@ sub LocateIFD($$)
 #
     if ($tagInfo and $$tagInfo{SubDirectory}) {
         my $subdir = $$tagInfo{SubDirectory};
-        unless ($$subdir{ProcessProc} and 
+        unless ($$subdir{ProcessProc} and
                ($$subdir{ProcessProc} eq \&ProcessUnknown or
                 $$subdir{ProcessProc} eq \&ProcessUnknownOrPreview))
         {

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.16';
+$VERSION = '1.17';
 
 sub ProcessXtra($$$);
 
@@ -84,7 +84,7 @@ sub ProcessXtra($$$);
     LastKeywordIPTC    => { List => 'Bag' },
     LastKeywordXMP     => { List => 'Bag' },
     LensManufacturer   => { },
-    LensModel          => { },
+    LensModel          => { Avoid => 1 },
     Rating => {
         Name => 'RatingPercent',
         Notes => q{
@@ -92,6 +92,8 @@ sub ProcessXtra($$$);
             correspond to RatingPercent values of 1,25,50,75 and 99 respectively
         },
     },
+    CreatorAppId             => { Name => 'CreatorAppID' },
+    CreatorOpenWithUIOptions => { },
 );
 
 # Microsoft Photo 1.1 schema properties (MP1 - written as 'prefix0' by MSPhoto) (ref PH)
@@ -125,6 +127,15 @@ sub ProcessXtra($$$);
     PanoramicStitchPhi1   => { Writable => 'real' },
     PanoramicStitchTheta0 => { Writable => 'real' },
     PanoramicStitchTheta1 => { Writable => 'real' },
+    WhiteBalance0         => { Writable => 'real' },
+    WhiteBalance1         => { Writable => 'real' },
+    WhiteBalance2         => { Writable => 'real' },
+    Brightness            => { Avoid => 1 },
+    Contrast              => { Avoid => 1 },
+    CameraModelID         => { Avoid => 1 },
+    ExposureCompensation  => { Avoid => 1 },
+    PipelineVersion       => { },
+    StreamType            => { },
 );
 
 # Microsoft Photo 1.2 schema properties (MP) (ref PH)

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

@@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.27';
+$VERSION = '2.28';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -293,7 +293,7 @@ $VERSION = '2.27';
     55 => 'Sony DT 18-55mm F3.5-5.6 SAM (SAL1855) or SAM II', #PH
     55.1 => 'Sony DT 18-55mm F3.5-5.6 SAM II (SAL18552)', #JR
     56 => 'Sony DT 55-200mm F4-5.6 SAM (SAL55200-2)', #22/JR
-    57 => 'Sony DT 50mm F1.8 SAM (SAL50F18) or Tamron Lens', #22/JR
+    57 => 'Sony DT 50mm F1.8 SAM (SAL50F18) or Tamron Lens or Commlite CM-EF-NEX adapter', #22/JR
     57.1 => 'Tamron SP AF 60mm F2 Di II LD [IF] Macro 1:1', # (Model G005) (ref http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3858.0.html)
     57.2 => 'Tamron 18-270mm F3.5-6.3 Di II PZD', #27 (Model B008)
     # (note: the Commlite CM-EF-NEX adapter also appears to give LensType 57, ref JR)
@@ -540,27 +540,28 @@ $VERSION = '2.27';
 #
 # 3rd party E lenses
 #
-   '65535.30' => 'Sigma 19mm F2.8 [EX] DN', #JR
-   '65535.31' => 'Sigma 30mm F2.8 [EX] DN', #JR
-   '65535.32' => 'Sigma 60mm F2.8 DN', #JR
-   '65535.33' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (Model B011)
-   '65535.34' => 'Zeiss Batis 25mm F2', #JR
-   '65535.35' => 'Zeiss Batis 85mm F1.8', #JR (OSS ?)
-   '65535.36' => 'Zeiss Loxia 35mm F2', #JR
-   '65535.37' => 'Zeiss Loxia 50mm F2', #JR
-   '65535.38' => 'Zeiss Touit 12mm F2.8', #JR
-   '65535.39' => 'Zeiss Touit 32mm F1.8', #JR
-   '65535.40' => 'Zeiss Touit 50mm F2.8 Macro', #JR
+    '65535.30' => 'Sigma 19mm F2.8 [EX] DN', #JR
+    '65535.31' => 'Sigma 30mm F2.8 [EX] DN', #JR
+    '65535.32' => 'Sigma 60mm F2.8 DN', #JR
+    '65535.33' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (Model B011)
+    '65535.34' => 'Zeiss Batis 25mm F2', #JR
+    '65535.35' => 'Zeiss Batis 85mm F1.8', #JR
+    '65535.36' => 'Zeiss Loxia 21mm F2.8', #JR
+    '65535.37' => 'Zeiss Loxia 35mm F2', #JR
+    '65535.38' => 'Zeiss Loxia 50mm F2', #JR
+    '65535.39' => 'Zeiss Touit 12mm F2.8', #JR
+    '65535.40' => 'Zeiss Touit 32mm F1.8', #JR
+    '65535.41' => 'Zeiss Touit 50mm F2.8 Macro', #JR
 #
 # other lenses
 #
-   '65535.41' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
-   '65535.42' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
-   '65535.43' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
-   '65535.44' => 'Samyang 500mm Mirror F8.0', #19
-   '65535.45' => 'Pentacon Auto 135mm F2.8', #19
-   '65535.46' => 'Pentacon Auto 29mm F2.8', #19
-   '65535.47' => 'Helios 44-2 58mm F2.0', #19
+    '65535.42' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
+    '65535.43' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
+    '65535.44' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
+    '65535.45' => 'Samyang 500mm Mirror F8.0', #19
+    '65535.46' => 'Pentacon Auto 135mm F2.8', #19
+    '65535.47' => 'Pentacon Auto 29mm F2.8', #19
+    '65535.48' => 'Helios 44-2 58mm F2.0', #19
 );
 
 %minoltaTeleconverters = (
@@ -2636,7 +2637,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             value is for the outer cell, then the values are given row by row, from top
             to bottom, with each row scanned left-to-right.  The 21st value is the
             middle cell, which gives the spot metering
-        },        
+        },
         ValueConv    => sub { join ' ', map( { ($_ - 106) / 8 } split(' ',$_[0]) ) },
         ValueConvInv => sub { join ' ', map( { int($_ * 8 + 106.5) } split(' ',$_[0]) ) },
     },

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

@@ -58,7 +58,7 @@ use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '3.08';
+$VERSION = '3.11';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -190,11 +190,14 @@ sub GetAFPointGrid($$;$);
     '4E 48 72 72 18 18 51 02' => 'AF DC-Nikkor 135mm f/2D',
     '4F 40 37 5C 2C 3C 53 06' => 'IX-Nikkor 24-70mm f/3.5-5.6',
     '50 48 56 7C 30 3C 54 06' => 'IX-Nikkor 60-180mm f/4-5.6',
+    '52 54 44 44 18 18 00 00' => 'Zeiss Milvus 35mm f/2', #33
     '53 48 60 80 24 24 57 02' => 'AF Zoom-Nikkor 80-200mm f/2.8D ED',
     '53 48 60 80 24 24 60 02' => 'AF Zoom-Nikkor 80-200mm f/2.8D ED',
     '54 44 5C 7C 34 3C 58 02' => 'AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED',
     '54 44 5C 7C 34 3C 61 02' => 'AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED',
+    '54 54 50 50 18 18 00 00' => 'Zeiss Milvus 50mm f/2 Makro', #33
     '56 48 5C 8E 30 3C 5A 02' => 'AF Zoom-Nikkor 70-300mm f/4-5.6D ED',
+    '56 54 68 68 18 18 00 00' => 'Zeiss Milvus 100mm f/2 Makro', #33
     '59 48 98 98 24 24 5D 02' => 'AF-S Nikkor 400mm f/2.8D IF-ED',
     '59 48 98 98 24 24 F1 02' => 'AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E',
     '59 48 98 98 24 24 E1 02' => 'AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E',
@@ -282,6 +285,7 @@ sub GetAFPointGrid($$;$);
     'AD 3C 2D 8E 2C 3C AF 0E' => 'AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR',
     'AE 54 62 62 0C 0C B0 06' => 'AF-S Nikkor 85mm f/1.4G',
     'AF 54 44 44 0C 0C B1 06' => 'AF-S Nikkor 35mm f/1.4G',
+    'AF 4C 37 37 14 14 CC 06' => 'AF-S Nikkor 24mm f/1.8G ED', #33
     'B0 4C 50 50 14 14 B2 06' => 'AF-S Nikkor 50mm f/1.8G',
     'B1 48 48 48 24 24 B3 06' => 'AF-S DX Micro Nikkor 40mm f/2.8G', #27
     'B2 48 5C 80 30 30 B4 0E' => 'AF-S Nikkor 70-200mm f/4G ED VR', #35
@@ -300,6 +304,8 @@ sub GetAFPointGrid($$;$);
     'A8 48 8E 8E 30 30 C3 0E' => 'AF-S Nikkor 300mm f/4E PF ED VR', #30
     'A9 4C 31 31 14 14 C4 06' => 'AF-S Nikkor 20mm f/1.8G ED', #30
     'AA 48 37 5C 24 24 C5 4E' => 'AF-S Nikkor 24-70mm f/2.8E ED VR',
+    'AD 48 28 60 24 30 C8 4E' => 'AF-S VR DX 16-80mm f/2.8-4.0E ED',
+    'AE 3C 80 A0 3C 3C C9 0E' => 'AF-S Nikkor 200-500mm f/5.6E ED VR',
     '01 00 00 00 00 00 02 00' => 'TC-16A',
     '01 00 00 00 00 00 08 00' => 'TC-16A',
     '00 00 00 00 00 00 F1 0C' => 'TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x',
@@ -458,6 +464,7 @@ sub GetAFPointGrid($$;$);
     '26 44 73 98 34 3C 1C 02' => 'Sigma 135-400mm F4.5-5.6 APO Aspherical',
     'CE 34 76 A0 38 40 4B 0E' => 'Sigma 150-500mm F5-6.3 DG OS APO HSM', #JD
     '81 34 76 A6 38 40 4B 0E' => 'Sigma 150-600mm F5-6.3 DG OS HSM | S', #Jaap Voets
+    '82 34 76 A6 38 40 4B 0E' => 'Sigma 150-600mm F5-6.3 DG OS HSM | C',
     '26 40 7B A0 34 40 1C 02' => 'Sigma APO 170-500mm F5-6.3 Aspherical RF',
     'A7 49 80 A0 24 24 4B 06' => 'Sigma APO 200-500mm F2.8 EX DG',
     '48 3C 8E B0 3C 3C 4B 02' => 'Sigma APO 300-800mm F5.6 EX DG HSM',
@@ -535,15 +542,18 @@ sub GetAFPointGrid($$;$);
     '00 40 18 2B 2C 34 00 06' => 'Tokina AT-X 107 AF DX Fisheye (AF 10-17mm f/3.5-4.5)',
     '00 48 1C 29 24 24 00 06' => 'Tokina AT-X 116 PRO DX (AF 11-16mm f/2.8)',
     '7A 48 1C 29 24 24 7E 06' => 'Tokina AT-X 116 PRO DX II (AF 11-16mm f/2.8)',
+    '7A 48 1C 30 24 24 7E 06' => 'Tokina AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)',
     '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)',
     '00 48 29 3C 24 24 00 06' => 'Tokina AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)',
     '00 48 29 50 24 24 00 06' => 'Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)',
     '00 40 2A 72 2C 3C 00 06' => 'Tokina AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)',
+    '00 3C 2B 44 30 30 00 06' => 'Tokina AT-X 17-35 F4 PRO FX (AF 17-35mm f/4)',
     '2F 40 30 44 2C 34 29 02.2' => 'Tokina AF 193 (AF 19-35mm f/3.5-4.5)',
     '2F 48 30 44 24 24 29 02.2' => 'Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)',
     '2F 40 30 44 2C 34 29 02.1' => 'Tokina AF 235 II (AF 20-35mm f/3.5-4.5)',
+    '00 48 37 5C 24 24 00 06' => 'Tokina AT-X 24-70 F2.8 PRO FX (AF 24-70mm f/2.8)',
     '00 40 37 80 2C 3C 00 02' => 'Tokina AT-X 242 AF (AF 24-200mm f/3.5-5.6)',
     '25 48 3C 5C 24 24 1B 02.1' => 'Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)',
     '25 48 3C 5C 24 24 1B 02.2' => 'Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8)',
@@ -553,6 +563,8 @@ sub GetAFPointGrid($$;$);
     '00 48 3C 60 24 24 00 02' => 'Tokina AT-X 280 AF PRO (AF 28-80mm f/2.8)',
     '25 44 44 8E 34 42 1B 02' => 'Tokina AF 353 (AF 35-300mm f/4.5-6.7)',
     '00 48 50 72 24 24 00 06' => 'Tokina AT-X 535 PRO DX (AF 50-135mm f/2.8)',
+    '00 3C 5C 80 30 30 00 0E' => 'Tokina AT-X 70-200 F4 FX VCM-S (AF 70-200mm f/4)',
+    '00 48 5C 80 30 30 00 0E' => 'Tokina AT-X 70-200 F4 FX VCM-S (AF 70-200mm f/4)',
     '12 44 5E 8E 34 3C 09 00' => 'Tokina AF 730 (AF 75-300mm F4.5-5.6)',
     '14 54 60 80 24 24 0B 00' => 'Tokina AT-X 828 AF (AF 80-200mm f/2.8)',
     '24 54 60 80 24 24 1A 02' => 'Tokina AT-X 828 AF PRO (AF 80-200mm f/2.8)',
@@ -570,6 +582,7 @@ sub GetAFPointGrid($$;$);
     '12 38 69 97 35 42 09 02' => 'Promaster Spectrum 7 100-400mm F4.5-6.7',
 #
     '00 40 31 31 2C 2C 00 00' => 'Voigtlander Color Skopar 20mm F3.5 SLII Aspherical',
+    '00 48 3C 3C 24 24 00 00' => 'Voigtlander Color Skopar 28mm F2.8 SL II',
     '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',
@@ -577,12 +590,17 @@ sub GetAFPointGrid($$;$);
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 32 32 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/21 ZF.2',
     '00 54 3C 3C 18 18 00 00' => 'Carl Zeiss Distagon T* 2/28 ZF.2',
+    '00 54 44 44 0C 0C 00 00' => 'Carl Zeiss Distagon T* 1.4/35 ZF.2',
     '00 54 44 44 18 18 00 00' => 'Carl Zeiss Distagon T* 2/35 ZF.2',
     '00 54 50 50 0C 0C 00 00' => 'Carl Zeiss Planar T* 1.4/50 ZF.2',
     '00 54 50 50 18 18 00 00' => 'Carl Zeiss Makro-Planar T* 2/50 ZF.2',
     '00 54 62 62 0C 0C 00 00' => 'Carl Zeiss Planar T* 1.4/85 ZF.2',
     '00 54 68 68 18 18 00 00' => 'Carl Zeiss Makro-Planar T* 2/100 ZF.2',
+    '00 54 72 72 18 18 00 00' => 'Carl Zeiss Apo Sonnar T* 2/135 ZF.2',
     '00 54 53 53 0C 0C 00 00' => 'Zeiss Otus 1.4/55', #33
+    '01 54 62 62 0C 0C 00 00' => 'Zeiss Otus 1.4/85',
+    '53 54 50 50 0C 0C 00 00' => 'Zeiss Milvus 50mm f/1.4', #33
+    '55 54 62 62 0C 0C 00 00' => 'Zeiss Milvus 85mm f/1.4', #33
 #
     '00 54 56 56 30 30 00 00' => 'Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo',
 #
@@ -605,7 +623,7 @@ sub GetAFPointGrid($$;$);
     '00 00 48 48 53 53 00 01' => 'Loreo 40mm F11-22 3D Lens in a Cap 9005', #PH
     '00 47 10 10 24 24 00 00' => 'Fisheye Nikkor 8mm f/2.8 AiS',
     '00 47 3C 3C 24 24 00 00' => 'Nikkor 28mm f/2.8 AiS', #35
-    '00 54 44 44 0C 0C 00 00' => 'Nikkor 35mm f/1.4 AiS',
+  # '00 54 44 44 0C 0C 00 00' => 'Nikkor 35mm f/1.4 AiS', comment out in favour of Zeiss with same ID because this lens is rare (requires CPU upgrade)
     '00 57 50 50 14 14 00 00' => 'Nikkor 50mm f/1.8 AI', #35
     '00 48 50 50 18 18 00 00' => 'Nikkor H 50mm f/2',
     '00 48 68 68 24 24 00 00' => 'Series E 100mm f/2.8',
@@ -5808,12 +5826,12 @@ my %nikonFocalConversions = (
 #
     0x1200000 => {
         Name => 'GPSVersionID',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         PrintConv => '$val =~ tr/ /./; $val',
     },
     0x1200001 => {
         Name => 'GPSLatitudeRef',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         PrintConv => {
             N => 'North',
             S => 'South',
@@ -5821,7 +5839,7 @@ my %nikonFocalConversions = (
     },
     0x1200002 => {
         Name => 'GPSLatitude',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         ValueConv => q{
             require Image::ExifTool::GPS;
             Image::ExifTool::GPS::ToDegrees($val);
@@ -5830,7 +5848,7 @@ my %nikonFocalConversions = (
     },
     0x1200003 => {
         Name => 'GPSLongitudeRef',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         PrintConv => {
             E => 'East',
             W => 'West',
@@ -5838,7 +5856,7 @@ my %nikonFocalConversions = (
     },
     0x1200004 => {
         Name => 'GPSLongitude',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         ValueConv => q{
             require Image::ExifTool::GPS;
             Image::ExifTool::GPS::ToDegrees($val);
@@ -5847,7 +5865,7 @@ my %nikonFocalConversions = (
     },
     0x1200005 => {
         Name => 'GPSAltitudeRef',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         PrintConv => {
             0 => 'Above Sea Level',
             1 => 'Below Sea Level',
@@ -5855,12 +5873,12 @@ my %nikonFocalConversions = (
     },
     0x1200006 => {
         Name => 'GPSAltitude',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         PrintConv => '$val =~ /^(inf|undef)$/ ? $val : "$val m"',
     },
     0x1200007 => {
         Name => 'GPSTimeStamp',
-        Groups => { 2 => 'Time' },
+        Groups => { 1 => 'GPS', 2 => 'Time' },
         ValueConv => q{
             require Image::ExifTool::GPS;
             Image::ExifTool::GPS::ConvertTimeStamp($val);
@@ -5869,11 +5887,11 @@ my %nikonFocalConversions = (
     },
     0x1200008 => {
         Name => 'GPSSatellites',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
     },
     0x1200010 => {
         Name => 'GPSImgDirectionRef',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
         PrintConv => {
             M => 'Magnetic North',
             T => 'True North',
@@ -5881,15 +5899,15 @@ my %nikonFocalConversions = (
     },
     0x1200011 => {
         Name => 'GPSImgDirection',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
     },
     0x1200012 => {
         Name => 'GPSMapDatum',
-        Groups => { 2 => 'Location' },
+        Groups => { 1 => 'GPS', 2 => 'Location' },
     },
     0x120001d => {
         Name => 'GPSDateStamp',
-        Groups => { 2 => 'Time' },
+        Groups => { 1 => 'GPS', 2 => 'Time' },
         ValueConv => 'Image::ExifTool::Exif::ExifDate($val)',
     },
 #
@@ -6638,7 +6656,7 @@ sub ProcessNikonCaptureOffsets($$$)
 }
 
 #------------------------------------------------------------------------------
-# Read/write Nikon Makernotes directory
+# Read/write Nikon MakerNotes directory
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success, otherwise returns 0 and sets a Warning when reading
 #          or new directory when writing (IsWriting set in dirInfo)