exiftool_vendored 9.60.0 → 9.64.0

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/lib/Image/ExifTool.pod

@@ -67,35 +67,36 @@ supported by ExifTool (r = read, w = write, c = create):
   ------------+-------------+-------------+-------------+------------
   3FR   r     | EIP   r     | LA    r     | OTF   r     | RW2   r/w
   3G2   r/w   | EPS   r/w   | LNK   r     | PAC   r     | RWL   r/w
-  3GP   r/w   | ERF   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  ACR   r     | EXE   r     | M4A/V r/w   | PBM   r/w   | RM    r
-  AFM   r     | EXIF  r/w/c | MEF   r/w   | PCD   r     | SEQ   r
-  AI    r/w   | EXR   r     | MIE   r/w/c | PDF   r/w   | SO    r
-  AIFF  r     | EXV   r/w/c | MIFF  r     | PEF   r/w   | SR2   r/w
-  APE   r     | F4A/V r/w   | MKA   r     | PFA   r     | SRF   r
-  ARW   r/w   | FFF   r/w   | MKS   r     | PFB   r     | SRW   r/w
-  ASF   r     | FLA   r     | MKV   r     | PFM   r     | SVG   r
-  AVI   r     | FLAC  r     | MNG   r/w   | PGF   r     | SWF   r
-  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | THM   r/w
-  BTF   r     | FPF   r     | MOS   r/w   | PLIST r     | TIFF  r/w
-  CHM   r     | FPX   r     | MOV   r/w   | PICT  r     | TORRENT r
-  COS   r     | GIF   r/w   | MP3   r     | PMP   r     | TTC   r
-  CR2   r/w   | GZ    r     | MP4   r/w   | PNG   r/w   | TTF   r
-  CRW   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VRD   r/w/c
-  CS1   r/w   | HDR   r     | MPG   r     | PPT   r     | VSD   r
-  DCM   r     | HTML  r     | MPO   r/w   | PPTX  r     | WAV   r
-  DCP   r/w   | ICC   r/w/c | MQV   r/w   | PS    r/w   | WDP   r/w
-  DCR   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBP  r
-  DFONT r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WEBM  r
-  DIVX  r     | IND   r/w   | NEF   r/w   | PSP   r     | WMA   r
-  DJVU  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WMV   r
-  DLL   r     | ITC   r     | NUMBERS r   | RA    r     | WV    r
-  DNG   r/w   | J2C   r     | ODP   r     | RAF   r/w   | X3F   r/w
-  DOC   r     | JNG   r/w   | ODS   r     | RAM   r     | XCF   r
-  DOCX  r     | JP2   r/w   | ODT   r     | RAR   r     | XLS   r
-  DPX   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XLSX  r
-  DV    r     | K25   r     | OGG   r     | RIFF  r     | XMP   r/w/c
-  DVB   r/w   | KDC   r     | OGV   r     | RSRC  r     | ZIP   r
+  3GP   r/w   | EPUB  r     | M2TS  r     | PAGES r     | RWZ   r
+  ACR   r     | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
+  AFM   r     | EXE   r     | MEF   r/w   | PCD   r     | SEQ   r
+  AI    r/w   | EXIF  r/w/c | MIE   r/w/c | PDB   r     | SO    r
+  AIFF  r     | EXR   r     | MIFF  r     | PDF   r/w   | SR2   r/w
+  APE   r     | EXV   r/w/c | MKA   r     | PEF   r/w   | SRF   r
+  ARW   r/w   | F4A/V r/w   | MKS   r     | PFA   r     | SRW   r/w
+  ASF   r     | FFF   r/w   | MKV   r     | PFB   r     | SVG   r
+  AVI   r     | FLA   r     | MNG   r/w   | PFM   r     | SWF   r
+  AZW   r     | FLAC  r     | MOBI  r     | PGF   r     | THM   r/w
+  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
+  BTF   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
+  CHM   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r
+  COS   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
+  CR2   r/w   | GZ    r     | MP4   r/w   | PNG   r/w   | VRD   r/w/c
+  CRW   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
+  CS1   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
+  DCM   r     | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
+  DCP   r/w   | ICC   r/w/c | MQV   r/w   | PS    r/w   | WEBP  r
+  DCR   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
+  DFONT r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
+  DIVX  r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
+  DJVU  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WV    r
+  DLL   r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
+  DNG   r/w   | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
+  DOC   r     | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
+  DOCX  r     | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
+  DPX   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
+  DV    r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
+  DVB   r/w   | KDC   r     | OGV   r     | RSRC  r     |
   DYLIB r     | KEY   r     | ORF   r/w   | RTF   r     |
 
   Meta Information
@@ -168,7 +169,7 @@ Creates a new ExifTool object.
 
 Note that ExifTool uses AUTOLOAD to load non-member methods, so any class
 using Image::ExifTool as a base class must define an AUTOLOAD which calls
