exiftool_vendored 11.55.0 → 11.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca643f48cd99f626cafd714a0230746f924c78b8
-  data.tar.gz: 1137ba4c8cd0933438aa92693d935e206fdad16d
+  metadata.gz: 5f39d0dfd8b00a1bac3a670f442b82c5cf53d68b
+  data.tar.gz: 2023c7abb0eced3d54c86e14f82850f4b2b67dc2
 SHA512:
-  metadata.gz: 962ca6806904c5cfb58b7d3de17b0c0f38e3513916063176eafae50fe7b9defa5cefcabc4440ad4e217750c05ce3012650b003689201d6fd65e98d4fec247552
-  data.tar.gz: 0b8396e912710c0ede3045ef65e08085d24a3d045594eda46b20192587159cb0601f0f3cec590a738a8d110e4d608f2b78875209a1a0f0adf6e69c13faf092d3
+  metadata.gz: 15fc97cb632287191ff51434fe2b7b788eea7e21e0e1272a19a7743d835fd7e0c6746487e018cf44d03f72d15b99b6e4da5883315e5fa1244b75ee1d855dd856
+  data.tar.gz: 863527e8a305cec53ba64ad4b2d4fea0411d4ca158fb03a5629949f2c7eba1c2a3aaee28a2b19032bb6bebf3d35c84a5f3acf28aef41890c90495bd567890fa1

data/bin/Changes

@@ -7,6 +7,25 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 11.50. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+July 19, 2019 - Version 11.57
+
+  - Improved decoding of some tags for the Sony ILCE-7RM4 (thanks Jos Roost)
+  - Minor change to a Sony lens name
+  - Fixed format of a number of 8-bit integer QuickTime tags when writing
+  - Fixed problem replacing multiple structure elements in lists of XMP
+    structures
+
+July 18, 2019 - Version 11.56
+
+  - Added support for the Sony ILCE-7RM4 (thanks Jos Roost)
+  - Added a new SonyModelID (thanks LibRaw)
+  - Added a few new Sony/Minolta LensType values (thanks LibRaw and Jos Roost)
+  - Decode some new Nikon and Motorola tags (thanks Neal Krawetz)
+  - Decode a couple more ColorData tags for some Canon models
+  - Extract PreviewImage from DNG files which don't have a .DNG extension
+  - Extract Huawei APP7 maker notes with the Unknown (-u) option
+  - Internal change in LensID logic for Sony E-type lenses
+
 July 12, 2019 - Version 11.55
 
   - Added write support for XMP-crs:Texture and XMP-drs tags

data/bin/MANIFEST

@@ -881,6 +881,8 @@ t/XMP_43.out
 t/XMP_44.out
 t/XMP_45.out
 t/XMP_46.out
+t/XMP_47.out
+t/XMP_48.out
 t/XMP_5.out
 t/XMP_6.out
 t/XMP_7.out
@@ -1056,6 +1058,7 @@ t/images/XMP3.xmp
 t/images/XMP4.xmp
 t/images/XMP5.xmp
 t/images/XMP6.xmp
+t/images/XMP7.xmp
 t/images/ZIP.gz
 t/images/ZIP.zip
 t/images/iWork.numbers

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.55",
+   "version" : "11.57",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

data/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '11.55'
+version: '11.57'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -104,8 +104,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-11.55.tar.gz | tar -xf -
-  cd Image-ExifTool-11.55
+  gzip -dc Image-ExifTool-11.57.tar.gz | tar -xf -
+  cd Image-ExifTool-11.57
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -6,13 +6,11 @@
 #
 # Revisions:    Nov. 12/03 - P. Harvey Created
 #               (See html/history.html for revision history)
-#
-# References:   ATV - Alexander Vonk, private communication
 #------------------------------------------------------------------------------
 use strict;
 require 5.004;
 
