exiftool_vendored 11.49.0 → 11.50.0

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

@@ -150,8 +150,8 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
         },{
             Name => 'IHL_EXIF',
             Notes => q{
-                extracted as a block if the Unknown option is used, or processed as the
-                first sub-document with the ExtractEmbedded option
+                extracted as a block if the L<Unknown|../ExifTool.html#Unknown> option is used, or processed as the
+                first sub-document with the L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> option
             },
             Binary => 1,
             Unknown => 1,
@@ -1818,7 +1818,7 @@ sub ProcessDR4($$;$)
         if (not $format) {
             $val = unpack 'H*', substr($$dataPt, $off, $len);
             $format = 'undef';
-        } elsif ($format eq 'double' and $len eq 8) {
+        } elsif ($format eq 'double' and $len == 8) {
             # avoid teeny weeny values
             $val = ReadValue($dataPt, $off, $format, undef, $len);
             $val = 0 if abs($val) < 1e-100;
@@ -2134,7 +2134,7 @@ sub ProcessCanonVRD($$;$)
             $blockType = Get32u($dataPt, $pos);
             $blockLen = Get32u($dataPt, $pos + 4);
         }
-        $vrdType = 'DR4' if $blockType eq 0xffff00f7;
+        $vrdType = 'DR4' if $blockType == 0xffff00f7;
         $pos += 8;  # move to start of block
         if ($pos + $blockLen > $end) {
             $et->Warn('Possibly corrupt CanonVRD block');

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

@@ -235,8 +235,7 @@ Tok: for (;;) {
             pos($$dataPt) = pos($$dataPt) - 1;
             # allow anything in key but whitespace, braces and double quotes
             # (this is one of those assumptions I mentioned)
-            $$dataPt =~ /([^\s()"]+)/sg;
-            $tok = $1;
+            $tok = $$dataPt =~ /([^\s()"]+)/sg ? $1 : undef;
         }
         push @toks, $tok if defined $tok;
     }

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

@@ -1362,7 +1362,7 @@ sub ProcessEXE($$)
             python => 'py',
             ruby   => 'rb',
             php    => 'php',
-        }->{$1};
+        }->{$prog};
         # use '.sh' for extension of all shell scripts
         $ext = $prog =~ /sh$/ ? 'sh' : '' unless defined $ext;
     }

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

@@ -55,7 +55,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.15';
+$VERSION = '4.16';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -4834,7 +4834,7 @@ sub ConvertExifText($$;$$)
         $type = $1;
         $str = $et->Decode($str, 'JIS', 'Unknown');
     } else {
-        $tag = $asciiFlex if $asciiFlex and $asciiFlex ne 1;
+        $tag = $asciiFlex if $asciiFlex and $asciiFlex ne '1';
         $et->Warn('Invalid EXIF text encoding' . ($tag ? " for $tag" : ''));
         $str = $id . $str;
     }
@@ -5064,6 +5064,37 @@ sub GetLensInfo($;$)
     return @a;
 }
 
+#------------------------------------------------------------------------------
+# Match lens in list of possbilities based on value of LensModel
+# Inputs: 0) reference to list of possible models, 1) LensModel string
+# - updates list on return; guaranteed not to remove all list entries
+sub MatchLensModel($$)
+{
+    my ($try, $lensModel) = @_;
+    if (@$try > 1 and $lensModel) {
+        my (@filt, $pat);
+        # filter by focal length
+        if ($lensModel =~ /((\d+-)?\d+mm)/) {
+            my $focal = $1;
+            @filt = grep /$focal/, @$try;
+            @$try = @filt if @filt and @filt < @$try;
+        }
+        # filter by aperture
+        if (@$try > 1 and $lensModel =~ m{(?:F/?|1:)(\d+(\.\d+)?)}i) {
+            my $fnum = $1;
+            @filt = grep m{(F/?|1:)$fnum\b}i, @$try;
+            @$try = @filt if @filt and @filt < @$try;
+        }
+        # filter by model version, and other lens parameters
+        foreach $pat ('I+', 'USM') {
+            next unless @$try > 1 and $lensModel =~ /\b($pat)\b/;
+            my $val = $1;
+            @filt = grep /\b$val\b/, @$try;
+            @$try = @filt if @filt and @filt < @$try;
+        }
+    }
+}
+
 #------------------------------------------------------------------------------
 # Attempt to identify the specific lens if multiple lenses have the same LensType
 # Inputs: 0) ExifTool object ref, 1) LensType print value, 2) PrintConv hash ref,