-Image::ExifTool::DoAutoLoad().  ie)
+Image::ExifTool::DoAutoLoad().  eg)
 
     sub AUTOLOAD
     {
@@ -230,15 +231,15 @@ reference (SCALAR ref).  The remaining scalar arguments are names of tags
 for requested information.  All tags are returned if no tags are specified.
 
 Tag names are case-insensitive and may be prefixed by optional group names
-separated by colons.  A group name may begin with a family number (ie.
+separated by colons.  A group name may begin with a family number (eg.
 '1IPTC:Keywords'), to restrict matches to a specific family.  In the tag
 name, a '?' matches any single character and a '*' matches zero or more
 characters.  Thus 'GROUP:*' represents all tags in a specific group. 
 Wildcards may not be used in group names, with the exception that a group
 name of '*' may be used to extract all available instances of a tag
-regardless of the L</Duplicates> setting (ie. '*:WhiteBalance').  Multiple
-groups may be specified (ie. 'EXIF:Time:*' extracts all EXIF Time tags). And
-finally, a leading '-' indicates a tag to be excluded (ie. '-IFD1:*'), or a
+regardless of the L</Duplicates> setting (eg. '*:WhiteBalance').  Multiple
+groups may be specified (eg. 'EXIF:Time:*' extracts all EXIF Time tags). And
+finally, a leading '-' indicates a tag to be excluded (eg. '-IFD1:*'), or a
 trailing '#' causes the ValueConv value to be returned for this tag.
 
 Note that keys in the returned information hash and elements of the returned
@@ -262,7 +263,7 @@ reference to a L<File::RandomAccess|File::RandomAccess> object.  Note that
 the file remains open and must be closed by the caller after L</ImageInfo>
 returns.
 
-[Advanced:  To allow a non-rewindable stream (ie. a network socket) to be
+[Advanced:  To allow a non-rewindable stream (eg. a network socket) to be
 re-read after processing with ExifTool, first wrap the file reference in a
 L<File::RandomAccess|File::RandomAccess> object, then pass this object to
 L</ImageInfo>.  The L<File::RandomAccess|File::RandomAccess> object will
@@ -416,7 +417,7 @@ in the full ExifTool distribution for examples.
 =item Binary
 
 Flag to extract the value data for all binary tags.  Tag values representing
-large binary data blocks (ie. ThumbnailImage) are not necessarily extracted
+large binary data blocks (eg. ThumbnailImage) are not necessarily extracted
 unless this option is set or the tag is specifically requested by name.
 Default is 0.
 
@@ -516,7 +517,7 @@ Format for printing GPS coordinates.  This is a printf format string with
 specifiers for degrees, minutes and seconds in that order, however minutes
 and seconds may be omitted.  If the hemisphere is known, a reference
 direction (N, S, E or W) is appended to each printed coordinate, but adding
-a C<+> to the format specifier (ie. C<%+.6f>) prints a signed coordinate
+a C<+> to the format specifier (eg. C<%+.6f>) prints a signed coordinate
 instead.  For example, the following table gives the output for the same
 coordinate using various formats:
 
@@ -571,7 +572,7 @@ this option set to 1, ExifTool will not scan to the end of a JPEG image to
 check for an AFCP, CanonVRD, FotoStation, PhotoMechanic, MIE or PreviewImage
 trailer.  This also stops the parsing after the first comment in GIF images,
 and at the audio/video data with RIFF-format files (AVI, WAV, etc), so any
-trailing metadata (ie. XMP written by some utilities) may be missed.  When
+trailing metadata (eg. XMP written by some utilities) may be missed.  When
 combined with the ScanForXMP option, prevents scanning for XMP in recognized
 file types.  With a value of 2, ExifTool will also avoid extracting any EXIF
 MakerNote information.  Default is 0.
@@ -664,7 +665,7 @@ warnings are denoted by "[minor]" at the start of the message, or "[Minor]"
 =item Lang
 
 Localized language for exiftool tag descriptions, etc.  Available languages
-are given by the Image::ExifTool::Lang module names (ie. 'fr', 'zh_cn').  If
+are given by the Image::ExifTool::Lang module names (eg. 'fr', 'zh_cn').  If
 the specified language isn't available, the option is not changed.  May be
 set to undef to select the built-in default language.  Default is 'en'.
 
@@ -687,7 +688,7 @@ is not set.  Default is ', '.
 =item ListSplit
 
 Regular expression used to split values of list-type tags into individual
-items when writing.  (ie. use ',\\s*' to split a comma-separated list.) 
+items when writing.  (eg. use ',\\s*' to split a comma-separated list.) 
 Default is undef.
 
 =item MakerNotes
@@ -881,7 +882,7 @@ L</ExtractInfo>:
 Binary, Charset, CharsetEXIF, CharsetID3, CharsetIPTC, CharsetPhotoshop,
 CharsetQuickTime, Composite, ExtractEmbedded, FastScan, FixBase, HtmlDump,
 HtmlDumpBase, IgnoreMinorErrors, Lang, LargeFileSupport, MakerNotes,
-ScanForXMP, Struct, TextOut, Unknown and Verbose.
+PNGEarlyXMP, ScanForXMP, Struct, TextOut, Unknown and Verbose.
 
 =item Return Value:
 
@@ -997,7 +998,7 @@ called with a source file name.
 The following ExifTool options are effective in the call to L</WriteInfo>:
 
 ByteOrder, Charset, CharsetEXIF, CharsetIPTC, Compact, Compress, FixBase,
-IgnoreMinorErrors and Verbose.
+IgnoreMinorErrors, PNGEarlyXMP and Verbose.
 
 =head2 GetTagList
 
@@ -1233,9 +1234,9 @@ a description of the structure serialization technique.)
 
 1) [optional] Tag key or tag name, or undef to clear all new values.  The
 tag name may be prefixed by one or more family 0, 1 or 2 group names with
-optional leading family numbers, separated by colons (ie. 'EXIF:Artist',
+optional leading family numbers, separated by colons (eg. 'EXIF:Artist',
 'XMP:Time:*'), which is equivalent to using a Group option argument.  Also,
-a '#' may be appended to the tag name (ie. 'EXIF:Orientation#'), with the
+a '#' may be appended to the tag name (eg. 'EXIF:Orientation#'), with the
 same effect as setting Type to 'ValueConv'.  Wildcards ('*' and '?') may be
 used in the tag name to assign multiple tags simultaneously.  A tag name of
 '*' is special when deleting information, and will delete an entire group
@@ -1249,7 +1250,7 @@ complete list of tag names.
 a scalar, scalar reference, list reference to set a list of values, or hash
 reference for a structure.  Integer values may be specified as a hexadecimal
 string (with a leading '0x'), and simple rational values may be specified in
-fractional form (ie. '4/10').  Structure tags may be specified either as a
+fractional form (eg. '4/10').  Structure tags may be specified either as a
 hash reference or a serialized string (see the last two examples above).
 
 3-N) [optional] SetNewValue option/value pairs (see below).
@@ -1420,21 +1421,21 @@ in a specified file.
 2-N) [optional] List of tag names to set or options hash references.  All
 writable tags are set if none are specified.  The tag names are not case
 sensitive, and may be prefixed by one or more family 0, 1 or 2 group names with
-optional leading family numbers, separated by colons (ie. 'exif:iso').  A
-leading '-' indicates tags to be excluded (ie. '-comment'), or a trailing '#'
+optional leading family numbers, separated by colons (eg. 'exif:iso').  A
+leading '-' indicates tags to be excluded (eg. '-comment'), or a trailing '#'
 causes the ValueConv value to be copied (same as setting the Type option to
 'ValueConv' for this tag only).  Wildcards ('*' and '?') may be used in the tag
 name.  A tag name of '*' is commonly used when a group is specified to copy all
-tags in the group (ie. 'XMP:*').  A special feature allows tag names of the form
+tags in the group (eg. 'XMP:*').  A special feature allows tag names of the form
 'DSTTAGE<lt>SRCTAG' (or 'SRCTAGE<gt>DSTTAG') to be specified to copy information
 to a tag with a different name or a specified group.  Both 'SRCTAG' and 'DSTTAG'
-may contain wildcards and/or be prefixed by a group name (ie.
+may contain wildcards and/or be prefixed by a group name (eg.
 'fileModifyDateE<lt>modifyDate' or 'xmp:*E<lt>*'), and/or suffixed by a '#' to
 disable print conversion.  Copied tags may also be added or deleted from a list
 with arguments of the form 'DSTTAG+E<lt>SRCTAG' or 'DSTTAG-E<lt>SRCTAG'.  Tags
 are evaluated in order, so exclusions apply only to tags included earlier in the
 list.  An extension of this feature allows the tag value to be set from an
-expression containing tag names with leading '$' symbols (ie. 'CommentE<lt>the
+expression containing tag names with leading '$' symbols (eg. 'CommentE<lt>the
 file is $filename').  Braces '{}' may be used around the tag name to separate it
 from subsequent text, and a '$$' is used to to represent a '$' symbol.  The
 behaviour for missing tags in expressions is defined by the L</MissingTagValue>
@@ -1648,7 +1649,9 @@ precedence over any directory specified in FileName.
 
 2) [optional] New file name
 
-3) [optional] 'Link' to create a hard link instead of renaming the file
+3) [optional] 'Link' to create a hard link instead of renaming the file, or
+'Test' to test renaming feature by printing the old and new names instead of
+changing anything.
 
 =item Return Value:
 
@@ -1711,7 +1714,7 @@ Get the ID for the specified tag.  The ID is the IFD tag number in EXIF
 information, the property name in XMP information, or the data offset in a
 binary data block.  For some tags, such as Composite tags where there is no
 ID, an empty string is returned.  In list context, also returns a language
-code for the tag if available and different from the default language (ie.
+code for the tag if available and different from the default language (eg.
 with alternate language entries for XMP "lang-alt" tags).
 
     $id = $exifTool->GetTagID($tag);
@@ -1757,16 +1760,16 @@ A description for the specified tag.
 
 Get group name(s) for a specified tag.
 
-    # return family 0 group name (ie. 'EXIF');
+    # return family 0 group name (eg. 'EXIF');
     $group = $exifTool->GetGroup($tag, 0);
 
-    # return all groups (ie. qw{EXIF IFD0 Author Main})
+    # return all groups (eg. qw{EXIF IFD0 Author Main})
     @groups = $exifTool->GetGroup($tag);
 
-    # return groups as a string (ie. 'Main:IFD0:Author')
+    # return groups as a string (eg. 'Main:IFD0:Author')
     $group = $exifTool->GetGroup($tag, ':3:1:2');
 
-    # return groups as a simplified string (ie. 'IFD0:Author')
+    # return groups as a simplified string (eg. 'IFD0:Author')
     $group = $exifTool->GetGroup($tag, '3:1:2');
 
 =over 4
@@ -1792,11 +1795,11 @@ identical group names unless the family string begins with a colon.
 
 The group family numbers are currently available:
 
-    0) Information Type         (ie. EXIF, XMP, IPTC)
-    1) Specific Location        (ie. IFD0, XMP-dc)
-    2) Category                 (ie. Author, Time)
-    3) Document Number          (ie. Main, Doc1, Doc3-2)
-    4) Instance Number          (ie. Copy1, Copy2, Copy3...)
+    0) Information Type         (eg. EXIF, XMP, IPTC)
+    1) Specific Location        (eg. IFD0, XMP-dc)
+    2) Category                 (eg. Author, Time)
+    3) Document Number          (eg. Main, Doc1, Doc3-2)
+    4) Instance Number          (eg. Copy1, Copy2, Copy3...)
 
 Families 0 and 1 are based on the file structure, and are similar except
 that family 1 is more specific and sub-divides some groups to give more
