exiftool_vendored 11.49.0 → 11.50.0

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.49';
+my $version = '11.50';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -495,9 +495,7 @@ $xml = 0;
 
 # define local variables used only in this command loop
 my @fileOrder;      # tags to use for ordering of input files
-my %excludeGrp;     # hash of tags excluded by group
 my $addGeotime;     # automatically added geotime argument
-my $allInGroup;     # flag to show all tags in a group
 my $doGlob;         # flag set to do filename wildcard expansion
 my $escapeXML;      # flag to escape printed values for xml
 my $setTagsFile;    # filename for last TagsFromFile option
@@ -879,6 +877,7 @@ for (;;) {
         $showGroup = $3 || 0;
         $allGroup = ($2 ? lc($2) eq 'roupnames' : $1 eq 'G');
         $mt->Options(SavePath => 1) if $showGroup =~ /\b5\b/;
+        $mt->Options(SaveFormat => 1) if $showGroup =~ /\b6\b/;
         next;
     }
     if ($a eq 'geotag') {
@@ -3136,6 +3135,7 @@ sub EscapeJSON($;$)
     # escape special characters
     $str =~ s/(["\t\n\r\\])/\\$jsonChar{$1}/sg;
     if ($json < 2) { # JSON
+        $str =~ tr/\0//d;   # remove all nulls
         # escape other control characters with \u
         $str =~ s/([\0-\x1f])/sprintf("\\u%.4X",ord $1)/sge;
         # JSON strings must be valid UTF8
@@ -4284,8 +4284,8 @@ supported by ExifTool (r = read, w = write, c = create):
   CRM   r/w   | GZ    r     | MOI   r     | PMP   r     | WAV   r
   CRW   r/w   | HDP   r/w   | MOS   r/w   | PNG   r/w   | WDP   r/w
   CS1   r/w   | HDR   r     | MOV   r/w   | PPM   r/w   | WEBP  r
-  DCM   r     | HEIC  r     | MP3   r     | PPT   r     | WEBM  r
-  DCP   r/w   | HEIF  r     | MP4   r/w   | PPTX  r     | WMA   r
+  DCM   r     | HEIC  r/w   | MP3   r     | PPT   r     | WEBM  r
+  DCP   r/w   | HEIF  r/w   | MP4   r/w   | PPTX  r     | WMA   r
   DCR   r     | HTML  r     | MPC   r     | PS    r/w   | WMV   r
   DFONT r     | ICC   r/w/c | MPG   r     | PSB   r/w   | WTV   r
   DIVX  r     | ICS   r     | MPO   r/w   | PSD   r/w   | WV    r
@@ -5119,7 +5119,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.49 --
+    -- Generated by ExifTool 11.50 --
     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
@@ -5448,10 +5448,11 @@ B<-o> option with an XMP extension for the output file.
 =item B<-a>, B<--a> (B<-duplicates>, B<--duplicates>)
 
 Allow (B<-a>) or suppress (B<--a>) duplicate tag names to be extracted.  By
-default, duplicate tags are suppressed unless the B<-ee> or B<-X> options
-are used or the Duplicates option is enabled in the configuration file. 
-This option also has an affect when writing to allow duplicate Warning
-messages to be shown.
+default, duplicate tags are suppressed when reading unless the B<-ee> or
+B<-X> options are used or the Duplicates option is enabled in the
+configuration file. This option has an affect when writing only to allow
+duplicate Warning messages to be shown.  Duplicate tags are always extracted
+when copying.
 
 =item B<-e> (B<--composite>)
 
@@ -6146,11 +6147,11 @@ placing braces around the tag name and inserting the expression after the
 name, separated by a semicolon (ie. C<${TAG;EXPR}>).  The expression acts on
 the value of the tag through the default input variable (C<$_>), and has
 access to the full ExifTool API through the current ExifTool object
-(C<$self>).  It may contain any valid Perl code, including translation
-(C<tr///>) and substitution (C<s///>) operations, but note that braces
-within the expression must be balanced.  The example below prints the camera
-Make with spaces translated to underlines, and multiple consecutive
-underlines replaced by a single underline:
+(C<$self>) and the tag key (C<$tag>).  It may contain any valid Perl code,
+including translation (C<tr///>) and substitution (C<s///>) operations, but
+note that braces within the expression must be balanced.  The example below
+prints the camera Make with spaces translated to underlines, and multiple
+consecutive underlines replaced by a single underline:
 
     exiftool -p '${make;tr/ /_/;s/__+/_/g}' image.jpg
 

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.49';
+$VERSION = '11.50';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -980,7 +980,7 @@ sub DummyWriteProc { return 1; }
 
 my %systemTagsNotes = (
     Notes => q{
-        extracted only if specifically requested or the SystemTags or RequestAll API
+        extracted only if specifically requested or the L<SystemTags|../ExifTool.html#SystemTags> or L<RequestAll|../ExifTool.html#RequestAll> API
         option is set
     },
 );
@@ -1014,7 +1014,7 @@ my %systemTagsNotes = (
         Notes => q{
             returns errors that may have occurred while reading or writing a file.  Any
             Error will prevent the file from being processed.  Minor errors may be
-            downgraded to warnings with the -m or IgnoreMinorErrors option
+            downgraded to warnings with the -m or L<IgnoreMinorErrors|../ExifTool.html#IgnoreMinorErrors> option
         },
     },
     Warning => {
@@ -1022,8 +1022,8 @@ my %systemTagsNotes = (
         Groups => \%allGroupsExifTool,
         Notes => q{
             returns warnings that may have occurred while reading or writing a file.
-            Use the -a or Duplicates option to see all warnings if more than one
-            occurred. Minor warnings may be ignored with the -m or IgnoreMinorErrors
+            Use the -a or L<Duplicates|../ExifTool.html#Duplicates> option to see all warnings if more than one
+            occurred. Minor warnings may be ignored with the -m or L<IgnoreMinorErrors|../ExifTool.html#IgnoreMinorErrors>
             option.  Minor warnings with a capital "M" in the "[Minor]" designation
             indicate that the processing is affected by ignoring the warning
         },
@@ -1069,7 +1069,7 @@ my %systemTagsNotes = (
         Groups => { 1 => 'System' },
         Notes => q{
             absolute path of source file. Not generated unless specifically requested or
-            the RequestAll API option is set.  Does not support Windows Unicode file
+            the L<RequestAll|../ExifTool.html#RequestAll> API option is set.  Does not support Windows Unicode file
             names
         },
     },
@@ -1092,7 +1092,7 @@ my %systemTagsNotes = (
             sequence number for each source file when extracting or copying information,
             including files that fail the -if condition of the command-line application,
             beginning at 0 for the first file.  Not generated unless specifically
-            requested or the RequestAll API option is set
+            requested or the L<RequestAll|../ExifTool.html#RequestAll> API option is set
         },
     },
     FileSize => {
@@ -1107,7 +1107,7 @@ my %systemTagsNotes = (
         Groups => { 1 => 'System' },
         Notes => q{
             size of the file's resource fork if it contains data.  Mac OS only.  If this
-            tag is generated the ExtractEmbedded option may be used to extract
+            tag is generated the L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> option may be used to extract
             resource-fork information as a sub-document.  When writing, the resource
             fork is preserved by default, but it may be deleted with C<-rsrc:all=> on
             the command line
@@ -1163,7 +1163,7 @@ my %systemTagsNotes = (
             the filesystem creation date/time.  Windows/Mac only.  In Windows, the file
             creation date/time is preserved by default when writing if Win32API::File
             and Win32::API are available.  On Mac, this tag is extracted only if it or
-            the MacOS group is specifically requested or the RequestAll API option is
+            the MacOS group is specifically requested or the L<RequestAll|../ExifTool.html#RequestAll> API option is
             set to 2 or higher.  Requires "setfile" for writing on Mac
         },
         Groups => { 1 => 'System', 2 => 'Time' },
@@ -1230,7 +1230,7 @@ my %systemTagsNotes = (
     FileAttributes => {
         Groups => { 1 => 'System' },
         Notes => q{
-            extracted only if specifically requested or the SystemTags or RequestAll API
+            extracted only if specifically requested or the L<SystemTags|../ExifTool.html#SystemTags> or L<RequestAll|../ExifTool.html#RequestAll> API
             option is set.  2 or 3 values: 0. File type, 1. Attribute bits, 2. Windows
             attribute bits if Win32API::File is available
         },
@@ -1285,7 +1285,7 @@ my %systemTagsNotes = (
     FileUserID => {
         Groups => { 1 => 'System' },
         Notes => q{
-            extracted only if specifically requested or the SystemTags or RequestAll API
+            extracted only if specifically requested or the L<SystemTags|../ExifTool.html#SystemTags> or L<RequestAll|../ExifTool.html#RequestAll> API
             option is set.  Returns user ID number with the -n option, or name
             otherwise.  May be written with either user name or number
         },
@@ -1299,7 +1299,7 @@ my %systemTagsNotes = (
     FileGroupID => {
         Groups => { 1 => 'System' },
         Notes => q{
-            extracted only if specifically requested or the SystemTags or RequestAll API
+            extracted only if specifically requested or the L<SystemTags|../ExifTool.html#SystemTags> or L<RequestAll|../ExifTool.html#RequestAll> API
             option is set.  Returns group ID number with the -n option, or name
             otherwise.  May be written with either group name or number
         },
@@ -1526,7 +1526,7 @@ my %systemTagsNotes = (
         Groups => { 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'Other' },
         Notes => q{
             the clock time in seconds taken by ExifTool to extract information from this
-            file.  Not generated unless specifically requested or the RequestAll API
+            file.  Not generated unless specifically requested or the L<RequestAll|../ExifTool.html#RequestAll> API
             option is set.  Requires Time::HiRes
         },
         PrintConv => 'sprintf("%.3g s", $val)',
@@ -1538,7 +1538,7 @@ my %systemTagsNotes = (
             sub-sampling values to generate the value of this tag.  The result is
             compared to known values in an attempt to deduce the originating software
             based only on the JPEG image data.  For performance reasons, this tag is
-            generated only if specifically requested or the RequestAll API option is set
+            generated only if specifically requested or the L<RequestAll|../ExifTool.html#RequestAll> API option is set
             to 3 or higher
         },
     },
@@ -1546,14 +1546,14 @@ my %systemTagsNotes = (
         Notes => q{
             an estimate of the IJG JPEG quality setting for the image, calculated from
             the quantization tables.  For performance reasons, this tag is generated
-            only if specifically requested or the RequestAll API option is set to 3 or
+            only if specifically requested or the L<RequestAll|../ExifTool.html#RequestAll> API option is set to 3 or
             higher
         },
     },
     JPEGImageLength => {
         Notes => q{
             byte length of JPEG image without metadata.  For performance reasons, this
-            tag is generated only if specifically requested or the RequestAll API option
+            tag is generated only if specifically requested or the L<RequestAll|../ExifTool.html#RequestAll> API option
             is set to 3 or higher
         },
     },
@@ -1563,7 +1563,7 @@ my %systemTagsNotes = (
         Notes => q{
             the current date/time.  Useful when setting the tag values, eg.
             C<"-modifydate<now">.  Not generated unless specifically requested or the
-            RequestAll API option is set
+            L<RequestAll|../ExifTool.html#RequestAll> API option is set
         },
         PrintConv => '$self->ConvertDateTime($val)',
     },
@@ -1574,7 +1574,7 @@ my %systemTagsNotes = (
             YYYYmmdd-HHMM-SSNN-PPPP-RRRRRRRRRRRR, where Y=year, m=month, d=day, H=hour,
             M=minute, S=second, N=file sequence number in hex, P=process ID in hex, and
             R=random hex number; without dashes with the -n option.  Not generated
-            unless specifically requested or the RequestAll API option is set
+            unless specifically requested or the L<RequestAll|../ExifTool.html#RequestAll> API option is set
         },
         PrintConv => '$val =~ s/(.{8})(.{4})(.{4})(.{4})/$1-$2-$3-$4-/; $val',
     },
@@ -2150,6 +2150,7 @@ sub ClearOptions($)
         QuickTimeUTC=> undef,   # assume that QuickTime date/time tags are stored as UTC
         RequestAll  => undef,   # extract all tags that must be specifically requested
         RequestTags => undef,   # extra tags to request (on top of those in the tag list)
+        SaveFormat  => undef,   # (undocumented) save family 6 tag TIFF format
         SavePath    => undef,   # (undocumented) save family 5 location path
         ScanForXMP  => undef,   # flag to scan for XMP information in all files
         Sort        => 'Input', # order to sort found tags (Input, File, Tag, Descr, Group#)
@@ -3225,6 +3226,10 @@ sub GetGroup($$;$)
         $groups[1] = $$ex{G1} =~ /^\+(.*)/ ? "$groups[1]$1" : $$ex{G1} if $$ex{G1};
         $groups[3] = 'Doc' . $$ex{G3} if $$ex{G3};
         $groups[5] = $$ex{G5} || $groups[1] if defined $$ex{G5};
+        if (defined $$ex{G6}) {
+            $groups[5] = '' unless defined $groups[5];  # (can't leave a hole in the array)
+            $groups[6] = $$ex{G6};
+        }
     }
     if ($family) {
         return $groups[$family] || '' if $family > 0;
@@ -7376,7 +7381,9 @@ sub GetTagInfo($$$;$$$)
                 next;
             }
         }
-        if ($$tagInfo{Unknown} and not $$self{OPTIONS}{Unknown} and not $$self{OPTIONS}{Verbose}) {
+        if ($$tagInfo{Unknown} and not $$self{OPTIONS}{Unknown} and
+            not $$self{OPTIONS}{Verbose} and not $$self{HTML_DUMP})
+        {
             # don't return Unknown tags unless that option is set
             return undef;
         }

data/bin/lib/Image/ExifTool.pod

@@ -92,8 +92,8 @@ supported by ExifTool (r = read, w = write, c = create):
   CRM   r/w   | GZ    r     | MOI   r     | PMP   r     | WAV   r
   CRW   r/w   | HDP   r/w   | MOS   r/w   | PNG   r/w   | WDP   r/w
   CS1   r/w   | HDR   r     | MOV   r/w   | PPM   r/w   | WEBP  r
-  DCM   r     | HEIC  r     | MP3   r     | PPT   r     | WEBM  r
-  DCP   r/w   | HEIF  r     | MP4   r/w   | PPTX  r     | WMA   r
+  DCM   r     | HEIC  r/w   | MP3   r     | PPT   r     | WEBM  r
+  DCP   r/w   | HEIF  r/w   | MP4   r/w   | PPTX  r     | WMA   r
   DCR   r     | HTML  r     | MPC   r     | PS    r/w   | WMV   r
   DFONT r     | ICC   r/w/c | MPG   r     | PSB   r/w   | WTV   r
   DIVX  r     | ICS   r     | MPO   r/w   | PSD   r/w   | WV    r
@@ -424,6 +424,9 @@ in the full ExifTool distribution for examples.
 
 =item Option Parameters:
 
+Note that these API options may also be used in the exiftool application via
+the command-line B<-api> option.
+
 =over 4
 
 =item Binary

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

@@ -129,13 +129,13 @@ sub ProcessAudible_meta($$$)
     for ($index=0; $index<$num; ++$index) {
         last if $pos + 3 > $dirLen;
         my $unk = Get8u($dataPt, $pos);             # ? (0x80 or 0x00)
-        last unless $unk eq 0x80 or $unk eq 0x00;
+        last unless $unk == 0x80 or $unk == 0x00;
         my $len = Get16u($dataPt, $pos + 1);        # tag length
         $pos += 3;
         last if $pos + $len + 6 > $dirLen or not $len;
         my $tag = substr($$dataPt, $pos, $len);     # tag ID
         my $ver = Get16u($dataPt, $pos + $len);     # version?
-        last unless $ver eq 0x0001;
+        last unless $ver == 0x0001;
         my $size = Get32u($dataPt, $pos + $len + 2);# data size
         $pos += $len + 6;
         last if $pos + $size > $dirLen;

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

@@ -176,7 +176,7 @@ tag ID.  In these cases, the actual name used depends on the context in
 which the information is found.  Case is not significant for tag names.  A
 question mark (C<?>) after a tag name indicates that the information is
 either not understood, not verified, or not very useful -- these tags are
-not extracted by ExifTool unless the Unknown (-u) option is enabled.  Be
+not extracted by ExifTool unless the L<Unknown|../ExifTool.html#Unknown> (-u) option is enabled.  Be
 aware that some tag names are different than the descriptions printed out by
 default when extracting information with exiftool.  To see the tag names
 instead of the descriptions, use C<exiftool -s>.
@@ -196,7 +196,7 @@ be added and deleted.  A slash (C</>) indicates a tag that ExifTool will
 I<Avoid> when writing.  These will be edited but not created if another
 same-named tag may be created instead.  To create these tags, the group
 should be specified.  A tilde (C<~>) indicates a tag this is writable only
-when the print conversion is disabled (by setting PrintConv to 0, using the
+when the print conversion is disabled (by setting L<PrintConv|../ExifTool.html#PrintConv> to 0, using the
 -n option, or suffixing the tag name with a C<#> character). An exclamation
 point (C<!>) indicates a tag that is considered I<Unsafe> to write under
 normal circumstances.  These tags are not written unless specified
@@ -215,7 +215,7 @@ listed as the computer-readable and human-readable values on the left and
 right hand side of an equals sign (C<=>) respectively.  The human-readable
 values are used by default when reading and writing, but the
 computer-readable values may be accessed by disabling the value conversion
-with the -n option on the command line, by setting the ValueConv option to 0
+with the -n option on the command line, by setting the L<PrintConv|../ExifTool.html#PrintConv> option to 0
 in the API, or or on a per-tag basis by adding a hash (C<#>) after the tag
 name.
 
@@ -273,7 +273,7 @@ Some GPS tags have values which are fixed-length strings. For these, the
 indicated string lengths include a null terminator which is added
 automatically by ExifTool.  Remember that the descriptive values are used
 when writing (eg. 'Above Sea Level', not '0') unless the print conversion is
-disabled (with '-n' on the command line or the PrintConv option in the API,
+disabled (with '-n' on the command line or the L<PrintConv|../ExifTool.html#PrintConv> option in the API,
 or by suffixing the tag name with a C<#> character).
 
 When adding GPS information to an image, it is important to set all of the
@@ -306,15 +306,15 @@ HH:MM:SS[.ss][+/-HH:MM]", C<boolean> is either "True" or "False", C<struct>
 indicates a structured tag, and C<lang-alt> is a tag that supports alternate
 languages.
 
-When reading, C<struct> tags are extracted only if the Struct (-struct)
+When reading, C<struct> tags are extracted only if the L<Struct|../ExifTool.html#Struct> (-struct)
 option is used.  Otherwise the corresponding I<Flattened> tags, indicated by
 an underline (C<_>) after the B<Writable> type, are extracted.  When
 copying, by default both structured and flattened tags are available, but
 the flattened tags are considered "unsafe" so they they aren't copied unless
-specified explicitly.  The Struct option may be disabled by setting Struct
+specified explicitly.  The L<Struct|../ExifTool.html#Struct> option may be disabled by setting Struct
 to 0 via the API or with --struct on the command line to copy only flattened
 tags, or enabled by setting Struct to 1 via the API or with -struct on the
-command line to copy only as structures.  When writing, the Struct option
+command line to copy only as structures.  When writing, the L<Struct|../ExifTool.html#Struct> option
 has no effect, and both structured and flattened tags may be written.  See
 L<http://owl.phy.queensu.ca/~phil/exiftool/struct.html> for more details.
 
@@ -381,7 +381,7 @@ the B<Writable> format name.  For tags where a range of lengths is allowed,
 the minimum and maximum lengths are separated by a comma within the
 brackets.  When writing, ExifTool issues a minor warning and truncates the
 value if it is longer than allowed by the IPTC specification.  Minor errors
-may be ignored with the IgnoreMinorErrors (-m) option, allowing longer
+may be ignored with the L<IgnoreMinorErrors|../ExifTool.html#IgnoreMinorErrors> (-m) option, allowing longer
 values to be written, but beware that values like this may cause problems
 for some other IPTC readers. ExifTool will happily read IPTC values of any
 length.
@@ -411,7 +411,7 @@ image files (most notably, MOV/MP4 videos and HEIC/CR3 images).  Exiftool
 extracts standard meta information and a variety of audio, video and image
 parameters, as well as proprietary information written by many camera
 models.  Tags with a question mark after their name are not extracted unless
-the Unknown option is set.
+the L<Unknown|../ExifTool.html#Unknown> option is set.
 
 When writing, ExifTool creates both QuickTime and XMP tags by default, but
 the group may be specified to write one or the other separately.  If no
@@ -428,20 +428,24 @@ QuickTime-based files; it extracts other track-specific and timed
 metadata, but can not yet edit tags in these locations (with the
 exception of track-level date/time tags).
 
-Alternate language tags may be accessed for ItemList and Keys tags by adding
+Alternate language tags may be accessed for
+L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
+L<Keys|Image::ExifTool::TagNames/QuickTime Keys Tags> tags by adding
 a 3-character ISO 639-2 language code and an optional ISO 3166-1 alpha 2
 country code to the tag name (eg. "ItemList:Artist-deu" or
-"ItemList::Artist-deu-DE").  Most UserData tags support a language code, but
-without a country code.  If no language code is specified when writing,
-alternate languages for the tag are deleted.  Use the "und" language code to
-write the default language without deleting alternate languages.  Note that
-"eng" is treated as a default language when reading, but not when writing.
+"ItemList::Artist-deu-DE").  Most
+L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags> tags support a
+language code, but without a country code.  If no language code is specified
+when writing, alternate languages for the tag are deleted.  Use the "und"
+language code to write the default language without deleting alternate
+languages.  Note that "eng" is treated as a default language when reading,
+but not when writing.
 
 According to the specification, many QuickTime date/time tags should be
 stored as UTC.  Unfortunately, digital cameras often store local time values
 instead (presumably because they don't know the time zone).  For this
 reason, by default ExifTool does not assume a time zone for these values.
-However, if the QuickTimeUTC API option is set, then ExifTool will assume
+However, if the L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> API option is set, then ExifTool will assume
 these values are properly stored as UTC, and will convert them to local time
 when extracting.
 
@@ -457,7 +461,7 @@ a few).
 Many Photoshop tags are marked as Unknown (indicated by a question mark
 after the tag name) because the information they provide is not very useful
 under normal circumstances.  These unknown tags are not extracted unless the
-Unknown (-u) option is used.  See
+L<Unknown|../ExifTool.html#Unknown> (-u) option is used.  See
 L<http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/> for the
 official specification
 
@@ -468,7 +472,7 @@ access to this information.
 },
     PrintIM => q{
 The format of the PrintIM information is known, however no PrintIM tags have
-been decoded.  Use the Unknown (-u) option to extract PrintIM information.
+been decoded.  Use the L<Unknown|../ExifTool.html#Unknown> (-u) option to extract PrintIM information.
 },
     GeoTiff => q{
 ExifTool extracts the following tags from GeoTIFF images.  See
@@ -533,7 +537,7 @@ settings have not been decoded for all models.  The tables below list the
 custom settings for the currently supported models.
 },
     Unknown => q{
-The following tags are decoded in unsupported maker notes.  Use the Unknown
+The following tags are decoded in unsupported maker notes.  Use the L<Unknown|../ExifTool.html#Unknown>
 (-u) option to display other unknown tags.
 },
     PDF => q{
@@ -545,7 +549,7 @@ specification.
 
 ExifTool supports reading and writing PDF documents up to version 1.7
 extension level 3, including support for RC4, AES-128 and AES-256
-encryption.  A Password option is provided to allow processing of
+encryption.  A L<Password|../ExifTool.html#Password> option is provided to allow processing of
 password-protected PDF files.
 
 ExifTool may be used to write native PDF and XMP metadata to PDF files. It
@@ -712,7 +716,7 @@ sub new
     my $that = shift;
     my $class = ref($that) || $that || 'Image::ExifTool::BuildTagLookup';
     my $self = bless {}, $class;
-    my (%subdirs, %isShortcut, %allStructs);
+    my (%subdirs, %isShortcut);
     my %count = (
         'unique tag names' => 0,
         'total tags' => 0,

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.14';
+$VERSION = '4.15';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -429,10 +429,13 @@ $VERSION = '4.14';
     250.1 => 'Sigma 20mm f/1.4 DG HSM | A', #IB
     250.2 => 'Sigma 20mm f/1.5 FF High-Speed Prime | 017', #IB
     250.3 => 'Tokina Opera 16-28mm f/2.8 FF', #IB
-    251 => 'Canon EF 70-200mm f/2.8L IS II USM', # (also version III, ref IB. May be distinguised by EXIF:LensModel "EF70-200mm f/2.8L IS III USM" -- add extra logic to LensID?)
+    251 => 'Canon EF 70-200mm f/2.8L IS II USM',
+    251.1 => 'Canon EF 70-200mm f/2.8L IS III USM', #IB
     252 => 'Canon EF 70-200mm f/2.8L IS II USM + 1.4x', #50 (1.4x Mk II)
+    252.1 => 'Canon EF 70-200mm f/2.8L IS III USM + 1.4x', #PH (NC)
     253 => 'Canon EF 70-200mm f/2.8L IS II USM + 2x', #PH (NC)
-    # 253.1 => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025) + 2x', #forum9367
+    253.1 => 'Canon EF 70-200mm f/2.8L IS III USM + 2x', #PH (NC)
+    # 253.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025) + 2x', #forum9367
     254 => 'Canon EF 100mm f/2.8L Macro IS USM', #42
     255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
@@ -6178,7 +6181,7 @@ my %ciMaxFocal = (
                 # DPP shows "On" for any value except 0xffff when bit 0x08 is set
                 my ($val, $inv) = @_;
                 if ($inv) {
-                    $val =~ /(0x[0-9a-f]+)/i or $val =~ /(\d+)/;
+                    $val =~ /(0x[0-9a-f]+)/i or $val =~ /(\d+)/ or return undef;
                     return $1;
                 } else {
                     return sprintf("On (0x%.2x)",$val) if $val & 0x08;
@@ -7316,7 +7319,7 @@ my %ciMaxFocal = (
     NOTES => q{
         Camera color calibration data.  For the 20D, 350D, 1DmkII and 1DSmkII the
         order of the coefficients is A, B, C, Temperature, but for newer models it
-        is B, C, A, Temperature.  These tags are extracted only when the Unknown
+        is B, C, A, Temperature.  These tags are extracted only when the L<Unknown|../ExifTool.html#Unknown>
         option is used.
     },
     0x00 => { Name => 'CameraColorCalibration01', %cameraColorCalibration },
@@ -8497,7 +8500,7 @@ my %filterConv = (
     GROUPS => { 0 => 'MakerNotes', 1 => 'Canon', 2 => 'Image' },
     PROCESS_PROC => \&ProcessCTMD,
     NOTES => q{
-        Canon Timed MetaData tags found in CR3 images.  The ExtractEmbedded option
+        Canon Timed MetaData tags found in CR3 images.  The L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> option
         is automatically applied when reading CR3 files to be able to extract this
         information.
     },
@@ -8953,9 +8956,10 @@ sub PrintLensID(@)
             }
             @matches = @best if @best;
         }
+        @matches = @likely unless @matches;
+        @matches = @maybe unless @matches;
+        Image::ExifTool::Exif::MatchLensModel(\@matches, $lensModel);
         return join(' or ', @matches) if @matches;
-        return join(' or ', @likely) if @likely;
-        return join(' or ', @maybe) if @maybe;
     } elsif ($lensModel and $lensModel =~ /\d/) {
         # use lens model as written by the camera
         if ($printConv eq \%canonLensTypes) {
@@ -9303,7 +9307,7 @@ sub PrintAFPoints1D($)
         $focusing = "$row$col" if $focus eq $focusPt;
         push @points, "$row$col" if shift @bits;
     }
-    $focusing or $focusing = ($focus eq 0xff) ? 'Auto' : sprintf('Unknown (0x%.2x)',$focus);
+    $focusing or $focusing = ($focus == 0xff) ? 'Auto' : sprintf('Unknown (0x%.2x)',$focus);
     return "$focusing (" . join(',',@points) . ')';
 }