exiftool_vendored 11.54.0 → 11.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e69c1212095c9e4bb0a1180cad9fed096909b1
-  data.tar.gz: 424cf805d468397a25bdcd1c92ec9ecc3ddb6ee2
+  metadata.gz: ca643f48cd99f626cafd714a0230746f924c78b8
+  data.tar.gz: 1137ba4c8cd0933438aa92693d935e206fdad16d
 SHA512:
-  metadata.gz: 6a7d5afd611e6115f689dc17346357705458ec171a19ca2afbb215cfe5683782f02b158acef907a0a2801a9dd7e654fbded8ad990f3f52cf832b6a6b8d57982d
-  data.tar.gz: 12a0ffc20a0fd147eb6a85e00e76d21a1f725b03cc9ca0ee647a99debd0c1ab13a08832090ce62e0cd423b88e816b640279e750b7ec7e812b0ed8c784a28d8f8
+  metadata.gz: 962ca6806904c5cfb58b7d3de17b0c0f38e3513916063176eafae50fe7b9defa5cefcabc4440ad4e217750c05ce3012650b003689201d6fd65e98d4fec247552
+  data.tar.gz: 0b8396e912710c0ede3045ef65e08085d24a3d045594eda46b20192587159cb0601f0f3cec590a738a8d110e4d608f2b78875209a1a0f0adf6e69c13faf092d3

data/bin/Changes

@@ -7,6 +7,21 @@ 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 12, 2019 - Version 11.55
+
+  - Added write support for XMP-crs:Texture and XMP-drs tags
+  - Added a number of new Panasonic NoiseReduction values
+  - Added definition for a new Kodak tag (thanks LibRaw)
+  - Added a couple of new Panasonic AFAreaMode values (thanks Daniel Beichl)
+  - Added a couple of new Sony/Minolta LensTypes (thanks Jos Roost and LibRaw)
+  - Added a new CanonModelID
+  - Decode HEVCConfiguration record from HEIC images
+  - Decode a new Panasonic tag
+  - Decode a new QuickTime tag
+  - Changed internal handling of Composite tag ID's to include module name
+  - Removed "FE" designation from Samyang E-mount lenses
+  - Dropped Validate warning about missing GPSProcessingMethod tag
+
 July 2, 2019 - Version 11.54
 
   - Added new Canon and Sony/Minolta LensType values (thanks LibRaw)

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.54",
+   "version" : "11.55",
    "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.54'
+version: '11.55'
 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.54.tar.gz | tar -xf -
-  cd Image-ExifTool-11.54
+  gzip -dc Image-ExifTool-11.55.tar.gz | tar -xf -
+  cd Image-ExifTool-11.55
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.54';
+my $version = '11.55';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5054,18 +5054,42 @@ been implemented.  May also be combined with B<-listx> to output
 descriptions in one language only.
 
 By default, ExifTool uses UTF-8 encoding for special characters, but the
-the B<-L> or B<-charset> option may be used to invoke other encodings.
+the B<-L> or B<-charset> option may be used to invoke other encodings.  Note
+that ExifTool uses Unicode::LineBreak if available to help preserve the
+column alignment of the plain text output for languages with a
+variable-width character set.
 
 Currently, the language support is not complete, but users are welcome to
-help improve this by submitting their own translations.  To submit a set of
-translations, first use the B<-listx> option and redirect the output to a
-file to generate an XML tag database, then add entries for other languages,
-zip this file, and email it to phil at owl.phy.queensu.ca for inclusion in
-ExifTool.
+help improve this by submitting their own translations.  To submit a
+translation, follow these steps (you must have Perl installed for this):
 
