exiftool_vendored 10.56.0 → 10.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9bbeec52de7180ba7164158cbd9bcc52768f56e
-  data.tar.gz: a9bb84204d3e36b430a336964f5171ab99ab3585
+  metadata.gz: 72daef9a11b65e07249202a45cd992a51acb07b6
+  data.tar.gz: 62cdaa5125babfc3efcc8e8813a0392fcc373074
 SHA512:
-  metadata.gz: 3406356b68a7a6ad9bdd2164a2a6661d08e24438c353b9abe220e2abda673ccd6ff536c4ca6e5f2ec99aea8bf2e65c16d5f56399741ed5277d3206c9ee02df13
-  data.tar.gz: 1b76b463ad708a4f21466e0445caccc33a0411275c0520b23bfd0ab5092ffba1ac9f563228016c90ff55418674f65d8acd67fddbe7506049b04fcb3b62742537
+  metadata.gz: e69f4f592268effb10cd7b4b9ca7c75307806cc3605836861a3ac6bf8d7781707939b64d05b7e11d99521add8ef5c7b9bac02ca24cee205aabfe7f8a3b2cf6a4
+  data.tar.gz: 4d8198e2a6fbd32b0fa85e76bf4261c8984aabb549ceba9c7a2a6ed1af0a38084d6d8fafe96f3afbc73acd48b97b0d94ae20a2b2cc2641e0a1d02513730ef4bc

data/bin/Changes

@@ -7,6 +7,37 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 10.55. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+June 29, 2017 - Version 10.58
+
+  - Added read support for RIFF-format MBWF/RF64 files
+  - Added write support for dji-drone XMP tags
+  - Added a new Canon LensType (thanks Steve Bates)
+  - Added a few new Sony/Minolta LensType values (thanks Jos Roost)
+  - Added a new Canon LensType
+  - Added a couple of new CanonModelID values (thanks LibRaw and Norbert Wasser)
+  - Decode some new FujiFilm tags (thanks Chris Schucker)
+  - Enhanced FileSize print conversion to show in "GB" for large files
+  - Fixed "outside of string in unpack" errors when reading some corrupted
+    EXE/ICC files
+  - Fixed problem extracting GIF MIDISong metadata
+
+June 20, 2017 - Version 10.57
+
+  - Added a new Canon LensType (thanks Norbert Wasser)
+  - Added write support for PNG Collection tag
+  - Added a few new CanonModelID values
+  - Added some new Pentax ShakeReduction values
+  - Removed ability to create PNG zxIf chunks
+  - Documented -progress:%b feature (added in 10.26)
+  - No longer report FileType, FileTypeExtension or MIMEType for JPEG/TIFF
+    images with an unknown header
+  - Relaxed case requirement for "SourceFile" header in CSV and JSON import
+  - Fixed decoding of Pentax ExposureCompensation for newer Ricoh models
+  - Fixed some incorrect "Wrong IFD" messages with experimental -validate
+    feature
+  - Fixed a couple of Sony/Minolta lens names (thanks Jos Roost)
+  - Fixed "Error reading PreviewImage" warning for some Sony models
+
 June 6, 2017 - Version 10.56
 
   - Removed ordering constraints between Geotag/Geosync and Geotime assignments
@@ -201,6 +232,7 @@ Jan. 13, 2017 - Version 10.39
 
   - Added Perl version and Unicode settings to -ver -v output
   - Added a new Sony LensType2 value
+  - Added a new Canon LensType (thanks Norbert Wasser)
   - More improvements to sample time_zone.config file (thanks Hayo Baan)
   - Fixed problem with MWG date/time tags introduced in version 10.34
   - Fixed problem setting the value of a tag from a binary file when the

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "10.56"
+   "version" : "10.58"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 10.56
+version: 10.58

data/bin/README

@@ -101,8 +101,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-10.56.tar.gz | tar -xf -
-  cd Image-ExifTool-10.56
+  gzip -dc Image-ExifTool-10.58.tar.gz | tar -xf -
+  cd Image-ExifTool-10.58
   ./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 = '10.56';