-my $version = '11.55';
+my $version = '11.57';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -3085,6 +3083,7 @@ sub EncodeXML($)
     {
         # encode binary data and non-UTF8 with special characters as base64
         $$strPt = Image::ExifTool::XMP::EncodeBase64($$strPt);
+        # #ATV = Alexander Vonk, private communication
         return 'http://www.w3.org/2001/XMLSchema#base64Binary'; #ATV
     } elsif ($escapeHTML) {
         $$strPt = Image::ExifTool::HTML::EscapeHTML($$strPt, $altEnc);
@@ -5158,7 +5157,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.55 --
+    -- Generated by ExifTool 11.57 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38

data/bin/lib/Image/ExifTool.pm

@@ -7,7 +7,7 @@
 #
 # Revisions:    Nov. 12/2003 - P. Harvey Created
 #               (See html/history.html for revision history)
-#2.32
+#
 # Legal:        Copyright (c) 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup);
 
-$VERSION = '11.55';
+$VERSION = '11.57';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -6597,7 +6597,7 @@ sub ProcessJPEG($$)
                 DirStart(\%dirInfo, 6);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
-        } elsif ($marker == 0xe7) {         # APP7 (Pentax, Qualcomm)
+        } elsif ($marker == 0xe7) {         # APP7 (Pentax, Huawei, Qualcomm)
             if ($$segDataPt =~ /^PENTAX \0(II|MM)/) {
                 # found in K-3 images (is this multi-segment??)
                 SetByteOrder($1);
@@ -6612,6 +6612,23 @@ sub ProcessJPEG($$)
                     $dumpEnd = $segPos + $length;
                 }
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
+            } elsif ($$segDataPt =~ /^HUAWEI\0\0(II|MM)/) {
+                SetByteOrder($1);
+                undef $dumpType; # (dump this ourself)
+                my $hdrLen = 16;
+                my $tagTablePtr = GetTagTable('Image::ExifTool::Unknown::Main');
+                DirStart(\%dirInfo, $hdrLen, 8);
+                $dirInfo{DirName} = 'Huawei APP7';
+                if ($htmlDump) {
+                    $self->HDump($segPos-4, 4, 'APP7 header', "Data size: $length bytes");
+                    $self->HDump($segPos, $hdrLen, 'Huawei header', 'APP7 data type: Huawei');
+                    $dumpEnd = $segPos + $length;
+                }
+                $$self{SET_GROUP0} = 'APP7';
+                $$self{SET_GROUP1} = 'Huawei';
+                $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
+                delete $$self{SET_GROUP0};
+                delete $$self{SET_GROUP1};
             } elsif ($$segDataPt =~ /^\x1aQualcomm Camera Attributes/) {
                 # found in HP iPAQ_VoiceMessenger
                 $dumpType = 'Qualcomm';

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

@@ -31,10 +31,11 @@ use Image::ExifTool::IPTC;
 use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
+use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.25';
+$VERSION = '3.26';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -822,7 +823,8 @@ sub new
         $hexID = $$vars{HEX_ID};
         my $processBinaryData = ($$table{PROCESS_PROC} and (
             $$table{PROCESS_PROC} eq \&Image::ExifTool::ProcessBinaryData or
-            $$table{PROCESS_PROC} eq \&Image::ExifTool::Nikon::ProcessNikonEncrypted));
+            $$table{PROCESS_PROC} eq \&Image::ExifTool::Nikon::ProcessNikonEncrypted or
+            $$table{PROCESS_PROC} eq \&Image::ExifTool::Sony::ProcessEnciphered));
         if ($$vars{ID_LABEL} or $processBinaryData) {
             my $s = $$table{FORMAT} ? Image::ExifTool::FormatSize($$table{FORMAT}) || 1 : 1;
             $binaryTable = 1;
@@ -960,6 +962,11 @@ TagID:  foreach $tagID (@keys) {
                     $$tagInfo{Groups}{2} ne 'Time') and $short ne 'DICOM') {
                     warn "$short $name should be in 'Time' group!\n";
                 }
+                if ($name eq 'DateTimeOriginal' and (not $$tagInfo{Description} or
+                    $$tagInfo{Description} ne 'Date/Time Original'))
+                {
+                    warn "Need Description for $short DateTimeOriginal\n";
+                }
                 # validate Description (can't contain special characters)
                 if ($$tagInfo{Description} and
                     $$tagInfo{Description} ne EscapeHTML($$tagInfo{Description}))