-Note:  ExifTool uses Unicode::LineBreak if available to help preserve the
-column alignment of the plain text output for languages with a
-variable-width character set.
+1. Download and unpack the latest Image-ExifTool full distribution.
+
+2. 'cd' into the Image-ExifTool directory.
+
+3. Run this command to make an XML file of the desired tags (eg. EXIF):
+
+   ./exiftool -listx -exif:all > out.xml
+
+4. Copy this text into a file called 'import.pl' in the exiftool directory:
+
+    push @INC, 'lib';
+    require Image::ExifTool::TagInfoXML;
+    my $file = shift or die "Expected XML file name\n";
+    $Image::ExifTool::TagInfoXML::makeMissing = shift;
+    Image::ExifTool::TagInfoXML::BuildLangModules($file,8);
+
+5. Run the 'import.pl' script to Import the XML file, generating the
+'MISSING' entries for your language (eg. Russian):
+
+   perl import.pl out.xml ru
+
+6. Edit the generated language module lib/Image/ExifTool/Lang/ru.pm, and
+search and replace all 'MISSING' strings in the file with your translations.
+
+7. Email the module ('ru.pm' in this example) to phil at owl.phy.queensu.ca
+
+8. Thank you!!
 
 =item B<-listItem> I<INDEX>
 
@@ -5134,7 +5158,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.54 --
+    -- Generated by ExifTool 11.55 --
     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

@@ -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.54';
+$VERSION = '11.55';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -979,7 +979,7 @@ my %allGroupsExifTool = ( 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'ExifTool' );
     WRITABLE         TABLE_DESC  NOTES         IS_OFFSET   IS_SUBDIR
     EXTRACT_UNKNOWN  NAMESPACE   PREFERRED     SRC_TABLE   PRIORITY
     AVOID            WRITE_GROUP LANG_INFO     VARS        DATAMEMBER
-    SET_GROUP1       PERMANENT
+    SET_GROUP1       PERMANENT   INIT_TABLE
 );
 
 # headers for various segment types
@@ -1845,6 +1845,8 @@ my %systemTagsNotes = (
     WRITE_PROC => \&DummyWriteProc,
 );
 
+my %compositeID;    # lookup for new ID's of Composite tags based on original ID
+
 # static private ExifTool variables
 
 %allTables = ( );   # list of all tables loaded (except Composite tags)
@@ -3369,16 +3371,19 @@ sub BuildCompositeTags($)
     my $compTable = GetTagTable('Image::ExifTool::Composite');
     my @tagList = sort keys %$compTable;
     my $rawValue = $$self{VALUE};
-    my (%tagsUsed, %cache);
+    my (%tagsUsed, %cache, $allBuilt);
 
     for (;;) {
         my (%notBuilt, $tag, @deferredTags);
-        $notBuilt{$_} = 1 foreach @tagList;
+        foreach (@tagList) {
+            $notBuilt{$$compTable{$_}{Name}} = 1 unless $specialTags{$_};
+        }
 COMPOSITE_TAG:
         foreach $tag (@tagList) {
             next if $specialTags{$tag};
             my $tagInfo = $self->GetTagInfo($compTable, $tag);
             next unless $tagInfo;
+            my $tagName = $$compTable{$tag}{Name};
             # put required tags into array and make sure they all exist
             my $subDoc = ($$tagInfo{SubDoc} and $$self{DOC_COUNT});
             my $require = $$tagInfo{Require} || { };
@@ -3429,8 +3434,12 @@ COMPOSITE_TAG:
                     } elsif ($reqTag =~ /^(.*):(.+)/) {
                         my ($reqGroup, $name) = ($1, $2);
                         if ($reqGroup eq 'Composite' and $notBuilt{$name}) {
-                            push @deferredTags, $tag;
-                            next COMPOSITE_TAG;
+                            # defer only until all other tags are built if
+                            # we are inhibiting based on another Composite tag
+                            unless ($$inhibit{$index} and $allBuilt) {
+                                push @deferredTags, $tag;
+                                next COMPOSITE_TAG;
+                            }
                         }
                         # (CAREFUL! keys may not be sequential if one was deleted)
                         my ($i, $key, @keys);
@@ -3470,13 +3479,13 @@ COMPOSITE_TAG:
                     next if ++$docNum <= $$self{DOC_COUNT};
                     last;
                 } elsif ($found) {
-                    delete $notBuilt{$tag}; # this tag is OK to build now
+                    delete $notBuilt{$tagName}; # this tag is OK to build now
                     # keep track of all Require'd tag keys
                     foreach (keys %tagKey) {
                         # only tag keys with same name as a Composite tag
                         # can be replaced (also eliminates keys with
                         # instance numbers which can't be replaced either)
-                        next unless $$compTable{$tagKey{$_}};
+                        next unless $compositeID{$tagKey{$_}};
                         my $keyRef = \$tagKey{$_};
                         $tagsUsed{$$keyRef} or $tagsUsed{$$keyRef} = [ ];
                         push @{$tagsUsed{$$keyRef}}, $keyRef;
@@ -3491,7 +3500,7 @@ COMPOSITE_TAG:
                         delete $tagsUsed{$key};         # can't be replaced again
                     }
                 } elsif (not defined $found) {
-                    delete $notBuilt{$tag}; # tag can't be built anyway
+                    delete $notBuilt{$tagName}; # tag can't be built anyway
                 }
                 last unless $subDoc;
                 # don't process sub-documents if there is no chance to build this tag
@@ -3517,16 +3526,30 @@ COMPOSITE_TAG:
         }
         last unless @deferredTags;
         if (@deferredTags == @tagList) {
-            # everything was deferred in the last pass,
-            # must be a circular dependency
-            warn "Circular dependency in Composite tags\n";
-            last;
+            if ($allBuilt) {
+                # everything was deferred in the last pass,
+                # must be a circular dependency
+                warn "Circular dependency in Composite tags\n";
+                last;
+            }
+            $allBuilt = 1;  # try once more, ignoring Composite Inhibit tags
         }
         @tagList = @deferredTags; # calculate deferred tags now
     }
     delete $$self{BuildingComposite};
 }
 