+my $version = '10.58';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -4779,17 +4779,18 @@ group names to each tag.  List-type tags with multiple items are output as
 JSON arrays unless B<-sep> is used.  By default XMP structures are flattened
 into individual tags in the JSON output, but the original structure may be
 preserved with the B<-struct> option (this also causes all list-type XMP
-tags to be output as JSON arrays, otherwise single-item lists are output as
-simple strings).  The B<-a> option is implied if the B<-g> or B<-G> options
-are used, otherwise it is ignored and duplicate tags are suppressed.  Adding
-the B<-D> or B<-H> option changes tag values to JSON objects with "val" and
-"id" fields, and adding B<-l> adds a "desc" field, and a "num" field if the
-numerical value is different from the converted "val".  The B<-b> option may
-be added to output binary data, encoded in base64 if necessary (indicated by
-"base64:" as the first 7 bytes of the value), and B<-t> may be added to
-include tag table information (see B<-t> for details).  The JSON output is
-UTF-8 regardless of any B<-L> or B<-charset> option setting, but the UTF-8
-validation is disabled if a character set other than UTF-8 is specified.
+tags to be output as JSON arrays, otherwise single-item lists would be
+output as simple strings).  The B<-a> option is implied if the B<-g> or
+B<-G> options are used, otherwise it is ignored and duplicate tags are
+suppressed.  Adding the B<-D> or B<-H> option changes tag values to JSON
+objects with "val" and "id" fields, and adding B<-l> adds a "desc" field,
+and a "num" field if the numerical value is different from the converted
+"val".  The B<-b> option may be added to output binary data, encoded in
+base64 if necessary (indicated by "base64:" as the first 7 bytes of the
+value), and B<-t> may be added to include tag table information (see B<-t>
+for details).  The JSON output is UTF-8 regardless of any B<-L> or
+B<-charset> option setting, but the UTF-8 validation is disabled if a
+character set other than UTF-8 is specified.
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
@@ -4799,7 +4800,7 @@ of "*" defines default tags for all target files which are combined with any
 tags specified for the specific SourceFile processed.  The imported JSON
 file must have the same format as the exported JSON files with the exception
 that the B<-g> option is not compatible with the import file format (use
-B<-G> instead). Additionally, tag names in the input JSON file may be
+B<-G> instead).  Additionally, tag names in the input JSON file may be
 suffixed with a C<#> to disable print conversion.
 
 Unlike CSV import, empty values are not ignored, and will cause an empty
@@ -4908,7 +4909,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 10.56 --
+    -- Generated by ExifTool 10.58 --
     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
@@ -4988,8 +4989,8 @@ with B<--sort>.
 
 Output structured XMP information instead of flattening to individual tags.
 This option works well when combined with the XML (B<-X>) and JSON (B<-j>)
