exiftool_vendored 10.25.0 → 10.31.0

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/HtmlDump.pm

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool;    # only for FinishTiffDump()
 use Image::ExifTool::HTML qw(EscapeHTML);
 
-$VERSION = '1.33';
+$VERSION = '1.34';
 
 sub DumpTable($$$;$$$$$);
 sub Open($$$;@);
@@ -739,6 +739,7 @@ sub FinishTiffDump($$$)
         AlphaOffset       => 'AlphaByteCount',
         MPImageStart      => 'MPImageLength',
         IDCPreviewStart   => 'IDCPreviewLength',
+        SamsungRawPointersOffset => 'SamsungRawPointersLength',
     );
 
     # add TIFF data to html dump

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/ICC_Profile.pm

@@ -274,6 +274,7 @@ my %profileClass = (
     4 => {
         Name => 'ProfileCMMType',
         Format => 'string[4]',
+        # seen: "    ",ACMS,ADBE,APPLE,KCMS,Lino,NKON,UCCM,appl,etc2,lino,none
     },
     8 => {
         Name => 'ProfileVersion',
@@ -327,6 +328,18 @@ my %profileClass = (
         Name => 'DeviceManufacturer',
         Format => 'string[4]',
         # KODA = Kodak
+        # ADBE = Adobe ...?
+        # appl = Apple
+        # HP   = HP
+        # CANO = Canon
+        # ISL  = ?
+        # JPEG = JPEG
+        # Leaf = Leaf
+        # MNLT = ?
+        # MSFT = Microsoft
+        # POne = ?
+        # etc2 = ?
+        # lcms = ?
     },
     52 => {
         Name => 'DeviceModel',

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/Jpeg2000.pm

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.25';
+$VERSION = '1.26';
 
 sub ProcessJpeg2000Box($$$);
 
@@ -57,6 +57,8 @@ my %jp2Map = (
 # UUID's for writable UUID directories (by tag name)
 my %uuid = (
     'UUID-EXIF'   => 'JpgTiffExif->JP2',
+    'UUID-EXIF2'  => '',    # (flags a warning when writing)
+    'UUID-EXIF_bad' => '0', # (flags a warning when reading and writing)
     'UUID-IPTC'   => "\x33\xc7\xa4\xd2\xb8\x1d\x47\x23\xa0\xba\xf1\xa3\xe0\x97\xad\x38",
     'UUID-XMP'    => "\xbe\x7a\xcf\xcb\x97\xa9\x42\xe8\x9c\x71\x99\x94\x91\xe3\xaf\xac",
   # (can't yet write GeoJP2 information)
@@ -216,7 +218,7 @@ my %j2cMarker = (
         {
             Name => 'UUID-EXIF',
             # (this is the EXIF that we create)
-            Condition => '$$valPt=~/^JpgTiffExif->JP2/',
+            Condition => '$$valPt=~/^JpgTiffExif->JP2(?!Exif\0\0)/',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Exif::Main',
                 ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -237,6 +239,18 @@ my %j2cMarker = (
                 Start => '$valuePtr + 16',
             },
         },
+        {
+            Name => 'UUID-EXIF_bad',
+            # written by Digikam
+            Condition => '$$valPt=~/^JpgTiffExif->JP2/',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Exif::Main',
+                ProcessProc => \&Image::ExifTool::ProcessTIFF,
+                WriteProc => \&Image::ExifTool::WriteTIFF,
+                DirName => 'EXIF',
+                Start => '$valuePtr + 22',
+            },
+        },
         {
             Name => 'UUID-IPTC',
             # (this is the IPTC that we create)
@@ -725,6 +739,7 @@ sub ProcessJpeg2000Box($$$)
                 OutFile => $outfile,
                 Base => $base + $dataPos + $subdirStart,
             );
+            my $uuid = $uuid{$$tagInfo{Name}};
             # remove "UUID-" prefix to allow appropriate directories to be written as a block
             $subdirInfo{DirName} =~ s/^UUID-//;
             my $subTable = GetTagTable($$subdir{TagTable}) || $tagTablePtr;
@@ -733,9 +748,11 @@ sub ProcessJpeg2000Box($$$)
                 delete $$et{AddJp2Dirs}{$$tagInfo{Name}};
                 my $newdir;
                 # only edit writable UUID boxes
-                if ($uuid{$$tagInfo{Name}}) {
+                if ($uuid) {
                     $newdir = $et->WriteDirectory(\%subdirInfo, $subTable, $$subdir{WriteProc});
                     next if defined $newdir and not length $newdir; # next if deleting the box
+                } elsif (defined $uuid) {
+                    $et->Warn("Not editing $$tagInfo{Name} box", 1);
                 }
                 # use old box data if not changed
                 defined $newdir or $newdir = substr($$dataPt, $subdirStart, $subdirLen);
@@ -746,14 +763,13 @@ sub ProcessJpeg2000Box($$$)
             } else {
                 # extract as a block if specified
                 $subdirInfo{BlockInfo} = $tagInfo if $$tagInfo{BlockExtract};
+                $et->Warn("Reading non-standard $$tagInfo{Name} box") if defined $uuid and $uuid eq '0';
                 unless ($et->ProcessDirectory(\%subdirInfo, $subTable, $$subdir{ProcessProc})) {
                     if ($subTable eq $tagTablePtr) {
                         $err = 'JPEG 2000 format error';
-                    } else {
-                        $err = "Unrecognized $$tagInfo{Name} box";
-                        next if $$tagInfo{Name} eq 'XML';
+                        last;
                     }
-                    last;
+                    $et->Warn("Unrecognized $$tagInfo{Name} box");
                 }
             }
         } elsif ($$tagInfo{Format} and not $outfile) {

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/M2TS.pm

@@ -31,7 +31,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 # program map table "stream_type" lookup (ref 6/1)
 my %streamType = (
@@ -407,7 +407,7 @@ sub ProcessM2TS($$)
             HexDump(\$buff, $pLen, Addr => $i * $pLen, Out => $out,
                 Start => $pos - $prePos) if $verbose > 2;
             my $str = $pidName{$pid} ? " ($pidName{$pid})" : '';
-            printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, 0) if $pLen == 192;
+            printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, $pos - $prePos) if $pLen == 192;
             printf $out "  Packet ID:  0x%.4x$str\n", $pid;
             printf $out "  Start Flag: %s\n", $payload_unit_start_indicator ? 'Yes' : 'No';
         }

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/MIE.pm

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.45';
+$VERSION = '1.46';
 
 sub ProcessMIE($$);
 sub ProcessMIEGroup($$$);
@@ -570,7 +570,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     ExposureTime    => {
         Writable => 'rational64u',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
-        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+        PrintConvInv => '$val',
     },
     Flash => {
         SubDirectory => {

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/MWG.pm

@@ -444,8 +444,7 @@ my %sKeywordStruct;
     NAMESPACE => 'mwg-rs',
     NOTES => q{
         Image region metadata defined by the MWG 2.0 specification.  These tags
-        belong to the ExifTool XMP-mwg-rs group, and as such they may be accessed
-        without the need to load the MWG Composite tags above.  See
+        may be accessed without the need to load the MWG Composite tags above.  See
         L<http://www.metadataworkinggroup.org/> for the official specification.
     },
     Regions => {
@@ -471,11 +470,11 @@ my %sKeywordStruct;
     GROUPS => { 0 => 'XMP', 1 => 'XMP-mwg-kw', 2 => 'Image' },
     NAMESPACE => 'mwg-kw',
     NOTES => q{
-        Hierarchical keywords metadata defined by the MWG 2.0 specification.  These
-        tags belong to the ExifTool XMP-mwg-kw group. 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<http://www.metadataworkinggroup.org/> for the official specification.
+        Hierarchical keywords metadata defined by the MWG 2.0 specification. 
+        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<http://www.metadataworkinggroup.org/> for the
+        official specification.
     },
     # arbitrarily define only the first 6 levels of the keyword hierarchy
     Keywords => {
@@ -512,8 +511,7 @@ my %sKeywordStruct;
     GROUPS => { 0 => 'XMP', 1 => 'XMP-mwg-coll', 2 => 'Image' },
     NAMESPACE => 'mwg-coll',
     NOTES => q{
-        Collections metadata defined by the MWG 2.0 specification.  These tags
-        belong to the ExifTool XMP-mwg-coll group.  See
+        Collections metadata defined by the MWG 2.0 specification.  See
         L<http://www.metadataworkinggroup.org/> for the official specification.
     },
     Collections => {

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/Matroska.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 my %noYes = ( 0 => 'No', 1 => 'Yes' );
 
@@ -632,6 +632,47 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     0x484 => { Name => 'TagDefault',        Format => 'unsigned', PrintConv => \%noYes },
     0x487 => { Name => 'TagString',         Format => 'utf8' },
     0x485 => { Name => 'TagBinary',         Binary => 1 },
+#
+# Spherical Video V2 (untested)
+#
+    0x7670 => {
+        Name => 'Projection',
+        SubDirectory => { TagTable => 'Image::ExifTool::Matroska::Projection' },
+    },
+);
+
+# Spherical video v2 projection tags (ref https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md)
+%Image::ExifTool::Matroska::Projection = (
+    GROUPS => { 2 => 'Video' },
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        Projection tags defined by the Spherical Video V2 specification.  See
+        L<https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md>
+        for the specification.
+    },
+    0x7671 => {
+        Name => 'ProjectionType',
+        Format => 'unsigned',
+        DataMember => 'ProjectionType',
+        RawConv => '$$self{ProjectionType} = $val',
+        PrintConv => {
+            0 => 'Rectangular',
+            1 => 'Equirectangular',
+            2 => 'Cubemap',
+        },
+    },
+    0x7672 => [{
+        Name => 'EquirectangularProj',
+        Condition => '$$self{ProjectionType} == 1',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::equi' },
+    },{
+        Name => 'CubemapProj',
+        Condition => '$$self{ProjectionType} == 2',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::cbmp' },
+    }],
+    0x7673 => { Name => 'ProjectionPosYaw',   Format => 'float' },
+    0x7674 => { Name => 'ProjectionPosPitch', Format => 'float' },
+    0x7675 => { Name => 'ProjectionPosRoll',  Format => 'float' },
 );
 
 #------------------------------------------------------------------------------
@@ -889,4 +930,3 @@ L<Image::ExifTool::TagNames/Matroska Tags>,
 L<Image::ExifTool(3pm)|Image::ExifTool>
 
 =cut
-

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/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.17';
+$VERSION = '1.18';
 
 sub ProcessXtra($$$);
 
@@ -74,8 +74,8 @@ sub ProcessXtra($$$);
     NOTES => q{
         Microsoft Photo 1.0 schema XMP tags.  This is likely not a complete list,
         but represents tags which have been observed in sample images.  The actual
-        namespace prefix is "MicrosoftPhoto", but ExifTool shortens this to
-        "XMP-microsoft" in the family 1 group name.
+        namespace prefix is "MicrosoftPhoto", but ExifTool shortens this in the
+        family 1 group name.
     },
     CameraSerialNumber => { },
     DateAcquired       => { Groups => { 2 => 'Time' }, %Image::ExifTool::XMP::dateTimeInfo },

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/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.36';
+$VERSION = '2.41';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -199,10 +199,10 @@ $VERSION = '2.36';
             require Image::ExifTool::Canon;
             my $lens = $Image::ExifTool::Canon::canonLensTypes{$val - $id};
             return "$lens + $$mb" if $lens;
-        } elsif ($val >= 0x4900) { # test for Sigma MC-11 adapter with Sigma lens
+        } elsif ($val >= 0x4900) { # test for Sigma MC-11 SA-E adapter with Sigma SA-mount lens
             require Image::ExifTool::Sigma;
             my $lens = $Image::ExifTool::Sigma::sigmaLensTypes{$val - 0x4900};
-            return "$lens + MC-11" if $lens;
+            return "$lens + MC-11 SA-E" if $lens;
         }
         return undef;
     },
@@ -359,8 +359,10 @@ $VERSION = '2.36';
     194 => 'Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]', #23 (Model A16)
     203 => 'Tamron SP 70-200mm F2.8 Di USD', #JR (Model A009)
     204 => 'Tamron SP 24-70mm F2.8 Di USD', #JR (Model A007)
-    213 => 'Tamron 16-300mm F3.5-6.3 Di II PZD', #JR (Model B016)
+    212 => 'Tamron 28-300mm F3.5-6.3 Di PZD', #JR (Model A010)
+    213 => 'Tamron 16-300mm F3.5-6.3 Di II PZD Macro', #JR (Model B016)
     214 => 'Tamron SP 150-600mm F5-6.3 Di USD', #JR (Model A011)
+    215 => 'Tamron SP 15-30mm F2.8 Di USD', #JR (Model A012)
     224 => 'Tamron SP 90mm F2.8 Di Macro 1:1 USD', #JR (Model F004)
     255 => 'Tamron Lens (255)',
     255.1 => 'Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical', # (Model A16)
@@ -373,7 +375,10 @@ $VERSION = '2.36';
     255.7 => 'Tamron SP AF 70-200mm F2.8 Di LD IF Macro', #22 (Model A001)
     255.8 => 'Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical IF', #24 (Model A09)
     255.9 => 'Tamron AF 90-300mm F4.5-5.6 Telemacro', #Fredrik Agert
-    18688 => 'Sigma MC-11 Adapter', #JR (to this, add Sigma LensType)
+    18688 => 'Sigma MC-11 SA-E Mount Converter with not-supported Sigma lens',
+    # The MC-11 SA-E Mount Converter uses this 18688 offset for not-supported SIGMA mount lenses.
+    # The MC-11 EF-E Mount Converter uses the 61184 offset for not-supported CANON mount lenses, as also used by Metabones.
+    # Both MC-11 SA-E and EF-E Mount Converters use the 504xx LensType2 values for supported SA-mount or EF-mount Sigma lenses.
     25501 => 'Minolta AF 50mm F1.7', #7
     25511 => 'Minolta AF 35-70mm F4 or Other Lens',
     25511.1 => 'Sigma UC AF 28-70mm F3.5-4.5', #12/16(HighSpeed-AF)
@@ -512,7 +517,8 @@ $VERSION = '2.36';
     # For newer firmware versions this is only used by the Smart Adapter, and
     # the full Canon LensType code is added - PH
     # the metabones adapter translates Canon L -> G, II -> II, USM -> SSM, IS -> OSS (ref JR)
-    61184 => 'Canon EF Adapter', #JR (also Fotodiox or Viltrox) (to this, add Canon LensType)
+    # This offset is used by Metabones, Fotodiox, Sigma MC-11 EF-E and Viltrox Canon EF adapters.
+    61184 => 'Canon EF Adapter', #JR (to this, add Canon LensType)
     # 65280 = 0xff00
     65280 => 'Sigma 16mm F2.8 Filtermatic Fisheye', #IB
     # all M42-type lenses give a value of 65535 (and FocalLength=0, FNumber=1)
@@ -532,7 +538,7 @@ $VERSION = '2.36';
    '65535.10' => 'Sony E PZ 16-50mm F3.5-5.6 OSS',  #PH (32793 - SELP1650)
    '65535.11' => 'Sony FE 35mm F2.8 ZA',            #JR (32794 - SEL35F28Z)
    '65535.12' => 'Sony FE 24-70mm F4 ZA OSS',       #JR (32795 - SEL2470Z)
-   '65535.13' => 'Sony E 18-200mm F3.5-6.3 OSS LE', #JR (32797 - SEL18200LE)
+   '65535.13' => 'Sony E 18-200mm F3.5-6.3 OSS LE', #JR (32797 or 0 - SEL18200LE)
    '65535.14' => 'Sony E 20mm F2.8',                #PH (32798 - SEL20F28)
    '65535.15' => 'Sony E 35mm F1.8 OSS',            #JR (32799 - SEL35F18)
    '65535.16' => 'Sony E PZ 18-105mm F4 G OSS',     #JR (32800 - SELP18105G)
@@ -542,47 +548,52 @@ $VERSION = '2.36';
    '65535.20' => 'Sony FE 55mm F1.8 ZA',            #JR (32808 - SEL55F18Z)
    '65535.21' => 'Sony FE 70-200mm F4 G OSS',       #JR (32810 - SEL70200G)
    '65535.22' => 'Sony FE 16-35mm F4 ZA OSS',       #JR (32811 - SEL1635Z)
-   '65535.23' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #JR (32813 - SEL2870)
-   '65535.24' => 'Sony FE 35mm F1.4 ZA',            #JR (32814 - SEL35F14Z)
-   '65535.25' => 'Sony FE 24-240mm F3.5-6.3 OSS',   #JR (32815 - SEL24240)
-   '65535.26' => 'Sony FE 28mm F2',                 #JR (32816 - SEL28F20)
-   '65535.27' => 'Sony FE PZ 28-135mm F4 G OSS',    #JR (32817 - SELP28135G)
-   '65535.28' => 'Sony FE 24-70mm F2.8 GM',         #JR (32821 - SEL2470GM)
-   '65535.29' => 'Sony FE 50mm F1.4 ZA', #JR
-   '65535.30' => 'Sony FE 85mm F1.4 GM',            #JR (32823 - SEL85F14GM)
-   '65535.31' => 'Sony FE 50mm F1.8',               #JR (32824 - SEL50F18F with trailing "F" as compared to 32790)
-   '65535.32' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', #JR         # (32826 - SEL28F20 + SEL075UWC Ultra-wide converter)
-   '65535.33' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', #JR # (32827 - SEL28F20 + SEL057FEC Fisheye converter)
-   '65535.34' => 'Sony FE 70-300mm F4.5-5.6 G OSS', #JR (32828 - SEL70300G)
-   '65535.35' => 'Sony FE 70-200mm F2.8 GM OSS',    #JR (32830 - SEL70200GM)
+   '65535.23' => 'Sony FE 50mm F2.8 Macro',         #JR (32812 - SEL50M28)
+   '65535.24' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #JR (32813 - SEL2870)
+   '65535.25' => 'Sony FE 35mm F1.4 ZA',            #JR (32814 - SEL35F14Z)
+   '65535.26' => 'Sony FE 24-240mm F3.5-6.3 OSS',   #JR (32815 - SEL24240)
+   '65535.27' => 'Sony FE 28mm F2',                 #JR (32816 - SEL28F20)
+   '65535.28' => 'Sony FE PZ 28-135mm F4 G OSS',    #JR (32817 - SELP28135G)
+   '65535.29' => 'Sony FE 24-70mm F2.8 GM',         #JR (32821 - SEL2470GM)
+   '65535.30' => 'Sony FE 50mm F1.4 ZA',            #JR (32822 - SEL50F14Z)
+   '65535.31' => 'Sony FE 85mm F1.4 GM',            #JR (32823 - SEL85F14GM)
+   '65535.32' => 'Sony FE 50mm F1.8',               #JR (32824 - SEL50F18F with trailing "F" as compared to 32790)
+   '65535.33' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', #JR (32826 - SEL28F20 + SEL075UWC Ultra-wide converter)
+   '65535.34' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', #JR (32827 - SEL28F20 + SEL057FEC Fisheye converter)
+   '65535.35' => 'Sony FE 70-300mm F4.5-5.6 G OSS', #JR (32828 - SEL70300G)
+   '65535.36' => 'Sony FE 70-200mm F2.8 GM OSS',    #JR (32830 - SEL70200GM)
+   '65535.37' => 'Sony FE 70-200mm F2.8 GM OSS + 1.4X Teleconverter', #JR (33072 - SEL70200GM + SEL14TC)
+   '65535.38' => 'Sony FE 70-200mm F2.8 GM OSS + 2X Teleconverter', #JR (33073 - SEL70200GM + SEL20TC)
 #
 # 3rd party E lenses
 #
-    '65535.36' => 'Sigma 19mm F2.8 [EX] DN', #JR
-    '65535.37' => 'Sigma 30mm F2.8 [EX] DN', #JR
-    '65535.38' => 'Sigma 60mm F2.8 DN', #JR
-    '65535.39' => 'Sigma 30mm F1.4 DC DN | C', #IB (50480)
-    '65535.40' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (Model B011)
-    '65535.41' => 'Zeiss Batis 25mm F2', #JR (49216)
-    '65535.42' => 'Zeiss Batis 85mm F1.8', #JR (49217)
-    '65535.43' => 'Zeiss Batis 18mm F2.8', #IB (49218)
-    '65535.44' => 'Zeiss Loxia 21mm F2.8', #JR (49234)
-    '65535.45' => 'Zeiss Loxia 35mm F2', #JR
-    '65535.46' => 'Zeiss Loxia 50mm F2', #JR (49232 or 0)
-    '65535.47' => 'Zeiss Touit 12mm F2.8', #JR
-    '65535.48' => 'Zeiss Touit 32mm F1.8', #JR
-    '65535.49' => 'Zeiss Touit 50mm F2.8 Macro', #JR
-    '65535.50' => 'Samyang AF 50mm F1.4 FE', #JR (32789)
+   '65535.39' => 'Samyang AF 50mm F1.4 FE',         #JR (32789)
+   '65535.40' => 'Samyang AF 14mm F2.8 FE',         #JR (32790)
+   '65535.41' => 'Sigma 19mm F2.8 [EX] DN',         #JR (0)
+   '65535.42' => 'Sigma 30mm F2.8 [EX] DN',         #JR (0)
+   '65535.43' => 'Sigma 60mm F2.8 DN',              #JR (0)
+   '65535.44' => 'Sigma 30mm F1.4 DC DN | C 016',   #IB (50480)
+   '65535.45' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (0 - Model B011)
+   '65535.46' => 'Zeiss Touit 12mm F2.8',           #JR (49201 or 0)
+   '65535.47' => 'Zeiss Touit 32mm F1.8',           #JR (49202 or 0)
+   '65535.48' => 'Zeiss Touit 50mm F2.8 Macro',     #JR (49203 or 0)
+   '65535.49' => 'Zeiss Batis 25mm F2',             #JR (49216)
+   '65535.50' => 'Zeiss Batis 85mm F1.8',           #JR (49217)
+   '65535.51' => 'Zeiss Batis 18mm F2.8',           #IB (49218)
+   '65535.52' => 'Zeiss Loxia 50mm F2',             #JR (49232 or 0)
+   '65535.53' => 'Zeiss Loxia 35mm F2',             #JR (49233 or 0)
+   '65535.54' => 'Zeiss Loxia 21mm F2.8',           #JR (49234)
+   '65535.55' => 'Zeiss Loxia 85mm F2.4',           #JR (49235)
 #
 # other lenses
 #
-    '65535.51' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
-    '65535.52' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
-    '65535.53' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
-    '65535.54' => 'Samyang 500mm Mirror F8.0', #19
-    '65535.55' => 'Pentacon Auto 135mm F2.8', #19
-    '65535.56' => 'Pentacon Auto 29mm F2.8', #19
-    '65535.57' => 'Helios 44-2 58mm F2.0', #19
+   '65535.56' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
+   '65535.57' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
+   '65535.58' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
+   '65535.59' => 'Samyang 500mm Mirror F8.0', #19
+   '65535.60' => 'Pentacon Auto 135mm F2.8', #19
+   '65535.61' => 'Pentacon Auto 29mm F2.8', #19
+   '65535.62' => 'Helios 44-2 58mm F2.0', #19
 );
 
 %minoltaTeleconverters = (