@@ -5222,9 +5253,12 @@ sub PrintLensID($$@)
         }
         return join(' or ', @user);
     }
-    # return the best match(es) from the possible lenses
-    return join(' or ', @best) if @best;
-    return join(' or ', @matches) if @matches;
+    # return the best match(es) from the possible lenses, after checking against LensModel
+    @best = @matches unless @best;
+    if (@best) {
+        MatchLensModel(\@best, $lensModel);
+        return join(' or ', @best);
+    }
     $lens = $$printConv{$lensType};
     return $lensModel if $lensModel and $lens =~ / or /; # (eg. Sony NEX-5N)
     return $lens;
@@ -5462,6 +5496,7 @@ sub ProcessExif($$$)
     my $raf = $$dirInfo{RAF};
     my $verbose = $et->Options('Verbose');
     my $validate = $et->Options('Validate');
+    my $saveFormat = $et->Options('SaveFormat');
     my $htmlDump = $$et{HTML_DUMP};
     my $success = 1;
     my ($tagKey, $dirSize, $makerAddr, $strEnc, %offsetInfo, $offName, $nextOffName);
@@ -5639,6 +5674,8 @@ sub ProcessExif($$$)
         my $valuePtr = $entry + 8;      # pointer to value within $$dataPt
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
         my ($origFormStr, $bad, $rational, $subOffName);