-output formats.  For other output formats, the structures are serialized
-into the same format as when writing structured information (see
+output formats.  For other output formats, XMP structures and lists are
+serialized into the same format as when writing structured information (see
 L<http://owl.phy.queensu.ca/~phil/exiftool/struct.html> for details).  When
 copying, structured tags are copied by default unless B<--struct> is used to
 disable this feature (although flattened tags may still be copied by
@@ -5284,7 +5285,8 @@ small when reading images directly from disk, but can be substantial if
 piping images through a network connection.  For more substantial speed
 benefits, B<-fast2> also causes exiftool to avoid extracting any EXIF
 MakerNote information.  B<-fast3> avoids processing the file entirely, and
-returns only an initial guess at FileType and the pseudo System tags.
+returns only an initial guess at FileType and the pseudo System tags.  Has
+no effect when writing.
 
 =item B<-fileOrder> [-]I<TAG>
 
@@ -5464,10 +5466,10 @@ If followed by a colon (ie. B<-progress:>), the console window title is set
 according to the specified I<TITLE> string.  If no I<TITLE> is given, a
 default I<TITLE> string of "ExifTool %p%%" is assumed.  In the string, %f
 represents the file name, %p is the progress as a percent, %r is the
-progress as a ratio, and %% is a % character.  May be combined with the
-normal B<-progress> option to also show the progress count in console
-messages.  (Note:  For this feature to function correctly on Mac/Linux,
-stderr must go to the console.)
+progress as a ratio, %[##]b is a progress bar of width ## (default 20), and
+%% is a % character.  May be combined with the normal B<-progress> option to
+also show the progress count in console messages.  (Note:  For this feature
+to function correctly on Mac/Linux, stderr must go to the console.)
 
 =item B<-q> (B<-quiet>)
 
@@ -5926,10 +5928,11 @@ Note that function names are case sensitive.
 
 =head1 WINDOWS UNICODE FILE NAMES
 
-In Windows, by default, file and directory names are specified on the
-command line (or in arg files) using the system code page, which varies with
-the system settings.  Unfortunately, these code pages are not complete
-character sets, so not all file names may be represented.
+In Windows, command-line arguments are specified using the current code page
+and are recoded automatically to the system code page.  This recoding is not
+done for arguments in ExifTool arg files, so by default filenames in arg
+files use the system code page.  Unfortunately, these code pages are not
+complete character sets, so not all file names may be represented.
 
 ExifTool 9.79 and later allow the file name encoding to be specified with
 C<-charset filename=CHARSET>, where C<CHARSET> is the name of a valid
@@ -5938,8 +5941,8 @@ complete list).  Setting this triggers the use of Windows wide-character i/o
 routines, thus providing support for all Unicode file names.  But note that
 it is not trivial to pass properly encoded file names on the Windows command
 line (see L<http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q18> for
-details), so placing them in a UTF-8 encoded B<-@> argfile is recommended if
-possible.
+details), so placing them in a UTF-8 encoded B<-@> argfile and using
+C<-charset filename=utf8> is recommended if possible.
 
 A warning is issued if a specified filename contains special characters and
 the filename character set was not provided.  However, the warning may be
@@ -6542,7 +6545,7 @@ flexibility of ExifTool.)
 
 =back
 
-=head1 DIAGNOSTICS
+=head1 EXIT STATUS
 
 The exiftool application exits with a status of 0 on success, or 1 if an
 error occurred or if all files failed the B<-if> condition (for any of the

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);
 
-$VERSION = '10.56';
+$VERSION = '10.58';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -509,7 +509,6 @@ my %fileTypeExt = (
 my %fileDescription = (
     DICOM => 'Digital Imaging and Communications in Medicine',
     XML   => 'Extensible Markup Language',
-    'DJVU (multi-page)' => 'DjVu multi-page image',
     'Win32 EXE' => 'Windows 32-bit Executable',
     'Win32 DLL' => 'Windows 32-bit Dynamic Link Library',
     'Win64 EXE' => 'Windows 64-bit Executable',
@@ -834,7 +833,7 @@ my %moduleName = (
     RAR  => 'Rar!\x1a\x07\0',
     RAW  => '(.{25}ARECOYK|II|MM)',
     Real => '(\.RMF|\.ra\xfd|pnm://|rtsp://|http://)',
-    RIFF => '(RIFF|LA0[234]|OFR |LPAC|wvpk)', # RIFF plus other variants
+    RIFF => '(RIFF|LA0[234]|OFR |LPAC|wvpk|RF64)', # RIFF plus other variants
     RSRC => '(....)?\0\0\x01\0',
     RTF  => '[\n\r]*\\{[\n\r]*\\\\rtf',
     RWZ  => 'rawzor',
@@ -1097,9 +1096,10 @@ my %systemTagsNotes = (
     FileCreateDate => {
         Description => 'File Creation Date/Time',
         Notes => q{
-            the filesystem creation date/time.  Windows only.  Requires Win32API::File
-            and Win32::API for writing.  See L<MDItemFSCreationDate|MacOS.html#MDItem>
-            for the Mac OS X equivalent
+            the filesystem creation date/time.  Windows only.  This tag is writable and
+            is preserved by default when writing if Win32API::File and Win32::API are
+            available.  See L<MDItemFSCreationDate|MacOS.html#MDItem> for the Mac OS X
+            equivalent
         },
         Groups => { 1 => 'System', 2 => 'Time' },
         Writable => 1,
@@ -1452,6 +1452,7 @@ my %systemTagsNotes = (
             higher
         },
     },
+    # Validate (added from Validate.pm)
     Now => {
         Groups => { 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'Time' },
         Notes => q{
@@ -2215,6 +2216,7 @@ sub ExtractInfo($;@)
         $raf->Read($buff, 1024) or $buff = '';
         $raf->Seek($pos, 0) or $seekErr = 1;
         until ($seekErr) {
+            my $unkHeader;
             $type = shift @fileTypeList;
             if ($type) {
                 # do quick test for this file type to avoid loading module unnecessarily
@@ -2232,7 +2234,8 @@ sub ExtractInfo($;@)
                 my $skip = pos($buff) - length($1);
                 $dirInfo{Base} = $pos + $skip;
                 $raf->Seek($pos + $skip, 0) or $seekErr = 1, last;
-                $self->Warn("Skipped unknown $skip byte header");
+                $self->Warn("Processing $type-like data after unknown $skip-byte header");
+                $unkHeader = 1 unless $$self{DOC_NUM};
             }
             # save file type in member variable
             $$self{FILE_TYPE} = $type;
@@ -2266,8 +2269,15 @@ sub ExtractInfo($;@)
 
             pop @{$$self{PATH}};
 
-            last if $result;    # all done if successful
-
+            if ($result) {  # all done if successful
+                if ($unkHeader) {
+                    $self->DeleteTag('FileType');
+                    $self->DeleteTag('FileTypeExtension');
+                    $self->DeleteTag('MIMEType');
+                    $self->VPrint(0,"Reset file type due to unknown header\n");
+                }
+                last;
+            }
             # seek back to try again from the same position in the file
             $raf->Seek($pos, 0) or $seekErr = 1, last;
         }
@@ -2787,7 +2797,14 @@ sub GetValue($$;$)
                 last;
             }
             $val = $$vals[$i];
-            $conv = $$convList[$i] if $convList;
+            if ($convList) {
+                my $nextConv = $$convList[$i];
+                if ($nextConv and $nextConv eq 'REPEAT') {
+                    undef $convList;
+                } else {
+                    $conv = $nextConv;
+                }
+            }
         }
         # return undefined now if no value
         return () unless defined $value;
@@ -3222,15 +3239,23 @@ sub GetFileType(;$$)
         }
         return @types;
     }
-    my $fileType;
+    my ($fileType, $subType);
     my $fileExt = GetFileExtension($file);
-    $fileExt = uc($file) unless $fileExt;
+    unless ($fileExt) {
+        if ($file =~ s/ \((.*)\)$//) {
+            $subType = $1;
+            $fileExt = GetFileExtension($file);
+        }
+        $fileExt = uc($file) unless $fileExt;
+    }
     $fileExt and $fileType = $fileTypeLookup{$fileExt}; # look up the file type
     $fileType = $fileTypeLookup{$fileType} while $fileType and not ref $fileType;
     # return description if specified
     # (allow input $file to be a FileType for this purpose)
     if ($desc) {
-        return $fileType ? $$fileType[1] : $fileDescription{$file};
+        $desc = $fileType ? $$fileType[1] : $fileDescription{$file};
+        $desc .= ", $subType" if $subType;
+        return $desc;
     } elsif ($fileType and (not defined $desc or $desc ne '0')) {
         # return only supported file types
         my $mod = $moduleName{$$fileType[0]};
@@ -5119,7 +5144,9 @@ sub ConvertFileSize($)
     $val < 10240 and return sprintf('%.1f kB', $val / 1024);
     $val < 2097152 and return sprintf('%.0f kB', $val / 1024);
     $val < 10485760 and return sprintf('%.1f MB', $val / 1048576);
-    return sprintf('%.0f MB', $val / 1048576);
+    $val < 2147483648 and return sprintf('%.0f MB', $val / 1048576);
+    $val < 10737418240 and return sprintf('%.1f GB', $val / 1073741824);
+    return sprintf('%.0f GB', $val / 1073741824);
 }
 
 #------------------------------------------------------------------------------

data/bin/lib/Image/ExifTool.pod

@@ -2180,9 +2180,10 @@ RMETA, RSRC, RTF, Radiance, Rawzor, Real, Real-CONT, Real-MDPR, Real-PROP,
 Real-RA3, Real-RA4, Real-RA5, Real-RJMD, Reconyx, Ricoh, SPIFF, SR2,
 SR2DataIFD, SR2SubIFD, SRF#, SVG, Samsung, Sanyo, Scalado, Sigma, SigmaRaw,
 Sony, SonyIDC, Stim, SubIFD, System, Theora, Torrent, Track#, VCalendar,
-VCard, Version0, Vorbis, XML, XMP, XMP-DICOM, XMP-GPano, XMP-MP, XMP-MP1,
-XMP-PixelLive, XMP-aas, XMP-acdsee, XMP-album, XMP-apple-fi, XMP-aux,
-XMP-cc, XMP-cell, XMP-creatorAtom, XMP-crs, XMP-dc, XMP-dex, XMP-digiKam,
+VCard, Version0, Vorbis, XML, XMP, XMP-DICOM, XMP-GAudio, XMP-GImage,
+XMP-GPano, XMP-GSpherical, XMP-MP, XMP-MP1, XMP-PixelLive, XMP-aas,
+XMP-acdsee, XMP-album, XMP-apple-fi, XMP-aux, XMP-cc, XMP-cell,
+XMP-creatorAtom, XMP-crs, XMP-dc, XMP-dex, XMP-digiKam, XMP-drone-dji,
 XMP-dwc, XMP-exif, XMP-exifEX, XMP-expressionmedia, XMP-extensis, XMP-fpv,
 XMP-getty, XMP-ics, XMP-iptcCore, XMP-iptcExt, XMP-lr, XMP-mediapro,
 XMP-microsoft, XMP-mwg-coll, XMP-mwg-kw, XMP-mwg-rs, XMP-pdf, XMP-pdfx,

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.08';
+$VERSION = '3.09';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -501,7 +501,9 @@ must be subsequently re-linearized if this is required.
 
 2) All metadata edits are reversible.  While this would normally be
 considered an advantage, it is a potential security problem because old
-information is never actually deleted from the file.
+information is never actually deleted from the file.  (However, after
+running ExifTool the old information may be removed permanently using the
+"qpdf" utility with this command: "qpdf --linearize in.pdf out.pdf".)
 },
     DNG => q{
 The main DNG tags are found in the EXIF table.  The tables below define only
@@ -1004,10 +1006,16 @@ TagID:  foreach $tagID (@keys) {
                     my (@printConvList, @indexList, $index, $valueConvHash);
                     if (ref $printConv eq 'ARRAY') {
                         for ($index=0; $index<@$printConv; ++$index) {
-                            next if ref $$printConv[$index] ne 'HASH';
-                            next unless %{$$printConv[$index]};
-                            push @printConvList, $$printConv[$index];
-                            push @indexList, $index;
+                            if (ref $$printConv[$index] eq 'HASH') {
+                                next unless %{$$printConv[$index]};
+                                push @printConvList, $$printConv[$index];
+                                push @indexList, $index;
+                            } elsif ($$printConv[$index] and $$printConv[$index] eq 'REPEAT' and $index) {
+                                push @printConvList, $$printConv[$index-1];
+                                push @indexList, 'N';
+                            } else {
+                                next;
+                            }
                             # collapse values with identical PrintConv's
                             if (@printConvList >= 2 and $printConvList[-1] eq $printConvList[-2]) {
                                 if (ref $indexList[-2]) {
@@ -1034,11 +1042,11 @@ TagID:  foreach $tagID (@keys) {
                                 # collapse consecutive number ranges
                                 my ($i, @i, $rngStart);
                                 for ($i=0; $i<@$idx; ++$i) {
-                                    if ($i < @$idx - 1 and $$idx[$i+1] == $$idx[$i] + 1) {
-                                        $rngStart = $i unless defined $rngStart;
+                                    if ($i < @$idx - 1 and ($$idx[$i+1] eq 'N' or $$idx[$i+1] == $$idx[$i] + 1)) {
+                                        $rngStart = $$idx[$i] unless defined $rngStart;
                                         next;
                                     }
-                                    push @i, defined($rngStart) ? "$rngStart-$i" : $i;
+                                    push @i, (defined($rngStart) ? "$rngStart-" : '') . $$idx[$i];
                                 }
                                 ($idx = join ', ', @i) =~ s/(.*),/$1 and/;
                             } elsif (not $$tagInfo{Relist}) {

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

@@ -85,7 +85,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.75';
+$VERSION = '3.77';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -335,6 +335,7 @@ $VERSION = '3.75';
     183.3 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #IB
     183.4 => 'Sigma 150-600mm f/5-6.3 DG OS HSM | C', #47
     183.5 => 'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #forum7109 (Sports 014)
+    183.6 => 'Sigma 100-400mm f/5-6.3 DG OS HSM', #PH ("| C" ?)
     184 => 'Canon EF 400mm f/2.8L + 2x', #15
     185 => 'Canon EF 600mm f/4L IS', #32
     186 => 'Canon EF 70-200mm f/4L', #9
@@ -347,7 +348,8 @@ $VERSION = '3.75';
     194 => 'Canon EF 80-200mm f/4.5-5.6 USM', #32
     195 => 'Canon EF 35-105mm f/4.5-5.6 USM', #32
     196 => 'Canon EF 75-300mm f/4-5.6 USM', #15/32
-    197 => 'Canon EF 75-300mm f/4-5.6 IS USM',
+    197 => 'Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens',
+    197.1 => 'Sigma 18-300mm f/3.5-6.3 DC Macro OS HS', #50
     198 => 'Canon EF 50mm f/1.4 USM or Zeiss Lens',
     198.1 => 'Zeiss Otus 55mm f/1.4 ZE', #JR (seen only on Sony camera)
     198.2 => 'Zeiss Otus 85mm f/1.4 ZE', #JR (NC)
@@ -423,14 +425,15 @@ $VERSION = '3.75';
     505 => 'Canon EF 35mm f/2 IS USM', #PH
     506 => 'Canon EF 400mm f/4 DO IS II USM', #42
     507 => 'Canon EF 16-35mm f/4L IS USM', #42
-    508 => 'Canon EF 11-24mm f/4L USM', #PH
+    508 => 'Canon EF 11-24mm f/4L USM or Tamron Lens', #PH
+    508.1 => 'Tamron 10-24mm f/3.5-4.5 Di II VC HLD', #PH (B023)
     747 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens', #JR
     747.1 => 'Tamron SP 150-600mm F5-6.3 Di VC USD G2', #50
     748 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x', #JR (1.4x Mk III)
     750 => 'Canon EF 35mm f/1.4L II USM', #42
     751 => 'Canon EF 16-35mm f/2.8L III USM', #42
     752 => 'Canon EF 24-105mm f/4L IS II USM', #42
-    # (STM lenses seem to start with 0x10xx)
+    # (STM lenses - 0x10xx)
     4142 => 'Canon EF-S 18-135mm f/3.5-5.6 IS STM',
     4143 => 'Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens',
     4143.1 => 'Tamron 18-200mm F/3.5-6.3 Di III VC', #42
@@ -448,8 +451,11 @@ $VERSION = '3.75';
     4156 => 'Canon EF 50mm f/1.8 STM', #42
     4157 => 'Canon EF-M 18-150mm 1:3.5-6.3 IS STM', #42
     4158 => 'Canon EF-S 18-55mm f/4-5.6 IS STM', #PH
+    4160 => 'Canon EF-S 35mm f/2.8 Macro IS STM', #42
+    # (Nano USM lenses - 0x90xx)
     36910 => 'Canon EF 70-300mm f/4-5.6 IS II USM', #42
     36912 => 'Canon EF-S 18-135mm f/3.5-5.6 IS USM', #42
+    # (CN-E lenses - 0xf0xx)
     61494 => 'Canon CN-E 85mm T1.3 L F', #PH
     65535 => 'n/a',
 );
@@ -686,6 +692,9 @@ $VERSION = '3.75';
     0x4060000 => 'PowerShot SX620 HS',
     0x4070000 => 'EOS M6',
     0x4100000 => 'PowerShot G9 X Mark II',
+    0x4150000 => 'PowerShot ELPH 185 / IXUS 185 / IXY 200', 
+    0x4160000 => 'PowerShot SX430 IS',
+    0x4170000 => 'PowerShot SX730 HS',
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
 
 # (see http://cweb.canon.jp/e-support/faq/answer/digitalcamera/10447-1.html for PowerShot/IXUS/IXY names)
@@ -778,7 +787,9 @@ $VERSION = '3.75';
     0x80000401 => 'EOS 5DS R',
     0x80000404 => 'EOS Rebel T6 / 1300D / Kiss X80',
     0x80000405 => 'EOS Rebel T7i / 800D / Kiss X9i',
+    0x80000406 => 'EOS 6D Mark II', #IB/42
     0x80000408 => 'EOS 77D / 9000D',
+    0x80000417 => 'EOS Rebel SL2 / 200D / Kiss X9', #IB/42
 );
 
 my %canonQuality = (
@@ -7438,7 +7449,7 @@ my %ciMaxFocal = (
             12 => '12 (5DS/5DSR)',
             13 => '13 (80D)', #PH
             14 => '14 (1300D)', #IB
-            15 => '15 (77D/800D)', #IB
+            15 => '15 (6DmkII/77D/200D/800D)', #IB
         },
     },
     0x3f => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
@@ -7628,6 +7639,7 @@ my %ciMaxFocal = (
             0 => 'Disable',
             1 => 'Adjust all by the same amount',
             2 => 'Adjust by lens',
+          # 3 - seen this for EOS 77D, which doesn't have an AF Micro Adjust feature - PH
         },
     },
     2 => {