@@ -1426,11 +1433,13 @@ TagID:  foreach $tagID (@keys) {
                 if ($$table{$var}) {
                     foreach $tagID (@{$$table{$var}}) {
                         $$hash{$tagID} and delete($$hash{$tagID}), next;
-                        warn "Warning: Extra $var for $short tag $tagID\n";
+                        warn sprintf("Warning: Extra %s for %s tag %d (0x%.4x)\n",
+                                     $var, $short, $tagID, $tagID);
                     }
                 }
                 foreach $tagID (sort keys %$hash) {
-                    warn "Warning: Missing $var for $short $$hash{$tagID}\n";
+                    warn sprintf("Warning: Missing %s for %s %s, tag %d (0x%.4x)\n",
+                                 $var, $short, $$hash{$tagID}, $tagID, $tagID);
                 }
             }
         }

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.17';
+$VERSION = '4.18';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -7417,6 +7417,16 @@ my %ciMaxFocal = (
         Condition => '$$self{ColorDataVersion} == -4',
         Format => 'int16s[4]',
     },
+    0x0569 => { #PH (NC)
+        Name => 'NormalWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == -4',
+        Format => 'int16u',
+    },
+    0x056a => { #PH (NC)
+        Name => 'SpecularWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == -4',
+        Format => 'int16u',
+    },
 );
 
 # Color data (MakerNotes tag 0x4001, count=1273|1275) (ref PH)

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