+        # save the EXIF format codes if requested
+        $$et{SaveFormat}{$saveFormat = $formatStr} = 1 if $saveFormat;
         # hack to patch incorrect count in Kodak SubIFD3 tags
         if ($count < 2 and ref $$tagTablePtr{$tagID} eq 'HASH' and $$tagTablePtr{$tagID}{FixCount}) {
             $offList or ($offList, $offHash) = GetOffList($dataPt, $dirStart, $dataPos,
@@ -5904,7 +5941,7 @@ sub ProcessExif($$$)
             # (avoids long delays when processing some corrupted files)
             if ($count > 100000 and $formatStr !~ /^(undef|string|binary)$/) {
                 my $tagName = $tagInfo ? $$tagInfo{Name} : sprintf('tag 0x%.4x', $tagID);
-                if ($tagName ne 'TransferFunction' or $count ne 196608) {
+                if ($tagName ne 'TransferFunction' or $count != 196608) {
                     my $minor = $count > 2000000 ? 0 : 2;
                     next if $et->Warn("Ignoring $dirName $tagName with excessive count", $minor);
                 }
@@ -6295,6 +6332,7 @@ sub ProcessExif($$$)
             $et->SetGroup($tagKey, $dirName) if $$tagTablePtr{SET_GROUP1};
             # save original components of rational numbers (used when copying)
             $$et{RATIONAL}{$tagKey} = $rational if defined $rational;
+            $$et{TAG_EXTRA}{$tagKey}{G6} = $saveFormat if $saveFormat;
         }
     }
 

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

@@ -1341,7 +1341,7 @@ sub GetImageType($$$)
 sub UnescapeFLIR($)
 {
     my $char = shift;
-    return $char unless length $char eq 4; # escaped ASCII char (eg. '\\')
+    return $char unless length $char == 4; # escaped ASCII char (eg. '\\')
     my $val = hex $char;
     return chr($val) if $val < 0x80;   # simple ASCII
     return pack('C0U', $val) if $] >= 5.006001;

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::ASF;   # for GetGUID()
 
-$VERSION = '1.36';
+$VERSION = '1.37';
 
 sub ProcessFPX($$);
 sub ProcessFPXR($$$);
@@ -125,7 +125,7 @@ my @dirEntryType = qw(INVALID STORAGE STREAM LOCKBYTES PROPERTY ROOT);
 # list of code pages used by Microsoft
 # (ref http://msdn.microsoft.com/en-us/library/dd317756(VS.85).aspx)
 my %codePage = (
-    037 => 'IBM EBCDIC US-Canada',
+     37 => 'IBM EBCDIC US-Canada',
     437 => 'DOS United States',
     500 => 'IBM EBCDIC International',
     708 => 'Arabic (ASMO 708)',
@@ -1175,11 +1175,11 @@ my %fpxFileType = (
     VARS => { NO_ID => 1 },
     CommentBy => {
         Groups => { 2 => 'Author' },
-        Notes => 'enable Duplicates option to extract all entries',
+        Notes => 'enable L<Duplicates|../ExifTool.html#Duplicates> option to extract all entries',
     },
     LastSavedBy => {
         Groups => { 2 => 'Author' },
-        Notes => 'enable Duplicates option to extract history of up to 10 entries',
+        Notes => 'enable L<Duplicates|../ExifTool.html#Duplicates> option to extract history of up to 10 entries',
     },
     DOP => { SubDirectory => { TagTable => 'Image::ExifTool::FlashPix::DOP' } },
     ModifyDate => {
@@ -1439,7 +1439,7 @@ sub ReadFPXValue($$$$$;$$)
                     my $charset = $Image::ExifTool::charsetName{"cp$codePage"};
                     if ($charset) {
                         $val = $et->Decode($val, $charset);
-                    } elsif ($codePage eq 1200) {   # UTF-16, little endian
+                    } elsif ($codePage == 1200) {   # UTF-16, little endian
                         $val = $et->Decode($val, 'UCS2', 'II');
                     }
                 }
@@ -1577,14 +1577,16 @@ sub ProcessDocumentTable($)
         my $key = 'TableOffsets' . ($i ? " ($i)" : '');
         my $offsets = $$value{$key};
         last unless defined $offsets;
-        my $doc = $$extra{$key}{G3} if $$extra{$key};
+        my $doc;
+        $doc = $$extra{$key}{G3} if $$extra{$key};
         $doc = '' unless $doc;
         # get DocFlags for this sub-document
         my ($docFlags, $docTable);
         for ($j=0; ; ++$j) {
             my $key = 'DocFlags' . ($j ? " ($j)" : '');
             last unless defined $$value{$key};
-            my $tmp = $$extra{$key}{G3} if $$extra{$key};
+            my $tmp;
+            $tmp = $$extra{$key}{G3} if $$extra{$key};
             $tmp = '' unless $tmp;
             if ($tmp eq $doc) {
                 $docFlags = $$value{$key};
@@ -1597,7 +1599,8 @@ sub ProcessDocumentTable($)
         for ($j=0; ; ++$j) {
             my $key = $tag . ($j ? " ($j)" : '');
             last unless defined $$value{$key};
-            my $tmp = $$extra{$key}{G3} if $$extra{$key};
+            my $tmp;
+            $tmp = $$extra{$key}{G3} if $$extra{$key};
             $tmp = '' unless $tmp;
             if ($tmp eq $doc) {
                 $docTable = \$$value{$key};
@@ -1995,7 +1998,7 @@ sub ProcessFPXR($$$)
             $et->Warn("Unlisted FPXR segment (index $index)") if $index != 255;
         }
 
-    } elsif ($type ne 3) {  # not a "Reserved" segment
+    } elsif ($type != 3) {  # not a "Reserved" segment
 
         $et->Warn("Unknown FPXR segment (type $type)");
 

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

@@ -383,11 +383,11 @@ my %coordConv = (
             my $alt = $val[0];
             $alt = $val[2] unless defined $alt;
             return undef unless defined $alt and IsFloat($alt);
-            return ($val[1] || $val[3]) ? -$alt : $alt;
+            return(($val[1] || $val[3]) ? -$alt : $alt);
         },
         PrintConv => q{
             $val = int($val * 10) / 10;
-            return ($val =~ s/^-// ? "$val m Below" : "$val m Above") . " Sea Level";
+            return(($val =~ s/^-// ? "$val m Below" : "$val m Above") . " Sea Level");
         },
     },
     GPSDestLatitude => {
@@ -459,7 +459,7 @@ sub ToDMS($$;$$)
 
     unless (length $val) {
         # don't convert an empty value
-        return $val if $doPrintConv and $doPrintConv eq 1;  # avoid hiding existing tag when extracting
+        return $val if $doPrintConv and $doPrintConv eq '1';  # avoid hiding existing tag when extracting
         return undef; # avoid writing empty value
     }
     if ($ref) {

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

@@ -66,9 +66,9 @@ my %addUnits = (
     GROUPS => { 2 => 'Camera' },
     NOTES => q{
         Tags extracted from the GPMF box of GoPro MP4 videos, the APP6 "GoPro" segment
-        of JPEG files, and from the "gpmd" timed metadata if the ExtractEmbedded option
+        of JPEG files, and from the "gpmd" timed metadata if the L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> option
         is enabled.  Many more tags exist, but are currently unknown and extracted only
-        with the -u option. Please let me know if you discover the meaning of any of
+        with the L<Unknown|../ExifTool.html#Unknown> (-u) option. Please let me know if you discover the meaning of any of
         these unknown tags. See L<https://github.com/gopro/gpmf-parser> for details
         about this format.
     },
@@ -468,7 +468,7 @@ my %addUnits = (
     GROUPS => { 2 => 'Camera' },
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     NOTES => q{
-        Tags extracted from the MP4 "fdsc" timed metadata when the ExtractEmbedded
+        Tags extracted from the MP4 "fdsc" timed metadata when the L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded>
         option is used.
     },
     0x08 => { Name => 'FirmwareVersion',    Format => 'string[15]' },
@@ -613,7 +613,7 @@ sub ProcessGoPro($$$)
         next unless $size or $verbose;  # don't save empty values unless verbose
         my $format = $goProFmt{$fmt} || 'undef';
         my ($val, $i, $j, $p, @v);
-        if ($fmt eq 0x3f and defined $type) {
+        if ($fmt == 0x3f and defined $type) {
             # decode structure with format given by previous 'TYPE'
             for ($i=0; $i<$count; ++$i) {
                 my (@s, $l);

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

@@ -64,7 +64,7 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         Information (SEI).  I<[Yes, this description is confusing, but nothing
         compared to the challenge of actually decoding the data!]>  This information
         may exist at regular intervals through the entire video, but only the first
-        occurrence is extracted unless the ExtractEmbedded (-ee) option is used (in
+        occurrence is extracted unless the L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> (-ee) option is used (in
         which case subsequent occurrences are extracted as sub-documents).
     },
     # (Note: all these are explained in IEC 61834-4, but it costs money so it is useless to me)
@@ -458,7 +458,7 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         ValueConv => '$val == 0xff ? undef : $val',
         PrintConv => q{
             my $foc = ($val & 0x7e) / (($val & 0x01) ? 40 : 400);
-            return ($val & 0x80 ? 'Manual' : 'Auto') . " ($foc)";
+            return(($val & 0x80 ? 'Manual' : 'Auto') . " ($foc)");
         },
     },
 );

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

@@ -119,7 +119,7 @@ sub ProcessTDHD($$$);
     NOTES => q{
         These tags are extracted from the APP6 "TDHD" segment of Photosmart R837
         JPEG images.  Many other unknown tags exist in is data, and can be seen with
-        the Unknown (-u) option.
+        the L<Unknown|../ExifTool.html#Unknown> (-u) option.
     },
     # (all subdirectories except TDHD and LSLV are automatically recognized
     # by their "type" word of 0x10001)

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

@@ -3005,7 +3005,7 @@ my %sceneModeUsed = (
     PROCESS_PROC => \&ProcessPose,
     NOTES => q{
         Streamed orientation information from the PixPro 4KVR360, extracted as
-        sub-documents when the Duplicates option is used.
+        sub-documents when the L<Duplicates|../ExifTool.html#Duplicates> option is used.
     },
     Accelerometer => { }, # up, back, left?  units of g
     AngularVelocity => { } # left, up, ccw?  units?

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

@@ -152,7 +152,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         (eg. C<55(mi/h)>).  If no units are specified, the default units are
         written.
 
-        4) ExifTool writes compressed metadata to MIE files if the Compress (-z)
+        4) ExifTool writes compressed metadata to MIE files if the L<Compress|../ExifTool.html#Compress> (-z)
         option is used and Compress::Zlib is available.
 
         See L<http://owl.phy.queensu.ca/~phil/exiftool/MIE1.1-20070121.pdf> for the
@@ -1001,10 +1001,10 @@ sub WriteMIEGroup($$$)
                 }
             }
             # don't rewrite free bytes or information in deleted groups
-            if ($format eq 0x80 or ($delGroup and $tagLen and ($format & 0xf0) != 0x10)) {
+            if ($format == 0x80 or ($delGroup and $tagLen and ($format & 0xf0) != 0x10)) {
                 $raf->Seek($valLen, 1) or $msg = 'Seek error', last;
                 if ($verbose > 1) {
-                    my $free = ($format eq 0x80) ? ' free' : '';
+                    my $free = ($format == 0x80) ? ' free' : '';
                     print $out "    - $grp1:$tag ($valLen$free bytes)\n";
                 }
                 ++$$et{CHANGED} if $delGroup;

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

@@ -97,7 +97,7 @@ sub ProcessMPImageList($$$);
     NOTES => q{
         The first MPF "Large Thumbnail" image is extracted as PreviewImage, and the
         rest of the embedded MPF images are extracted as MPImage#.  The
-        ExtractEmbedded (-ee) option may be used to extract information from these
+        L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> (-ee) option may be used to extract information from these
         embedded images.
     },
     0.1 => {
@@ -163,7 +163,7 @@ sub ProcessMPImageList($$$);
         },
         Notes => q{
             the first MPF "Large Thumbnail" is extracted as PreviewImage, and the rest
-            of the embedded MPF images are extracted as MPImage#.  The ExtractEmbedded
+            of the embedded MPF images are extracted as MPImage#.  The L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded>
             option may be used to extract information from these embedded images.
         },
         # extract all MPF images (not just one)

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

@@ -59,7 +59,7 @@ my $mwgLoaded;  # flag set if we alreaded Load()ed the MWG tags
         string values be stored as UTF-8.  To honour this, the exiftool application
         sets the default internal EXIF string encoding to "UTF8" when the MWG module
         is loaded, but via the API this must be done manually by setting the
-        CharsetEXIF option.
+        L<CharsetEXIF|../ExifTool.html#CharsetEXIF> option.
 
         A complication of the MWG specification is that although the MWG:Creator
         property may consist of multiple values, the associated EXIF tag

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

@@ -28,7 +28,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 API option|../ExifTool.html#MDItemTags> to 1 or the L<RequestAll API option|../ExifTool.html#RequestAll> to 2 or
+        setting the L<MDItemTags|../ExifTool.html#MDItemTags> API option to 1 or the L<RequestAll|../ExifTool.html#RequestAll> API 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.
@@ -220,7 +220,7 @@ 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 API option|../ExifTool.html#XAttrTags> to 1 or the L<RequestAll API option|../ExifTool.html#RequestAll> to 2 or higher.
+        the L<XAttrTags|../ExifTool.html#XAttrTags> API option to 1 or the L<RequestAll|../ExifTool.html#RequestAll> API option to 2 or higher.
     },
     'com.apple.FinderInfo' => {
         Name => 'XAttrFinderInfo',

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

@@ -28,7 +28,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
         The following tags are extracted from Matroska multimedia container files. 
         This container format is used by file types such as MKA, MKV, MKS and WEBM. 
         For speed, ExifTool extracts tags only up to the first Cluster unless the
-        Verbose (-v) or Unknown = 2 (-U) option is used.  See
+        L<Verbose|../ExifTool.html#Verbose> (-v) or L<Unknown|../ExifTool.html#Unknown> = 2 (-U) option is used.  See
         L<http://www.matroska.org/technical/specs/index.html> for the official
         Matroska specification.
     },

data/bin/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.74';
+$VERSION = '2.75';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -589,67 +589,69 @@ $VERSION = '2.74';
    '65535.45' => 'Sony FE 400mm F2.8 GM OSS',       #IB (32848 - SEL400F28GM)
    '65535.46' => 'Sony E 18-135mm F3.5-5.6 OSS',    #JR (32849 - SEL18135)
    '65535.47' => 'Sony FE 135mm F1.8 GM',           #IB (32850 - SEL135F18GM)
-   '65535.48' => 'Sony FE 70-200mm F2.8 GM OSS + 1.4X Teleconverter', #JR (33072 - SEL70200GM + SEL14TC)
-   '65535.49' => 'Sony FE 70-200mm F2.8 GM OSS + 2X Teleconverter', #JR (33073 - SEL70200GM + SEL20TC)
-   '65535.50' => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 1.4X Teleconverter', #JR (33077 - SEL100400GM + SEL14TC)
-   '65535.51' => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 2X Teleconverter', #JR (33078 - SEL100400GM + SEL20TC)
-   '65535.52' => 'Sony FE 400mm F2.8 GM OSS + 1.4X Teleconverter', #IB (33079 - SEL400F28GM + SEL14TC)
-   '65535.53' => 'Sony FE 400mm F2.8 GM OSS + 2X Teleconverter', #JR (33080 - SEL400F28GM + SEL20TC)
+   '65535.48' => 'Sony FE 200-600mm F5.6-6.3 G OSS',#IB (32851 - SEL200600G)
+   '65535.49' => 'Sony FE 600mm F4 GM OSS',         #IB (32852 - SEL600F4GM)
+   '65535.50' => 'Sony FE 70-200mm F2.8 GM OSS + 1.4X Teleconverter', #JR (33072 - SEL70200GM + SEL14TC)
+   '65535.51' => 'Sony FE 70-200mm F2.8 GM OSS + 2X Teleconverter', #JR (33073 - SEL70200GM + SEL20TC)
+   '65535.52' => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 1.4X Teleconverter', #JR (33077 - SEL100400GM + SEL14TC)
+   '65535.53' => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 2X Teleconverter', #JR (33078 - SEL100400GM + SEL20TC)
+   '65535.54' => 'Sony FE 400mm F2.8 GM OSS + 1.4X Teleconverter', #IB (33079 - SEL400F28GM + SEL14TC)
+   '65535.55' => 'Sony FE 400mm F2.8 GM OSS + 2X Teleconverter', #JR (33080 - SEL400F28GM + SEL20TC)
 #
 # 3rd party E lenses
 #
-   '65535.54' => 'Samyang AF 50mm F1.4 FE',         #JR (32789)
-   '65535.55' => 'Samyang AF 14mm F2.8 FE',         #JR (32790 and 51505)
-   '65535.56' => 'Samyang AF 24mm F2.8',            #JR (32794)
-   '65535.57' => 'Samyang AF 35mm F2.8 FE',         #PH (51505)
-   '65535.58' => 'Samyang AF 35mm F1.4',            #IB (51507)
-   '65535.59' => 'Sigma 19mm F2.8 [EX] DN',         #JR (0)
-   '65535.60' => 'Sigma 30mm F2.8 [EX] DN',         #JR (0)
-   '65535.61' => 'Sigma 60mm F2.8 DN',              #JR (0)
-   '65535.62' => 'Sigma 30mm F1.4 DC DN | C',       #IB (50480) (016)
-   '65535.63' => 'Sigma 85mm F1.4 DG HSM | A',      #JR (50499) (018)
-   '65535.64' => 'Sigma 16mm F1.4 DC DN | C',       #JR (50503) (017)
-   '65535.65' => 'Sigma 105mm F1.4 DG HSM | A',     #IB (50507) (018)
-   '65535.66' => 'Sigma 56mm F1.4 DC DN | C',       #JR (50508) (018)
-   '65535.67' => 'Sigma 70-200mm F2.8 DG OS HSM | S',#IB (50512) (018)
-   '65535.68' => 'Sigma 70mm F2.8 DG MACRO | A',    #JR (50513) (018)
-   '65535.69' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (0 - Model B011)
-   '65535.70' => 'Tamron 28-75mm F2.8 Di III RXD',  #JR (49457 - Model A036)
-   '65535.71' => 'Tokina FiRIN 20mm F2 FE MF',      #JR (0)
-   '65535.72' => 'Tokina FiRIN 20mm F2 FE AF',      #JR (49712 or 0)
-   '65535.73' => 'Tokina FiRIN 100mm F2.8 FE MACRO',#JR (49713)
-   '65535.74' => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR (50992)
-   '65535.75' => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6',     #IB (50993)
-   '65535.76' => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB (50994)
-   '65535.77' => 'Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical', #JR (50995)
-   '65535.78' => 'Voigtlander NOKTON 40mm F1.2 Aspherical',     #JR (50996)
-   '65535.79' => 'Voigtlander NOKTON classic 35mm F1.4',        #JR (50997)
-   '65535.80' => 'Voigtlander MACRO APO-LANTHAR 110mm F2.5',    #JR (50998)
-   '65535.81' => 'Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical', #IB (50999)
-   '65535.82' => 'Voigtlander NOKTON 50mm F1.2 Aspherical',     #JR (51000)
-   '65535.83' => 'Zeiss Touit 12mm F2.8',           #JR (49201 or 0)
-   '65535.84' => 'Zeiss Touit 32mm F1.8',           #JR (49202 or 0)
-   '65535.85' => 'Zeiss Touit 50mm F2.8 Macro',     #JR (49203 or 0)
-   '65535.86' => 'Zeiss Batis 25mm F2',             #JR (49216)
-   '65535.87' => 'Zeiss Batis 85mm F1.8',           #JR (49217)
-   '65535.88' => 'Zeiss Batis 18mm F2.8',           #IB (49218)
-   '65535.89' => 'Zeiss Batis 135mm F2.8',          #IB (49219)
-   '65535.90' => 'Zeiss Batis 40mm F2 CF',          #JR (49220)
-   '65535.91' => 'Zeiss Loxia 50mm F2',             #JR (49232 or 0)
-   '65535.92' => 'Zeiss Loxia 35mm F2',             #JR (49233 or 0)
-   '65535.93' => 'Zeiss Loxia 21mm F2.8',           #JR (49234)
-   '65535.94' => 'Zeiss Loxia 85mm F2.4',           #JR (49235)
-   '65535.95' => 'Zeiss Loxia 25mm F2.4',           #JR (49236)
+   '65535.56' => 'Samyang AF 50mm F1.4 FE',         #JR (32789)
+   '65535.57' => 'Samyang AF 14mm F2.8 FE',         #JR (32790 and 51505)
+   '65535.58' => 'Samyang AF 24mm F2.8',            #JR (32794)
+   '65535.59' => 'Samyang AF 35mm F2.8 FE',         #PH (51505)
+   '65535.60' => 'Samyang AF 35mm F1.4',            #IB (51507)
+   '65535.61' => 'Sigma 19mm F2.8 [EX] DN',         #JR (0)
+   '65535.62' => 'Sigma 30mm F2.8 [EX] DN',         #JR (0)
+   '65535.63' => 'Sigma 60mm F2.8 DN',              #JR (0)
+   '65535.64' => 'Sigma 30mm F1.4 DC DN | C',       #IB (50480) (016)
+   '65535.65' => 'Sigma 85mm F1.4 DG HSM | A',      #JR (50499) (018)
+   '65535.66' => 'Sigma 16mm F1.4 DC DN | C',       #JR (50503) (017)
+   '65535.67' => 'Sigma 105mm F1.4 DG HSM | A',     #IB (50507) (018)
+   '65535.68' => 'Sigma 56mm F1.4 DC DN | C',       #JR (50508) (018)
+   '65535.69' => 'Sigma 70-200mm F2.8 DG OS HSM | S',#IB (50512) (018)
+   '65535.70' => 'Sigma 70mm F2.8 DG MACRO | A',    #JR (50513) (018)
+   '65535.71' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (0 - Model B011)
+   '65535.72' => 'Tamron 28-75mm F2.8 Di III RXD',  #JR (49457 - Model A036)
+   '65535.73' => 'Tokina FiRIN 20mm F2 FE MF',      #JR (0)
+   '65535.74' => 'Tokina FiRIN 20mm F2 FE AF',      #JR (49712 or 0)
+   '65535.75' => 'Tokina FiRIN 100mm F2.8 FE MACRO',#JR (49713)
+   '65535.76' => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR (50992)
+   '65535.77' => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6',     #IB (50993)
+   '65535.78' => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB (50994)
+   '65535.79' => 'Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical', #JR (50995)
+   '65535.80' => 'Voigtlander NOKTON 40mm F1.2 Aspherical',     #JR (50996)
+   '65535.81' => 'Voigtlander NOKTON classic 35mm F1.4',        #JR (50997)
+   '65535.82' => 'Voigtlander MACRO APO-LANTHAR 110mm F2.5',    #JR (50998)
+   '65535.83' => 'Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical', #IB (50999)
+   '65535.84' => 'Voigtlander NOKTON 50mm F1.2 Aspherical',     #JR (51000)
+   '65535.85' => 'Zeiss Touit 12mm F2.8',           #JR (49201 or 0)
+   '65535.86' => 'Zeiss Touit 32mm F1.8',           #JR (49202 or 0)
+   '65535.87' => 'Zeiss Touit 50mm F2.8 Macro',     #JR (49203 or 0)
+   '65535.88' => 'Zeiss Batis 25mm F2',             #JR (49216)
+   '65535.89' => 'Zeiss Batis 85mm F1.8',           #JR (49217)
+   '65535.90' => 'Zeiss Batis 18mm F2.8',           #IB (49218)
+   '65535.91' => 'Zeiss Batis 135mm F2.8',          #IB (49219)
+   '65535.92' => 'Zeiss Batis 40mm F2 CF',          #JR (49220)
+   '65535.93' => 'Zeiss Loxia 50mm F2',             #JR (49232 or 0)
+   '65535.94' => 'Zeiss Loxia 35mm F2',             #JR (49233 or 0)
+   '65535.95' => 'Zeiss Loxia 21mm F2.8',           #JR (49234)
+   '65535.96' => 'Zeiss Loxia 85mm F2.4',           #JR (49235)
+   '65535.97' => 'Zeiss Loxia 25mm F2.4',           #JR (49236)
 #
 # other lenses
 #
-   '65535.96' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
-   '65535.97' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
-   '65535.98' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
-   '65535.99' => 'Samyang 500mm Mirror F8.0', #19
-   '65535.100' => 'Pentacon Auto 135mm F2.8', #19
-   '65535.101' => 'Pentacon Auto 29mm F2.8', #19
-   '65535.102' => 'Helios 44-2 58mm F2.0', #19
+   '65535.98' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
+   '65535.99' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
+   '65535.100' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
+   '65535.101' => 'Samyang 500mm Mirror F8.0', #19
+   '65535.102' => 'Pentacon Auto 135mm F2.8', #19
+   '65535.103' => 'Pentacon Auto 29mm F2.8', #19
+   '65535.104' => 'Helios 44-2 58mm F2.0', #19
 );
 
 %minoltaTeleconverters = (