@@ -1820,7 +1823,7 @@ Family 3 gives the document number for tags extracted from embedded
 documents, or 'Main' for tags from the main document.  (See the
 L</ExtractEmbedded> option for extracting tags from embedded documents.) 
 Nested sub-documents (if they exist) are indicated by numbers separated with
-dashes in the group name, to an arbitrary depth. (ie. 'Doc2-3-1' is the 1st
+dashes in the group name, to an arbitrary depth. (eg. 'Doc2-3-1' is the 1st
 sub-sub-document of the 3rd sub-document of the 2nd embedded document of the
 main file.)
 
@@ -2003,10 +2006,10 @@ APP6, APP8, ASF, CanonVRD, Composite, DICOM, DNG, DV, DjVu, Ducky, EXE,
 EXIF, ExifTool, FLAC, FLIR, File, Flash, FlashPix, Font, FotoStation, GIF,
 GIMP, GeoTiff, H264, HTML, ICC_Profile, ID3, IPTC, ITC, JFIF, JPEG,
 Jpeg2000, LNK, Leaf, M2TS, MIE, MIFF, MNG, MPC, MPEG, MPF, MXF, MakerNotes,
-Matroska, Meta, Ogg, OpenEXR, PDF, PICT, PLIST, PNG, PSP, PanasonicRaw,
-PhotoCD, PhotoMechanic, Photoshop, PostScript, PrintIM, QuickTime, RAF,
-RIFF, RSRC, RTF, Radiance, Rawzor, Real, SVG, SigmaRaw, Stim, Theora,
-Torrent, Vorbis, XML, XMP, ZIP
+Matroska, Meta, Ogg, OpenEXR, PDF, PICT, PLIST, PNG, PSP, Palm,
+PanasonicRaw, PhotoCD, PhotoMechanic, Photoshop, PostScript, PrintIM,
+QuickTime, RAF, RIFF, RSRC, RTF, Radiance, Rawzor, Real, SVG, SigmaRaw,
+Stim, Theora, Torrent, Vorbis, XML, XMP, ZIP
 
 =item Family 1 (Specific Location):
 
@@ -2023,10 +2026,10 @@ KodakBordersIFD, KodakEffectsIFD, KodakIFD, KyoceraRaw, LNK, Leaf,
 LeafSubIFD, Leica, M2TS, MAC, MIE-Audio, MIE-Camera, MIE-Canon, MIE-Doc,
 MIE-Extender, MIE-Flash, MIE-GPS, MIE-Geo, MIE-Image, MIE-Lens, MIE-Main,
 MIE-MakerNotes, MIE-Meta, MIE-Orient, MIE-Preview, MIE-Thumbnail, MIE-UTM,
-MIE-Unknown, MIE-Video, MIFF, MNG, MPC, MPEG, MPF0, MPImage, MXF,
+MIE-Unknown, MIE-Video, MIFF, MNG, MOBI, MPC, MPEG, MPF0, MPImage, MXF,
 MakerNotes, MakerUnknown, Matroska, MediaJukebox, MetaIFD, Microsoft,
 Minolta, MinoltaRaw, NITF, Nikon, NikonCapture, NikonCustom, NikonScan,
-Nintendo, Ocad, Ogg, Olympus, OpenEXR, PDF, PICT, PNG, PSP, Panasonic,
+Nintendo, Ocad, Ogg, Olympus, OpenEXR, PDF, PICT, PNG, PSP, Palm, Panasonic,
 PanasonicRaw, Pentax, PhaseOne, PhotoCD, PhotoMechanic, Photoshop,
 PictureInfo, PostScript, PreviewIFD, PrintIM, ProfileIFD, Qualcomm,
 QuickTime, RAF, RAF2, RIFF, RMETA, RSRC, RTF, Radiance, Rawzor, Real,

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/lib/Image/ExifTool/APP12.pm

@@ -256,7 +256,7 @@ sub ProcessAPP12($$$)
     pos($$dataPt) = 0;
 
     # this regular expression is a bit complex, but basically we are looking for
-    # section headers (ie. "[Camera Info]") and tag/value pairs (ie. "tag=value",
+    # section headers (eg. "[Camera Info]") and tag/value pairs (eg. "tag=value",
     # where "value" may contain white space), separated by spaces or CR/LF.
     # (APP12 uses CR/LF, but Olympus TextualInfo is similar and uses spaces)
     while ($$dataPt =~ /(\[.*?\]|[\w#-]+=[\x20-\x7e]+?(?=\s*([\n\r\0]|[\w#-]+=|\[|$)))/g) {

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/lib/Image/ExifTool/Apple.pm

@@ -28,7 +28,7 @@ $VERSION = '1.01';
     },
     # 0x0004 - int32s: normally 1, but 0 for low-light images
     # 0x0005 - int32s: seen values 147-247, and 100 for blank images
-    # 0x0006 - int32s: seen values 186-241, and 20 for blank images
+    # 0x0006 - int32s: seen values 129-241, and 20 for blank images
     # 0x0007 - int32s: seen 1
     # 0x0009 - int32s: seen 19
     0x000a => {

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.76';
+$VERSION = '2.77';
 @ISA = qw(Exporter);
 
 sub NumbersFirst;
@@ -256,7 +256,7 @@ specification.
 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 (ie. 'Above Sea Level', not '0') unless the print conversion is
+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,
 or by suffixing the tag name with a C<#> character).
 
@@ -303,12 +303,12 @@ 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.
 
 Individual languages for C<lang-alt> tags are accessed by suffixing the tag
-name with a '-', followed by an RFC 3066 language code (ie. "XMP:Title-fr",
+name with a '-', followed by an RFC 3066 language code (eg. "XMP:Title-fr",
 or "Rights-en-US").  (See L<http://www.ietf.org/rfc/rfc3066.txt> for the RFC
 3066 specification.)  A C<lang-alt> tag with no language code accesses the
 "x-default" language, but causes other languages for this tag to be deleted
 when writing.  The "x-default" language code may be specified when writing
-to preserve other existing languages (ie. "XMP-dc:Description-x-default"). 
+to preserve other existing languages (eg. "XMP-dc:Description-x-default"). 
 When reading, "x-default" is not specified.
 
 The XMP tags are organized according to schema B<Namespace> in the following
@@ -317,7 +317,7 @@ been shortened for convenience (since the family 1 group names are derived
 from these by adding a leading "XMP-").  In cases where a tag name exists in
 more than one namespace, less common namespaces are avoided when writing.
 However, any namespace may be written by specifying a family 1 group name
-for the tag, ie) XMP-exif:Contrast or XMP-crs:Contrast.  When deciding on
+for the tag, eg) XMP-exif:Contrast or XMP-crs:Contrast.  When deciding on
 which tags to add to an image, using standard schemas such as
 L<dc|/XMP dc Tags>, L<xmp|/XMP xmp Tags>, L<iptcCore|/XMP iptcCore Tags>
 and L<iptcExt|/XMP iptcExt Tags> is recommended if possible.
@@ -495,7 +495,8 @@ Tags in the family 1 "System" group are referred to as "pseudo" tags because
 they don't represent real metadata in the file.  Instead, this information
 is stored in the directory structure of the filesystem.  The five writable
 "pseudo" tags (FileName, Directory, FileModifyDate, FileCreateDate and
-HardLink) may be written without modifying the file itself.
+HardLink) may be written without modifying the file itself.  The TestName
+tag is used for dry run testing of writes to FileName.
 },
     Composite => q{
 The values of the composite tags are B<Derived From> the values of other
@@ -1344,7 +1345,7 @@ TagID:  foreach $tagID (@keys) {
 #------------------------------------------------------------------------------
 # Rewrite this file to build the lookup tables
 # Inputs: 0) BuildTagLookup object reference
-#         1) output tag lookup module name (ie. 'lib/Image/ExifTool/TagLookup.pm')
+#         1) output tag lookup module name (eg. 'lib/Image/ExifTool/TagLookup.pm')
 # Returns: true on success
 sub WriteTagLookup($$)
 {
@@ -1813,8 +1814,8 @@ sub CloseHtmlFiles($)
 #------------------------------------------------------------------------------
 # Write the TagName HTML and POD documentation
 # Inputs: 0) BuildTagLookup object reference
-#         1) output pod file (ie. 'lib/Image/ExifTool/TagNames.pod')
-#         2) output html directory (ie. 'html')
+#         1) output pod file (eg. 'lib/Image/ExifTool/TagNames.pod')
+#         2) output html directory (eg. 'html')
 # Returns: true on success
 # Notes: My apologies for the patchwork code, but this is only used to generate the docs.
 sub WriteTagNames($$)
@@ -2074,7 +2075,7 @@ sub WriteTagNames($$)
         $line .= sprintf " %-${wGrp}s", 'Group' if $showGrp;
         $line .= ' Writable';
         print PODFILE $line;
-        $line =~ s/^(\s*\w.{6}\w) /$1\t/;   # change space to tab after long ID label (ie. "Sequence")
+        $line =~ s/^(\s*\w.{6}\w) /$1\t/;   # change space to tab after long ID label (eg. "Sequence")
         $line =~ s/\S/-/g;
         $line =~ s/- -/---/g;
         $line =~ tr/\t/ /;                  # change tab back to space

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/lib/Image/ExifTool/Canon.pm

@@ -82,7 +82,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.31';
+$VERSION = '3.33';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -109,7 +109,7 @@ $VERSION = '3.31';
      6.4 => 'Sigma 28-80mm f/3.5-5.6 II Macro', #47
      7 => 'Canon EF 100-300mm f/5.6L', #15
      8 => 'Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens', #32
-     8.1 => 'Sigma 70-300mm f/4-5.6 [APO] DG Macro', #15 (both APO and non-APO, ref http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2947.0.html)
+     8.1 => 'Sigma 70-300mm f/4-5.6 [APO] DG Macro', #15 (both APO and non-APO, ref forum2947)
      8.2 => 'Tokina AT-X 242 AF 24-200mm f/3.5-5.6', #15
      9 => 'Canon EF 70-210mm f/4', #32
      9.1 => 'Sigma 55-200mm f/4-5.6 DC', #34
@@ -168,7 +168,7 @@ $VERSION = '3.31';
     37.1 => 'Tamron 70-200mm f/2.8 Di LD IF Macro', #PH
     37.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20', #38
     37.3 => 'Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]', #34
-    37.4 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2937.0.html
+    37.4 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro', #forum2937
     38 => 'Canon EF 80-200mm f/4.5-5.6', #32
     39 => 'Canon EF 75-300mm f/4-5.6',
     40 => 'Canon EF 28-80mm f/3.5-5.6',
@@ -214,10 +214,10 @@ $VERSION = '3.31';
     137.3 => 'Sigma 18-250mm f/3.5-6.3 DC OS HSM', #PH (also Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM)
     137.4 => 'Sigma 24-70mm f/2.8 IF EX DG HSM', #PH
     137.5 => 'Sigma 18-125mm f/3.8-5.6 DC OS HSM', #PH
-    137.6 => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2819.0.html (Contemporary version has this ID - PH)
+    137.6 => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM', #forum2819 (Contemporary version has this ID - PH)
     137.7 => 'Sigma 17-50mm f/2.8 OS HSM', #47
     137.8 => 'Sigma 18-200mm f/3.5-6.3 II DC OS HSM', #PH
-    137.9 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #(model B008)http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3090.0.html
+    137.9 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #(model B008)forum3090
    '137.10' => 'Sigma 8-16mm f/4.5-5.6 DC HSM', #50-Zwielicht
    '137.11' => 'Tamron SP 17-50mm f/2.8 XR Di II VC', #50 (model B005)
    '137.12' => 'Tamron SP 60mm f/2 Macro Di II', #50 (model G005)
@@ -259,7 +259,7 @@ $VERSION = '3.31';
     160.1 => 'Tamron AF 19-35mm f/3.5-4.5', #44
     160.2 => 'Tokina AT-X 124 AF Pro DX 12-24mm f/4', #49
     160.3 => 'Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye', #PH (http://osdir.com/ml/digikam-devel/2011-04/msg00275.html)
-    160.4 => 'Tokina AT-X 116 AF Pro DX 11-16mm f/2.8', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3967.0.html
+    160.4 => 'Tokina AT-X 116 AF Pro DX 11-16mm f/2.8', #forum3967
     161 => 'Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens',
     161.1 => 'Sigma 24-70mm f/2.8 EX',
     161.2 => 'Sigma 28-70mm f/2.8 EX', #PH (http://www.breezesys.com/forum/showthread.php?t=3718)
@@ -280,7 +280,7 @@ $VERSION = '3.31';
     169.4 => 'Sigma 50mm f/1.4 EX DG HSM', #PH
     169.5 => 'Sigma 85mm f/1.4 EX DG HSM', #Rolando Ruzic
     169.6 => 'Sigma 30mm f/1.4 EX DC HSM', #Rodolfo Borges
-    169.7 => 'Sigma 35mm f/1.4 DG HSM', #PH
+    169.7 => 'Sigma 35mm f/1.4 DG HSM', #PH (also "| A" version, ref forum3833)
     170 => 'Canon EF 200mm f/2.8L II', #9
     171 => 'Canon EF 300mm f/4L', #15
     172 => 'Canon EF 400mm f/5.6L', #32
@@ -289,7 +289,7 @@ $VERSION = '3.31';
     173.2 => 'Sigma APO Macro 150mm f/2.8 EX DG HSM', #14
     174 => 'Canon EF 135mm f/2L or Sigma Lens', #9
     174.1 => 'Sigma 70-200mm f/2.8 EX DG APO OS HSM', #PH (probably version II of this lens)
-    174.2 => 'Sigma 50-500mm f/4.5-6.3 APO DG OS HSM', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4031.0.html
+    174.2 => 'Sigma 50-500mm f/4.5-6.3 APO DG OS HSM', #forum4031
     174.3 => 'Sigma 150-500mm f/5-6.3 APO DG OS HSM', #47
     175 => 'Canon EF 400mm f/2.8L', #32
     176 => 'Canon EF 24-85mm f/3.5-4.5 USM',
@@ -309,7 +309,7 @@ $VERSION = '3.31';
     187 => 'Canon EF 70-200mm f/4L + 1.4x', #26
     188 => 'Canon EF 70-200mm f/4L + 2x', #PH
     189 => 'Canon EF 70-200mm f/4L + 2.8x', #32
-    190 => 'Canon EF 100mm f/2.8 Macro',
+    190 => 'Canon EF 100mm f/2.8 Macro USM', # (+USM ref 42)
     191 => 'Canon EF 400mm f/4 DO IS', #9
     193 => 'Canon EF 35-80mm f/4-5.6 USM', #32
     194 => 'Canon EF 80-200mm f/4.5-5.6 USM', #32
@@ -328,7 +328,8 @@ $VERSION = '3.31';
     211 => 'Canon EF 28-200mm f/3.5-5.6 USM', #15
     212 => 'Canon EF 28-105mm f/4-5.6 USM', #15
     213 => 'Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens',
-    213.1 => 'Tamron SP 150-600mm F/5-6.3 Di VC USD', #topic5565 (Model A011)
+    213.1 => 'Tamron SP 150-600mm f/5-6.3 Di VC USD', #topic5565 (model A011)
+    213.2 => 'Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro', #PH (model B016)
     214 => 'Canon EF-S 18-55mm f/3.5-5.6 USM', #PH/34
     215 => 'Canon EF 55-200mm f/4.5-5.6 II USM',
     217 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #47
@@ -363,6 +364,7 @@ $VERSION = '3.31';
     252 => 'Canon EF 70-200mm f/2.8L IS II USM + 1.4x', #50 (1.4x Mk II)
     253 => 'Canon EF 70-200mm f/2.8L IS II USM + 2x', #PH (NC)
     254 => 'Canon EF 100mm f/2.8L Macro IS USM', #42
+    255 => 'Sigma 24-105mm f/4 DG OS HSM | A', #50
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek
@@ -378,6 +380,7 @@ $VERSION = '3.31';
     503 => 'Canon EF 24mm f/2.8 IS USM', #PH
     504 => 'Canon EF 24-70mm f/4L IS USM', #PH
     505 => 'Canon EF 35mm f/2 IS USM', #PH
+    507 => 'Canon EF 16-35mm f/4L IS USM', #42
     # (STM lenses seem to start with 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',
@@ -386,6 +389,7 @@ $VERSION = '3.31';
     4146 => 'Canon EF-S 18-55mm f/3.5-5.6 IS STM', #PH
     4147 => 'Canon EF-M 11-22mm f/4-5.6 IS STM', #42
     4148 => 'Canon EF-S 55-250mm f/4-5.6 IS STM', #42
+    4150 => 'Canon EF-S 10-18mm f/4.5-5.6 IS STM', #42
 );
 
 # Canon model ID numbers (PH)
@@ -1584,7 +1588,7 @@ my %binaryDataAttrs = (
         Unknown => 1,
     },
     # 0x4009 (BasePictStyleOfPC)
-    0x4010 => { #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2933.0.html
+    0x4010 => { #forum2933
         Name => 'CustomPictureStyleFileName', # (PictStyleCaption)
         Writable => 'string',
     },
@@ -1600,15 +1604,31 @@ my %binaryDataAttrs = (
         },
     },
     # 0x4014 (similar to 0x83?)
-    0x4015 => {
+    0x4015 => [{
         Name => 'VignettingCorr', # (LensPacket)
-        Condition => '$$valPt !~ /^\0\0\0\0/', # (data may be all zeros for 60D)
+        Condition => '$$valPt =~ /^\0/ and $$valPt !~ /^\0\0\0\0/', # (data may be all zeros for 60D)
         SubDirectory => {
             # (the size word is at byte 2 in this structure)
             Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart+2,$size)',
             TagTable => 'Image::ExifTool::Canon::VignettingCorr',
         },
-    },
+    },{
+        Name => 'VignettingCorrUnknown1',
+        Condition => '$$valPt =~ /^[\x01\x02]/ and $$valPt !~ /^\0\0\0\0/',
+        SubDirectory => {
+            # (the size word is at byte 2 in this structure)
+            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart+2,$size)',
+            TagTable => 'Image::ExifTool::Canon::VignettingCorrUnknown',
+        },
+    },{
+        Name => 'VignettingCorrUnknown2',
+        Condition => '$$valPt !~ /^\0\0\0\0/',
+        SubDirectory => {
+            # (the size word is at byte 4 for version 3 of this structure)
+            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart+4,$size)',
+            TagTable => 'Image::ExifTool::Canon::VignettingCorrUnknown',
+        },
+    }],
     0x4016 => {
         Name => 'VignettingCorr2', # (ImageCorrectActual)
         SubDirectory => {
@@ -2255,7 +2275,7 @@ my %binaryDataAttrs = (
     9 => {
         Name => 'SequenceNumber',
         Description => 'Shot Number In Continuous Burst',
-        Notes => 'valid only for some models', #PH (ie. not the 5DmkIII)
+        Notes => 'valid only for some models', #PH (eg. not the 5DmkIII)
     },
     10 => { #PH/17
         Name => 'OpticalZoomCode',
@@ -6128,7 +6148,7 @@ my %ciMaxFocal = (
     # (could use better names for these, or the Crop tags above, or both)
     1 => 'CroppedImageWidth',
     2 => 'CroppedImageHeight',
-    3 => 'CroppedImageLeft', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4138.0.html
+    3 => 'CroppedImageLeft', #forum4138
     4 => 'CroppedImageTop', #ditto
 );
 
@@ -7050,11 +7070,12 @@ my %ciMaxFocal = (
     FORMAT => 'int16s',
     FIRST_ENTRY => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    NOTES => q{
-        This information is found in images from the 1DmkIV, 5DmkII, 7D, 50D, 60D,
-        500D and 550D.
+    NOTES => 'This information is found in images from newer EOS models.',
+    0 => {
+        Name => 'VignettingCorrVersion',
+        Format => 'int8u',
+        Writable => 0,
     },
-    # 0 => 'PeripheralLightingVersion', value = 0x1000
     2 => {
         Name => 'PeripheralLighting',
         PrintConv => { 0 => 'Off', 1 => 'On' },
@@ -7076,6 +7097,19 @@ my %ciMaxFocal = (
     12 => 'OriginalImageHeight',
 );
 
+%Image::ExifTool::Canon::VignettingCorrUnknown = (
+    %binaryDataAttrs,
+    FORMAT => 'int16s',
+    FIRST_ENTRY => 1,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Vignetting correction from PowerShot models.',
+    0 => {
+        Name => 'VignettingCorrVersion',
+        Format => 'int8u',
+        Writable => 0,
+    },
+);
+
 # More Vignetting correction information (MakerNotes tag 0x4016)
 %Image::ExifTool::Canon::VignettingCorr2 = (
     %binaryDataAttrs,
@@ -7116,7 +7150,7 @@ my %ciMaxFocal = (
     %binaryDataAttrs,
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    0 => { # this doesn't seem to be valid for some models (ie. 550D, 7D?, 1DmkIV?)
+    0 => { # this doesn't seem to be valid for some models (eg. 550D, 7D?, 1DmkIV?)
         Name => 'LensSerialNumber',
         Notes => q{
             apparently this is an internal serial number because it doesn't correspond
@@ -7469,7 +7503,7 @@ sub PrintLensID(@)
 {
     my ($printConv, $lensType, $shortFocal, $longFocal, $maxAperture, $lensModel) = @_;
     my $lens;
-    $lens = $$printConv{$lensType} unless $lensType < 0;
+    $lens = $$printConv{$lensType} unless $lensType eq '-1';
     if ($lens) {
         # return this lens unless other lenses have the same LensType
         return LensWithTC($lens, $shortFocal) unless $$printConv{"$lensType.1"};
@@ -7882,7 +7916,7 @@ sub PrintAFPoints1D($)
 #------------------------------------------------------------------------------
 # Convert Canon hex-based EV (modulo 0x20) to real number
 # Inputs: 0) value to convert
-# ie) 0x00 -> 0
+# eg) 0x00 -> 0
 #     0x0c -> 0.33333
 #     0x10 -> 0.5
 #     0x14 -> 0.66666