@@ -136,6 +136,7 @@ my @dvTags = (
     VARS => { NO_ID => 1 },
     NOTES => 'The following tags are extracted from DV videos.',
     DateTimeOriginal => {
+        Description => 'Date/Time Original',
         Groups => { 2 => 'Time' },
         PrintConv => '$self->ConvertDateTime($val)',
     },

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.18';
+$VERSION = '4.19';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -530,7 +530,7 @@ my %sampleFormat = (
             # (APP1 IFD2 is for Leica JPEG preview)
             Condition => q[
                 not ($$self{TIFF_TYPE} eq 'CR2' and $$self{DIR_NAME} eq 'IFD0') and
-                not ($$self{TIFF_TYPE} eq 'DNG' and $$self{Compression} eq '7' and $$self{SubfileType} ne '0') and
+                not ($$self{TIFF_TYPE} =~ /^(DNG|TIFF)$/ and $$self{Compression} eq '7' and $$self{SubfileType} ne '0') and
                 not ($$self{TIFF_TYPE} eq 'APP1' and $$self{DIR_NAME} eq 'IFD2')
             ],
             Name => 'StripOffsets',
@@ -616,7 +616,7 @@ my %sampleFormat = (
             # (APP1 IFD2 is for Leica JPEG preview)
             Condition => q[
                 not ($$self{TIFF_TYPE} eq 'CR2' and $$self{DIR_NAME} eq 'IFD0') and
-                not ($$self{TIFF_TYPE} eq 'DNG' and $$self{Compression} eq '7' and $$self{SubfileType} ne '0') and
+                not ($$self{TIFF_TYPE} =~ /^(DNG|TIFF)$/ and $$self{Compression} eq '7' and $$self{SubfileType} ne '0') and
                 not ($$self{TIFF_TYPE} eq 'APP1' and $$self{DIR_NAME} eq 'IFD2')
             ],
             Name => 'StripByteCounts',
@@ -5171,6 +5171,7 @@ sub MatchLensModel($$)
 #         3) LensSpec print value, 4) LensType numerical value, 5) FocalLength,
 #         6) MaxAperture, 7) MaxApertureValue, 8) MinFocalLength, 9) MaxFocalLength,
 #         10) LensModel, 11) LensFocalRange, 12) LensSpec
+my %sonyEtype;
 sub PrintLensID($$@)
 {
     my ($et, $lensTypePrt, $printConv, $lensSpecPrt, $lensType, $focalLength,
@@ -5205,12 +5206,27 @@ sub PrintLensID($$@)
         ($shortFocal, $longFocal) = ($1, $2 || $1);
     }
     if ($$et{Make} eq 'SONY') {
-        # Patch for Metabones or other adapters on Sony E-mount cameras (ref Jos Roost)
-        # Metabones Canon EF to E-mount adapters add 0xef00, 0xbc00 or 0x7700 to the
-        # high byte for 2-byte Canon LensType values, so we need to adjust for these.
-        # Offset 0xef00 is also used by Sigma MC-11, Fotodiox and Viltrox EF-E adapters.
-        # Have to exclude A-mount Sigma Filtermatic with 'odd' LensType=0xff00.
-        if ($lensType != 0xffff and $lensType != 0xff00) {
+        if ($lensType eq 65535) {
+            # handle Sony E-type lenses when LensType2 isn't valid (NEX/ILCE models only)
+            if ($$et{Model} =~ /NEX|ILCE/) {
+                unless (%sonyEtype) {
+                    my ($index, $i, %did, $lens);
+                    require Image::ExifTool::Sony;
+                    foreach (sort keys %Image::ExifTool::Sony::sonyLensTypes2) {
+                        ($lens = $Image::ExifTool::Sony::sonyLensTypes2{$_}) =~ s/ or .*//;
+                        next if $did{$lens};
+                        ($i, $index) = $index ? ("65535.$index", $index + 1) : (65535, 1);
+                        $did{$sonyEtype{$i} = $lens} = 1;
+                    }
+                }
+                $printConv = \%sonyEtype;
+            }
+        } elsif ($lensType != 0xff00) {
+            # Patch for Metabones or other adapters on Sony E-mount cameras (ref Jos Roost)
+            # Metabones Canon EF to E-mount adapters add 0xef00, 0xbc00 or 0x7700 to the
+            # high byte for 2-byte Canon LensType values, so we need to adjust for these.
+            # Offset 0xef00 is also used by Sigma MC-11, Fotodiox and Viltrox EF-E adapters.
+            # Have to exclude A-mount Sigma Filtermatic with 'odd' LensType=0xff00.
             require Image::ExifTool::Minolta;
             if ($Image::ExifTool::Minolta::metabonesID{$lensType & 0xff00}) {
                 $lensType -= ($lensType >= 0xef00 ? 0xef00 : $lensType >= 0xbc00 ? 0xbc00 : 0x7700);

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

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.27';
+$VERSION = '1.28';
 
 sub ProcessOcad($$$);
 sub ProcessJPEG_HDR($$$);
@@ -139,6 +139,10 @@ sub ProcessJPEG_HDR($$$);
         Name => 'Pentax',
         Condition => '$$valPt =~ /^PENTAX \0/',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::Main' },
+      }, {
+        Name => 'Huawei',
+        Condition => '$$valPt =~ /^HUAWEI\0\0/',
+        SubDirectory => { TagTable => 'Image::ExifTool::Unknown::Main' },
       }, {
         Name => 'Qualcomm',
         Condition => '$$valPt =~ /^\x1aQualcomm Camera Attributes/',

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

@@ -50,6 +50,7 @@ sub ExtractTags($$$);
     DevicesAccelerometerSampleArrayZ    => { Name => 'AccelerometerZ'},
     DevicesClockZuluTime => {
         Name => 'DateTimeOriginal',
+        Description => 'Date/Time Original',
         Groups => { 2 => 'Time' },
         ValueConv => 'require Image::ExifTool::XMP; Image::ExifTool::XMP::ConvertXMPDate($val)',
         PrintConv => '$self->ConvertDateTime($val)',

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

@@ -28,6 +28,7 @@ $VERSION = '1.02';
   # 0x02 => { Name => 'MOIFileSize', Format => 'int32u' },
     0x06 => {
         Name => 'DateTimeOriginal',
+        Description => 'Date/Time Original',
         Format => 'undef[8]',
         Groups => { 2 => 'Time' },
         ValueConv => sub {

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.77';
+$VERSION = '2.78';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -539,130 +539,13 @@ $VERSION = '2.77';
     65280 => 'Sigma 16mm F2.8 Filtermatic Fisheye', #IB
     # all M42-type lenses give a value of 65535 (and FocalLength=0, FNumber=1)
     65535 => 'E-Mount, T-Mount, Other Lens or no lens', #JD/JR
-#
-# Sony E-type lenses (NOTE: these should be kept in sync with %sonyLensTypes2 of Sony.pm)
-#
-    65535.1  => 'Sony E 16mm F2.8',                 #PH (32784 - SEL16F28)
-    65535.2  => 'Sony E 18-55mm F3.5-5.6 OSS',      #PH (32785 - SEL1855)
-    65535.3  => 'Sony E 55-210mm F4.5-6.3 OSS',     #PH (32786 - SEL55210)
-    65535.4  => 'Sony E 18-200mm F3.5-6.3 OSS',     #PH (32787 - SEL18200)
-    65535.5  => 'Sony E 30mm F3.5 Macro',           #JR (32788 - SEL30M35)
-    65535.6  => 'Sony E 24mm F1.8 ZA',              #PH (32789 - SEL24F18Z)
-    65535.7  => 'Sony E 50mm F1.8 OSS',             #PH (32790 - SEL50F18)
-    65535.8  => 'Sony E 16-70mm F4 ZA OSS',         #JR (32791 - SEL1670Z)
-    65535.9  => 'Sony E 10-18mm F4 OSS',            #PH (32792 - SEL1018)
-   '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 FE 85mm F1.8',               #JR (32796 - SEL85F18)
-   '65535.14' => 'Sony E 18-200mm F3.5-6.3 OSS LE', #JR (32797 or 0 - SEL18200LE)
-   '65535.15' => 'Sony E 20mm F2.8',                #PH (32798 - SEL20F28)
-   '65535.16' => 'Sony E 35mm F1.8 OSS',            #JR (32799 - SEL35F18)
-   '65535.17' => 'Sony E PZ 18-105mm F4 G OSS',     #JR (32800 - SELP18105G)
-   '65535.18' => 'Sony FE 12-24mm F4 G',            #JR (32801 - SEL1224G)
-   '65535.19' => 'Sony FE 90mm F2.8 Macro G OSS',   #JR (32802 - SEL90M28G)
-   '65535.20' => 'Sony E 18-50mm F4-5.6',           #JR (32803 - SEL1850)
-   '65535.21' => 'Sony FE 24mm F1.4 GM',            #IB (32804 - SEL24F14GM)
-   '65535.22' => 'Sony FE 24-105mm F4 G OSS',       #IB (32805 - SEL24105G)
-   '65535.23' => 'Sony E PZ 18-200mm F3.5-6.3 OSS', #JR (32807 - SELP18200)
-   '65535.24' => 'Sony FE 55mm F1.8 ZA',            #JR (32808 - SEL55F18Z)
-   '65535.25' => 'Sony FE 70-200mm F4 G OSS',       #JR (32810 - SEL70200G)
-   '65535.26' => 'Sony FE 16-35mm F4 ZA OSS',       #JR (32811 - SEL1635Z)
-   '65535.27' => 'Sony FE 50mm F2.8 Macro',         #JR (32812 - SEL50M28)
-   '65535.28' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #JR (32813 - SEL2870)
-   '65535.29' => 'Sony FE 35mm F1.4 ZA',            #JR (32814 - SEL35F14Z)
-   '65535.30' => 'Sony FE 24-240mm F3.5-6.3 OSS',   #JR (32815 - SEL24240)
-   '65535.31' => 'Sony FE 28mm F2',                 #JR (32816 - SEL28F20)
-   '65535.32' => 'Sony FE PZ 28-135mm F4 G OSS',    #JR (32817 - SELP28135G)
-   '65535.33' => 'Sony FE 100mm F2.8 STF GM OSS',   #JR (32819 - SEL100F28GM, uses 33076 when set to 0.57m - 1.0m range)
-   '65535.34' => 'Sony E PZ 18-110mm F4 G OSS',     #JR (32820 - SELP18110G)
-   '65535.35' => 'Sony FE 24-70mm F2.8 GM',         #JR (32821 - SEL2470GM)
-   '65535.36' => 'Sony FE 50mm F1.4 ZA',            #JR (32822 - SEL50F14Z)
-   '65535.37' => 'Sony FE 85mm F1.4 GM',            #JR (32823 - SEL85F14GM)
-   '65535.38' => 'Sony FE 50mm F1.8',               #JR (32824 - SEL50F18F with trailing "F" as compared to 32790)
-   '65535.39' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', #JR (32826 - SEL28F20 + SEL075UWC Ultra-wide converter)
-   '65535.40' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', #JR (32827 - SEL28F20 + SEL057FEC Fisheye converter)
-   '65535.41' => 'Sony FE 70-300mm F4.5-5.6 G OSS', #JR (32828 - SEL70300G)
-   '65535.42' => 'Sony FE 100-400mm F4.5-5.6 GM OSS', #JR (32829 - SEL100400GM)
-   '65535.43' => 'Sony FE 70-200mm F2.8 GM OSS',    #JR (32830 - SEL70200GM)
-   '65535.44' => 'Sony FE 16-35mm F2.8 GM',         #JR (32831 - SEL1635GM)
-   '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 200-600mm F5.6-6.3 G OSS',#IB (32851 - SEL200600G)
-   '65535.49' => 'Sony FE 600mm F4 GM OSS',         #IB (32852 - SEL600F40GM)
-   '65535.50' => 'Sony FE 35mm F1.8',               #JR/IB (32858 - SEL35F18F)
-   '65535.51' => 'Sony FE 70-200mm F2.8 GM OSS + 1.4X Teleconverter', #JR (33072 - SEL70200GM + SEL14TC)
-   '65535.52' => 'Sony FE 70-200mm F2.8 GM OSS + 2X Teleconverter', #JR (33073 - SEL70200GM + SEL20TC)
-   '65535.53' => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 1.4X Teleconverter', #JR (33077 - SEL100400GM + SEL14TC)
-   '65535.54' => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 2X Teleconverter', #JR (33078 - SEL100400GM + SEL20TC)
-   '65535.55' => 'Sony FE 400mm F2.8 GM OSS + 1.4X Teleconverter', #IB (33079 - SEL400F28GM + SEL14TC)
-   '65535.56' => 'Sony FE 400mm F2.8 GM OSS + 2X Teleconverter', #JR (33080 - SEL400F28GM + SEL20TC)
-   '65535.57' => 'Sony FE 200-600mm F5.6-6.3 G OSS + 1.4X Teleconverter', #JR (33081 - SEL200600G + SEL14TC) (NC)
-   '65535.58' => 'Sony FE 200-600mm F5.6-6.3 G OSS + 2X Teleconverter', #JR (33082 - SEL200600G + SEL20TC)
-   '65535.59' => 'Sony FE 600mm F4 GM OSS + 1.4X Teleconverter', #JR (33083 - SEL600F40GM + SEL14TC) (NC)
-   '65535.60' => 'Sony FE 600mm F4 GM OSS + 2X Teleconverter', #JR (33084 - SEL600F40GM + SEL20TC)
-#
-# 3rd party E lenses
-#
-   '65535.61' => 'Samyang AF 50mm F1.4',            #JR (32789)
-   '65535.62' => 'Samyang AF 14mm F2.8',            #JR (32790 and 51505)
-   '65535.63' => 'Samyang AF 24mm F2.8',            #JR (32794)
-   '65535.64' => 'Samyang AF 35mm F2.8',            #PH (51505)
-   '65535.65' => 'Samyang AF 35mm F1.4',            #IB (51507)
-   '65535.66' => 'Samyang AF 85mm F1.4',            #IB (32823)
-   '65535.67' => 'Sigma 19mm F2.8 [EX] DN',         #JR (0)
-   '65535.68' => 'Sigma 30mm F2.8 [EX] DN',         #JR (0)
-   '65535.69' => 'Sigma 60mm F2.8 DN',              #JR (0)
-   '65535.70' => 'Sigma 30mm F1.4 DC DN | C',       #IB (50480) (016)
-   '65535.71' => 'Sigma 85mm F1.4 DG HSM | A',      #JR (50499) (018)
-   '65535.72' => 'Sigma 16mm F1.4 DC DN | C',       #JR (50503) (017)
-   '65535.73' => 'Sigma 105mm F1.4 DG HSM | A',     #IB (50507) (018)
-   '65535.74' => 'Sigma 56mm F1.4 DC DN | C',       #JR (50508) (018)
-   '65535.75' => 'Sigma 70-200mm F2.8 DG OS HSM | S',#IB (50512) (018)
-   '65535.76' => 'Sigma 70mm F2.8 DG MACRO | A',    #JR (50513) (018)
-   '65535.77' => 'Sigma 50mm F1.4 DG HSM | A',      #JR (50481) (018)
-   '65535.78' => 'Sigma 35mm F1.4 DG HSM | A',      #JR (50488) (018)
-   '65535.79' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #JR (0 - Model B011)
-   '65535.80' => 'Tamron 28-75mm F2.8 Di III RXD',  #JR (49457 - Model A036)
-   '65535.81' => 'Tamron 17-28mm F2.8 Di III RXD',  #JR (49458 - Model A046)
-   '65535.82' => 'Tokina FiRIN 20mm F2 FE MF',      #JR (0)
-   '65535.83' => 'Tokina FiRIN 20mm F2 FE AF',      #JR (49712 or 0)
-   '65535.84' => 'Tokina FiRIN 100mm F2.8 FE MACRO',#JR (49713)
-   '65535.85' => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR (50992)
-   '65535.86' => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6',     #IB (50993)
-   '65535.87' => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB (50994)
-   '65535.88' => 'Voigtlander MACRO APO-LANTHAR 65mm F2 Aspherical', #JR (50995)
-   '65535.89' => 'Voigtlander NOKTON 40mm F1.2 Aspherical',     #JR (50996)
-   '65535.90' => 'Voigtlander NOKTON classic 35mm F1.4',        #JR (50997)
-   '65535.91' => 'Voigtlander MACRO APO-LANTHAR 110mm F2.5',    #JR (50998)
-   '65535.92' => 'Voigtlander COLOR-SKOPAR 21mm F3.5 Aspherical', #IB (50999)
-   '65535.93' => 'Voigtlander NOKTON 50mm F1.2 Aspherical',     #JR (51000)
-   '65535.94' => 'Voigtlander NOKTON 21mm F1.4 Aspherical',     #JR (51001)
-   '65535.95' => 'Viltrox PFU RBMH 85mm F1.8', #JR (32796)
-   '65535.96' => 'Zeiss Touit 12mm F2.8',           #JR (49201 or 0)
-   '65535.97' => 'Zeiss Touit 32mm F1.8',           #JR (49202 or 0)
-   '65535.98' => 'Zeiss Touit 50mm F2.8 Macro',     #JR (49203 or 0)
-   '65535.99' => 'Zeiss Batis 25mm F2',             #JR (49216)
-   '65535.100' => 'Zeiss Batis 85mm F1.8',          #JR (49217)
-   '65535.101' => 'Zeiss Batis 18mm F2.8',          #IB (49218)
-   '65535.102' => 'Zeiss Batis 135mm F2.8',         #IB (49219)
-   '65535.103' => 'Zeiss Batis 40mm F2 CF',         #JR (49220)
-   '65535.104' => 'Zeiss Loxia 50mm F2',            #JR (49232 or 0)
-   '65535.105' => 'Zeiss Loxia 35mm F2',            #JR (49233 or 0)
-   '65535.106' => 'Zeiss Loxia 21mm F2.8',          #JR (49234)
-   '65535.107' => 'Zeiss Loxia 85mm F2.4',          #JR (49235)
-   '65535.108' => 'Zeiss Loxia 25mm F2.4',          #JR (49236)
-#
-# other lenses
-#
-   '65535.109' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
-   '65535.110' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
-   '65535.111' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
-   '65535.112' => 'Samyang 500mm Mirror F8.0', #19
-   '65535.113' => 'Pentacon Auto 135mm F2.8', #19
-   '65535.114' => 'Pentacon Auto 29mm F2.8', #19
-   '65535.115' => 'Helios 44-2 58mm F2.0', #19
+   '65535.1' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
+   '65535.2' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
+   '65535.3' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
+   '65535.4' => 'Samyang 500mm Mirror F8.0', #19
+   '65535.5' => 'Pentacon Auto 135mm F2.8', #19
+   '65535.6' => 'Pentacon Auto 29mm F2.8', #19
+   '65535.7' => 'Helios 44-2 58mm F2.0', #19
 );
 
 %minoltaTeleconverters = (