+#------------------------------------------------------------------------------
+# Get reference to Composite tag info hash
+# Inputs: 0) case-sensitive Composite tag name
+# Returns: tagInfo hash or undef
+sub GetCompositeTagInfo($)
+{
+    my $tag = shift;
+    return undef unless $compositeID{$tag};
+    return $Image::ExifTool::Composite{$compositeID{$tag}[0]};
+}
+
 #------------------------------------------------------------------------------
 # Get tag name (removes copy index)
 # Inputs: 0) Tag key
@@ -4571,12 +4594,16 @@ sub AddCompositeTags($;$)
 {
     local $_;
     my ($add, $override) = @_;
-    my $module;
+    my ($module, $prefix, $tagID);
     unless (ref $add) {
+        ($prefix = $add) =~ s/.*:://;
+        $prefix .= '::';
         $module = $add;
         $add .= '::Composite';
         no strict 'refs';
         $add = \%$add;
+    } else {
+        $prefix = 'UserDefined::';
     }
     my $defaultGroups = $$add{GROUPS};
     my $compTable = GetTagTable('Image::ExifTool::Composite');
@@ -4590,31 +4617,38 @@ sub AddCompositeTags($;$)
         $defaultGroups = $$add{GROUPS} = { 0 => 'Composite', 1 => 'Composite', 2 => 'Other' };
     }
     SetupTagTable($add);    # generate Name, TagID, etc
-    my $tagID;
     foreach $tagID (sort keys %$add) {
         next if $specialTags{$tagID};   # must skip special tags
         my $tagInfo = $$add{$tagID};
-        # tagID's MUST be the exact tag name for logic in BuildCompositeTags()
-        my $tag = $$tagInfo{Name};
+        my $new = $prefix . $tagID;     # new tag ID for Composite table
         $$tagInfo{Module} = $module if $$tagInfo{Writable};
         $$tagInfo{Override} = 1 if $override and not defined $$tagInfo{Override};
         $$tagInfo{IsComposite} = 1;
-        # allow Composite tags with the same name
-        if ($$compTable{$tag}) {
+        # handle Composite tags with the same name
+        if ($compositeID{$tagID}) {
             # determine if we want to override this tag
             # (=0 keep both, >0 override, <0 keep existing)
-            my $over = ($$tagInfo{Override} || 0) - ($$compTable{$tag}{Override} || 0);
+            my $over = ($$tagInfo{Override} || 0) - ($$compTable{$compositeID{$tagID}[0]}{Override} || 0);
             next if $over < 0;
-            my $n;
-            my $new = $tag;
-            while ($$compTable{$new}) {
-                delete $$compTable{$new} if $over;  # delete existing entries
-                $n = ($n || 1) + 1;
-                $new = "${tag}-$n";
+            if ($over) {
+                # remove existing tags with this ID
+                delete $$compTable{$_} foreach @{$compositeID{$tagID}};
+                delete $compositeID{$tagID};
             }
-            # use new ID and save it so we can use it in TagLookup
-            $$tagInfo{NewTagID} = $tag = $new unless $over;
         }
+        # make sure new TagID is unique by adding index if necessary
+        my $n = 0;
+        while ($$compTable{$new}) {
+            $new =~ s/-\d+$// if $n++;
+            $new .= "-$n";
+        }
+        # use new ID and save it so we can use it in TagLookup
+        $$tagInfo{NewTagID} = $new unless $tagID eq $new;
+
+        # add new ID to lookup of Composite tag ID's
+        $compositeID{$tagID} = [ ] unless $compositeID{$tagID};
+        unshift @{$compositeID{$tagID}}, $new;  # (most recent one first)
+
         # convert scalar Require/Desire/Inhibit entries
         my ($type, @hashes, @scalars, %used);
         foreach $type ('Require','Desire','Inhibit') {
@@ -4635,9 +4669,9 @@ sub AddCompositeTags($;$)
         # add this Composite tag to our main Composite table
         $$tagInfo{Table} = $compTable;
         # (use the original TagID, even if we changed it, so don't do this:)
-        # $$tagInfo{TagID} = $tag;
-        # save tag under NewTagID in Composite table
-        $$compTable{$tag} = $tagInfo;
+        $$tagInfo{TagID} = $new;
+        # save tag under new ID in Composite table
+        $$compTable{$new} = $tagInfo;
         # set all default groups in tag
         my $groups = $$tagInfo{Groups};
         $groups or $groups = $$tagInfo{Groups} = { };
@@ -7248,6 +7282,7 @@ sub GetTagTable($)
         no strict 'refs';
         $table = \%$tableName;
         use strict 'refs';
+        &{$$table{INIT_TABLE}}($table) if $$table{INIT_TABLE};
         $$table{TABLE_NAME} = $tableName;   # set table name
         ($$table{SHORT_NAME} = $tableName) =~ s/^Image::ExifTool:://;
         # set default group 0 and 1 from module name unless already specified

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

@@ -34,7 +34,7 @@ use Image::ExifTool::Nikon;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.24';
+$VERSION = '3.25';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.16';
+$VERSION = '4.17';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -769,6 +769,7 @@ $VERSION = '4.16';
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
     0x801     => 'PowerShot SX740 HS',
     0x805     => 'PowerShot SX70 HS',
+    0x808     => 'PowerShot G7 X Mark III',
 
 # (see http://cweb.canon.jp/e-support/faq/answer/digitalcamera/10447-1.html for PowerShot/IXUS/IXY names)
 

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

@@ -25,7 +25,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.45';
+$VERSION = '1.46';
 
 sub ProcessKodakIFD($$$);
 sub ProcessKodakText($$$);
@@ -2661,6 +2661,7 @@ my %sceneModeUsed = (
     'Image Number'  => 'ImageNumber',
     'ISO'           => 'ISO',
     'ISO Speed'     => 'ISO',
+    'Lens'          => { Name => 'Lens', Priority => 0 },
     'Max Aperture'  => {
         Name => 'MaxAperture',
         ValueConv => '$val=~s/^f//i; $val',

data/bin/lib/Image/ExifTool/Lang/de.pm

@@ -8707,7 +8707,8 @@ under the same terms as Perl itself.
 
 =head1 ACKNOWLEDGEMENTS
 
-Thanks to Jens Duttke and Herbert Kauer for providing this translation.
+Thanks to Jens Duttke, Herbert Kauer and Jobi for providing this
+translation.
 
 =head1 SEE ALSO
 

data/bin/lib/Image/ExifTool/Lang/ru.pm

@@ -1983,8 +1983,8 @@ under the same terms as Perl itself.
 
 =head1 ACKNOWLEDGEMENTS
 
-Thanks to Jens Duttke, Sergey Shemetov, Dmitry Yerokhin and Anton Sukhinov
-for providing this translation.
+Thanks to Jens Duttke, Sergey Shemetov, Dmitry Yerokhin, Anton Sukhinov and
+Alexander for providing this translation.
 
 =head1 SEE ALSO
 

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