exiftool_vendored 10.58.0 → 10.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72daef9a11b65e07249202a45cd992a51acb07b6
-  data.tar.gz: 62cdaa5125babfc3efcc8e8813a0392fcc373074
+  metadata.gz: 27a44a58ea12d15a33606f84733a1812f93425ce
+  data.tar.gz: 146f7d7515b8ac7d284a8002cf3fbb2645b7b9e3
 SHA512:
-  metadata.gz: e69f4f592268effb10cd7b4b9ca7c75307806cc3605836861a3ac6bf8d7781707939b64d05b7e11d99521add8ef5c7b9bac02ca24cee205aabfe7f8a3b2cf6a4
-  data.tar.gz: 4d8198e2a6fbd32b0fa85e76bf4261c8984aabb549ceba9c7a2a6ed1af0a38084d6d8fafe96f3afbc73acd48b97b0d94ae20a2b2cc2641e0a1d02513730ef4bc
+  metadata.gz: f642258f4a9d9f62063d0194623763af4e9e2d419420c6bce9bcc3e2df5d101f2ce895537f45c8a9c65ea35fa1d28f0652a0b338832fa1daa715825d351d7193
+  data.tar.gz: d4f6acbbe47771276b279e978dfd6364be06d785e6684a74f5bc25d826f0d037cfbe1a7995c7a87497988a34a62f60441ddcf1b490035b318424e02d7e47a088

data/bin/Changes

@@ -7,13 +7,112 @@ 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.)
 
+Oct. 31, 2017 - Version 10.65
+
+  - Added support for DOSLatinUS (cp437) and DOSLatin1 (cp850) character sets
+  - Added Extra ForceWrite tag for forcing metadata in a file to be rewritten
+  - Added write support for RAF images from some newer FujiFilm models
+  - Added a new SonyModelID, Sony LensType and Olympus LensTypes (thanks LibRaw)
+  - Added a new Pentax LensType
+  - Added a new Nikon LensID
+  - Decode more Sony tags for new models (thanks Jos Roost)
+  - Decode Nikon D850 ShotInfo tags and custom settings (thanks Warren Hatch)
+  - Decode Nikon D850 ColorTemperatureAuto (thanks LibRaw)
+  - Decode Photoshop LayerModifyDates and LayerIDs
+  - Improved decoding of Nikon D5/D500/D810 ShotInfo tags
+  - Allow advanced formatting expressions to return a list reference
+  - Fixed problem in Composite:GPSAltitude when derived from an "undef" altitude
+  - Fixed bug which could result in runtime warning when excluding some tags
+    from being extracted
+
+Oct. 17, 2017 - Version 10.64
+
+  - Added a new Nikon LensID
+  - Added a new SonyModelID
+  - Added a new CanonModelID (thanks LibRaw)
+  - Added some new non-standard CustomRendered values
+  - Decode FrameRate from FLIR SEQ files (thanks Sebastian Hani)
+  - Enhanced shift feature to be able to shift some not-so-simple numerical
+    values (eg. GPSLatitude) with -TAG+=VALUE syntax
+  - Fixed problem with possible malformed UTF-8 when writing IPTC values that
+    require truncation
+  - Fixed incorrect Writable type for XMP-GSpherical:TimeStamp
+  - Fixed incorrect family 2 group name for Nikon HDRInfo tags
+
+Oct. 4, 2017 - Version 10.63
+
+  - Added a number of new Canon LensTypes (thanks Norbert Wasser for some)
+  - Added a new CanonModelID
+  - Added a new Olympus CameraType
+  - Decode MD5Signature in FLAC StreamInfo (thanks Tim Eliseo)
+  - Improved decoding of HEIC/HEIF metadata
+  - Removed useless write support for QuickTime date/time tags in HEIC/HEIF
+    images
+  - Fixed "Incorrect XMP stream length" problem when writing some INDD files
+
+Sept. 28, 2017 - Version 10.62
+
+  - Added preliminary support for HEIC/HEIF images
+  - Added support for Google depthmap metadata (XMP-GDepth)
+  - Added some new Sony/Minolta lenses (thanks LibRaw and Jos Roost)
+  - Added a new CanonModelID (thanks Norbert Wasser)
+  - Added a new Nikon LensID (thanks Michael Tapes)
+  - Decode a new Sony tag (thanks Jos Roost)
+  - Decode some new Nikon tags (thanks Warren Hatch)
+  - Decode maker notes from Leica TL2
+  - Enhanced ID3 -v2 output to show frame flags
+  - Fixed problem decoding Nikon D810 camera tilt angles
+  - Fixed problem where SphericalVideoXML metadata was deleted when writing XMP
+    to a QuickTime-format file containing this information
+
+Aug. 18, 2017 - Version 10.61
+
+  - Added a new Canon LensType (thanks LibRaw)
+  - Added a number of new Sigma, Nikon and Sony lenses (thanks Jos Roost)
+  - Added a new Nikon LensID (thanks Yang You)
+  - Decode a number of new Sony tags (thanks Jos Roost)
+  - Decode Panasonic FocusDistance (thanks David Ellsworth)
+  - Updated to the IPTC video metadata 1.1 specification
+  - Restored the ability to delete JpgFromRaw from RAW images (broken in 10.38)
+  - Fixed problem decoding maker notes from Pentax K-70 AVI videos
+  - Fixed problem conditionally replacing a tag if the value to be deleted was
+    taken from another tag while the new value was assigned directly
+
+July 21, 2017 - Version 10.60
+
+  - Added two new Sony/Minolta LensTypes (thanks Jos Roost)
+  - Added a new Pentax LensType (thanks Dieter Pearcey)
+  - Added new Composite UniquePathPoints tag to photoshop_paths.config
+  - Extract raw-data JFIF/JFXX thumbnails as ThumbnailTIFF
+  - Improved Sony LensSpec conversion
+  - Updated German translations (thanks Herbert Kauer)
+  - Set family 1 group name of JFXX ThumbnailImage to JFXX instead of JFIF
+  - Fixed problem with %C no longer incrementing properly
+
+July 7, 2017 - Version 10.59
+
+  - Added a new Canon LensType (thanks LibRaw)
+  - Added a new Nikon LensID
+  - Added "wrong extension" warning to experimental -validate feature
+  - Decode Pentax maker notes in Q-S1 AVI videos
+  - Updated iptc2exif.args and exif2iptc.args to support new EXIF OffsetTime
+    tags (thanks Herb)
+  - Patched potential problem with "Use of uninitialized value $pos" error when
+    importing malformed JSON data
+  - Patched to avoid runtime warning due to invalid Nikon ShutterCount value
+  - Raise an error if -b is used with the -csv option
+  - Changed PNG exIf chunk name to eXIf
+  - Fixed bug introduced in 10.26 which could cause hang when %C is used in an
+    output file name
+  - Fixed MWG:DateTimeOriginal and MWG:CreateDate to return XMP when EXIF and
+    IPTC don't exist
+
 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

data/bin/MANIFEST

@@ -207,6 +207,8 @@ lib/Image/ExifTool/Charset.pm
 lib/Image/ExifTool/Charset/Arabic.pm
 lib/Image/ExifTool/Charset/Baltic.pm
 lib/Image/ExifTool/Charset/Cyrillic.pm
+lib/Image/ExifTool/Charset/DOSLatin1.pm
+lib/Image/ExifTool/Charset/DOSLatinUS.pm
 lib/Image/ExifTool/Charset/Greek.pm
 lib/Image/ExifTool/Charset/Hebrew.pm
 lib/Image/ExifTool/Charset/JIS.pm

data/bin/META.json

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

data/bin/META.yml

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

data/bin/README

@@ -14,42 +14,43 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DV    r     | JSON  r     | ODT   r     | RIFF  r
-  3G2   r/w   | DVB   r/w   | K25   r     | OFR   r     | RSRC  r
-  3GP   r/w   | DYLIB r     | KDC   r     | OGG   r     | RTF   r
-  A     r     | EIP   r     | KEY   r     | OGV   r     | RW2   r/w
-  AA    r     | EPS   r/w   | LA    r     | OPUS  r     | RWL   r/w
-  AAX   r/w   | EPUB  r     | LFP   r     | ORF   r/w   | RWZ   r
-  ACR   r     | ERF   r/w   | LNK   r     | OTF   r     | RM    r
-  AFM   r     | EXE   r     | M2TS  r     | PAC   r     | SEQ   r
-  AI    r/w   | EXIF  r/w/c | M4A/V r/w   | PAGES r     | SO    r
-  AIFF  r     | EXR   r     | MAX   r     | PBM   r/w   | SR2   r/w
-  APE   r     | EXV   r/w/c | MEF   r/w   | PCD   r     | SRF   r
-  ARW   r/w   | F4A/V r/w   | MIE   r/w/c | PDB   r     | SRW   r/w
-  ASF   r     | FFF   r/w   | MIFF  r     | PDF   r/w   | SVG   r
-  AVI   r     | FLA   r     | MKA   r     | PEF   r/w   | SWF   r
-  AZW   r     | FLAC  r     | MKS   r     | PFA   r     | THM   r/w
-  BMP   r     | FLIF  r/w   | MKV   r     | PFB   r     | TIFF  r/w
-  BPG   r     | FLV   r     | MNG   r/w   | PFM   r     | TORRENT r
-  BTF   r     | FPF   r     | MOBI  r     | PGF   r     | TTC   r
-  CHM   r     | FPX   r     | MODD  r     | PGM   r/w   | TTF   r
-  COS   r     | GIF   r/w   | MOI   r     | PLIST r     | VCF   r
-  CR2   r/w   | GZ    r     | MOS   r/w   | PICT  r     | VRD   r/w/c
-  CRW   r/w   | HDP   r/w   | MOV   r/w   | PMP   r     | VSD   r
-  CS1   r/w   | HDR   r     | MP3   r     | PNG   r/w   | WAV   r
-  DCM   r     | HTML  r     | MP4   r/w   | PPM   r/w   | WDP   r/w
-  DCP   r/w   | ICC   r/w/c | MPC   r     | PPT   r     | WEBP  r
-  DCR   r     | ICS   r     | MPG   r     | PPTX  r     | WEBM  r
-  DFONT r     | IDML  r     | MPO   r/w   | PS    r/w   | WMA   r
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSB   r/w   | WMV   r
-  DJVU  r     | IND   r/w   | MRW   r/w   | PSD   r/w   | WV    r
-  DLL   r     | INX   r     | MXF   r     | PSP   r     | X3F   r/w
-  DNG   r/w   | ISO   r     | NEF   r/w   | QTIF  r/w   | XCF   r
-  DOC   r     | ITC   r     | NRW   r/w   | RA    r     | XLS   r
-  DOCX  r     | J2C   r     | NUMBERS r   | RAF   r/w   | XLSX  r
-  DPX   r     | JNG   r/w   | O     r     | RAM   r     | XMP   r/w/c
-  DR4   r/w/c | JP2   r/w   | ODP   r     | RAR   r     | ZIP   r
-  DSS   r     | JPEG  r/w   | ODS   r     | RAW   r/w   |
+  3FR   r     | DVB   r/w   | JSON  r     | OFR   r     | RTF   r
+  3G2   r/w   | DYLIB r     | K25   r     | OGG   r     | RW2   r/w
+  3GP   r/w   | EIP   r     | KDC   r     | OGV   r     | RWL   r/w
+  A     r     | EPS   r/w   | KEY   r     | OPUS  r     | RWZ   r
+  AA    r     | EPUB  r     | LA    r     | ORF   r/w   | RM    r
+  AAX   r/w   | ERF   r/w   | LFP   r     | OTF   r     | SEQ   r
+  ACR   r     | EXE   r     | LNK   r     | PAC   r     | SO    r
+  AFM   r     | EXIF  r/w/c | M2TS  r     | PAGES r     | SR2   r/w
+  AI    r/w   | EXR   r     | M4A/V r/w   | PBM   r/w   | SRF   r
+  AIFF  r     | EXV   r/w/c | MAX   r     | PCD   r     | SRW   r/w
+  APE   r     | F4A/V r/w   | MEF   r/w   | PDB   r     | SVG   r
+  ARW   r/w   | FFF   r/w   | MIE   r/w/c | PDF   r/w   | SWF   r
+  ASF   r     | FLA   r     | MIFF  r     | PEF   r/w   | THM   r/w
+  AVI   r     | FLAC  r     | MKA   r     | PFA   r     | TIFF  r/w
+  AZW   r     | FLIF  r/w   | MKS   r     | PFB   r     | TORRENT r
+  BMP   r     | FLV   r     | MKV   r     | PFM   r     | TTC   r
+  BPG   r     | FPF   r     | MNG   r/w   | PGF   r     | TTF   r
+  BTF   r     | FPX   r     | MOBI  r     | PGM   r/w   | VCF   r
+  CHM   r     | GIF   r/w   | MODD  r     | PLIST r     | VRD   r/w/c
+  COS   r     | GZ    r     | MOI   r     | PICT  r     | VSD   r
+  CR2   r/w   | HDP   r/w   | MOS   r/w   | PMP   r     | WAV   r
+  CRW   r/w   | HDR   r     | MOV   r/w   | PNG   r/w   | WDP   r/w
+  CS1   r/w   | HEIC  r     | MP3   r     | PPM   r/w   | WEBP  r
+  DCM   r     | HEIF  r     | MP4   r/w   | PPT   r     | WEBM  r
+  DCP   r/w   | HTML  r     | MPC   r     | PPTX  r     | WMA   r
+  DCR   r     | ICC   r/w/c | MPG   r     | PS    r/w   | WMV   r
+  DFONT r     | ICS   r     | MPO   r/w   | PSB   r/w   | WV    r
+  DIVX  r     | IDML  r     | MQV   r/w   | PSD   r/w   | X3F   r/w
+  DJVU  r     | IIQ   r/w   | MRW   r/w   | PSP   r     | XCF   r
+  DLL   r     | IND   r/w   | MXF   r     | QTIF  r/w   | XLS   r
+  DNG   r/w   | INX   r     | NEF   r/w   | RA    r     | XLSX  r
+  DOC   r     | ISO   r     | NRW   r/w   | RAF   r/w   | XMP   r/w/c
+  DOCX  r     | ITC   r     | NUMBERS r   | RAM   r     | ZIP   r
+  DPX   r     | J2C   r     | O     r     | RAR   r     |
+  DR4   r/w/c | JNG   r/w   | ODP   r     | RAW   r/w   |
+  DSS   r     | JP2   r/w   | ODS   r     | RIFF  r     |
+  DV    r     | JPEG  r/w   | ODT   r     | RSRC  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -101,8 +102,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.58.tar.gz | tar -xf -
-  cd Image-ExifTool-10.58
+  gzip -dc Image-ExifTool-10.65.tar.gz | tar -xf -
+  cd Image-ExifTool-10.65
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/arg_files/exif2iptc.args

@@ -8,6 +8,7 @@
 # Requires:     ExifTool version 6.51 or later
 #
 # Revisions:    2011/09/13 - P. Harvey Created
+#               2017/07/06 - PH Set time zone from new EXIF OffsetTime tags
 #
 # Notes:     1) IPTC requires a timezone but EXIF does not support one, so
 #               the local timezone is assumed when writing the IPTC times
@@ -23,6 +24,8 @@
 # appropriate date or time part out of the EXIF date/time value
 -IPTC:DateCreated < EXIF:DateTimeOriginal
 -IPTC:TimeCreated < EXIF:DateTimeOriginal
+-IPTC:TimeCreated < Composite:SubSecDateTimeOriginal
 -IPTC:DigitalCreationDate < EXIF:CreateDate
 -IPTC:DigitalCreationTime < EXIF:CreateDate
+-IPTC:DigitalCreationTime < Composite:SubSecCreateDate
 # end

data/bin/arg_files/iptc2exif.args

@@ -8,6 +8,7 @@
 # Requires:     ExifTool version 7.98 or later
 #
 # Revisions:    2011/09/13 - P. Harvey Created
+#               2017/07/06 - PH Set new EXIF OffsetTime tags
 #
 # Notes:        These arguments will not delete existing EXIF tags which are
 #               missing from the IPTC.  The EXIF tags should be deleted
@@ -18,4 +19,6 @@
 -EXIF:ImageDescription < IPTC:Caption-Abstract
 -EXIF:DateTimeOriginal < Composite:DateTimeCreated
 -EXIF:CreateDate < Composite:DigitalCreationDateTime
+-EXIF:OffsetTimeOriginal < IPTC:TimeCreated
+-EXIF:OffsetTimeDigitized < IPTC:DigitalCreationTime
 # end

data/bin/config_files/example.config

@@ -155,13 +155,15 @@
     },
     # Composite tags are added to the Composite table:
     'Image::ExifTool::Composite' => {
-        # Composite tags are unique:  The Require/Desire elements specify
+        # Composite tags have values that are derived from the values of
+        # other tags.  The Require/Desire elements below specify constituent
         # tags that must/may exist, and the keys of these hashes are used as
-        # indices in the @val array of the ValueConv expression to access
-        # the numerical (-n) values of these tags.  All Require'd tags must
-        # exist for the Composite tag to be evaluated.  If no Require'd tags
-        # are specified, then at least one of the Desire'd tags must exist.
-        # See the Composite table in Image::ExifTool::Exif for more examples,
+        # indices in the @val array of the ValueConv expression to access the
+        # numerical (-n) values of these tags.  Print-converted values are
+        # accessed via the @prt array.  All Require'd tags must exist for
+        # the Composite tag to be evaluated.  If no Require'd tags are
+        # specified, then at least one of the Desire'd tags must exist.  See
+        # the Composite table in Image::ExifTool::Exif for more examples,
         # and lib/Image/ExifTool/README for all of the details.
         BaseName => {
             Require => {
@@ -279,14 +281,14 @@
         },
         List => 'Seq', # structures may also be elements of a list
     },
-    # Each field in the structure has an automatically-generated
-    # corresponding flattened tag with an ID that is the concatenation
-    # of the original structure tag ID and the field name (after
-    # capitalizing the first letter of the field name if necessary).
-    # The Name and/or Description of these flattened tags may be changed
-    # if desired, but all other tag properties are taken from the
-    # structure field definition.  The "Flat" flag must be used when
-    # setting the Name or Description of a flattened tag.  For example:
+    # Each field in the structure has a corresponding flattened tag that is
+    # generated automatically with an ID made from a concatenation of the
+    # original structure tag ID and the field name (after capitalizing the
+    # first letter of the field name if necessary).  The Name and/or
+    # Description of these flattened tags may be changed if desired, but all
+    # other tag properties are taken from the structure field definition.
+    # The "Flat" flag must be used when setting the Name or Description of a
+    # flattened tag.  For example:
     NewXMPxxxStructX => { Name => 'SomeOtherName', Flat => 1 },
 );
 

data/bin/config_files/photoshop_paths.config

@@ -67,6 +67,7 @@
 #               2017/03/19 - PH Added "-" or "+" at the start of closed or open
 #                               subpath respectively
 #               2017/06/03 - PH Added TotalPathPoints
+#               2017/07/17 - PH Added UniquePathPoints
 #
 # References:   http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,1621.0.html
 #               http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3910.0.html
@@ -149,6 +150,8 @@ sub PrintPath($$;$$)
                 my ($val, $self) = @_;
                 my $count = 0;
                 my $pts = 0;
+                my $uniq = 0;
+                my %uniq;
                 foreach (@$val) {
                     next unless defined $_;
                     ++$count;
@@ -159,13 +162,20 @@ sub PrintPath($$;$$)
                         my $type = Get16u($_, $pos);
                         last if $type == 0x2f23; # (start of path name added by ExifTool)
                         next unless {1=>1,2=>1,4=>1,5=>1}->{$type};
+                        my $pt = substr($$_, $pos+10, 8);
+                        $uniq{$pt} or ++$uniq, $uniq{$pt} = 1;
                         ++$pts;
                     }
                 }
                 $$self{TotalPathPoints} = $pts;
+                $$self{UniquePathPoints} = $uniq;
                 return $count;
             },
         },
+        UniquePathPoints => {
+            Require => 'PathCount',
+            ValueConv => '$$self{UniquePathPoints}',
+        },
         TotalPathPoints => {
             Require => 'PathCount',
             ValueConv => '$$self{TotalPathPoints}',

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '10.58';
+my $version = '10.65';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -1314,8 +1314,8 @@ if ($tagOut and ($csv or %printFmt or $tabFormat or $xml or ($verbose and $html)
     next;
 }
 
-if ($textOut and $csv and $csv eq 'CSV' and not $isWriting) {
-    Warn "Sorry, -w may not be combined with -csv\n";
+if ($csv and $csv eq 'CSV' and not $isWriting and ($textOut or $binaryOutput)) {
+    Warn 'Sorry, ' . ($textOut ? '-w' : '-b') . " may not be combined with -csv\n";
     $rtnVal = 1;
     next;
 }
@@ -3171,7 +3171,7 @@ sub ConvertBinary($)
             }
         } else {
             # (-b is not valid for HTML output)
-            my $bOpt = $html ? '' : ', use -b option to extract';
+            my $bOpt = ($html or ($csv and $csv eq 'CSV')) ? '' : ', use -b option to extract';
             if ($$obj =~ /^Binary data \d+ bytes$/) {
                 $obj = "($$obj$bOpt)";
             } else {
@@ -3724,15 +3724,16 @@ sub NextUnusedFilename($;$$)
     return $fmt unless $fmt =~ /%[-+]?\d*\.?\d*[lun]?[cC]/;
     my %sep = ( '-' => '-', '+' => '_' );
     my ($copy, $alpha) = (0, 'a');
+    my $seq = $seqFileNum - 1;
     for (;;) {
         my ($filename, $pos) = ('', 0);
         while ($fmt =~ /(%([-+]?)(\d*)(\.?)(\d*)([lun]?)([cC]))/g) {
             $filename .= substr($fmt, $pos, pos($fmt) - $pos - length($1));
             $pos = pos($fmt);
             my ($sign, $wid, $dec, $wid2, $mod, $tok) = ($2, $3 || 0, $4, $5 || 0, $6, $7);
-            my $seq = $seqFileNum - 1;
+            my $diff = 0;
             if ($tok eq 'C') {
-                $seq += $wid if $wid;
+                $diff = $wid;
                 $wid = $wid2;
             } else {
                 next unless $dec or $copy;
@@ -3741,13 +3742,13 @@ sub NextUnusedFilename($;$$)
             # add dash or underline separator if '-' or '+' specified
             $filename .= $sep{$sign} if $sign;
             if ($mod and $mod ne 'n') {
-                my $a = $tok eq 'C' ? Num2Alpha($seq) : $alpha;
+                my $a = $tok eq 'C' ? Num2Alpha($diff + $seq++) : $alpha;
                 my $str = ($wid and $wid > length $a) ? 'a' x ($wid - length($a)) : '';
                 $str .= $a;
                 $str = uc $str if $mod eq 'u';
                 $filename .= $str;
             } else {
-                my $c = $tok eq 'C' ? $seq : $copy;
+                my $c = $tok eq 'C' ? ($diff + $seq++) : $copy;
                 my $num = $c + ($mod ? 1 : 0);
                 $filename .= $wid ? sprintf("%.${wid}d",$num) : $num;
             }
@@ -4074,42 +4075,43 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DV    r     | JSON  r     | ODT   r     | RIFF  r
-  3G2   r/w   | DVB   r/w   | K25   r     | OFR   r     | RSRC  r
-  3GP   r/w   | DYLIB r     | KDC   r     | OGG   r     | RTF   r
-  A     r     | EIP   r     | KEY   r     | OGV   r     | RW2   r/w
-  AA    r     | EPS   r/w   | LA    r     | OPUS  r     | RWL   r/w
-  AAX   r/w   | EPUB  r     | LFP   r     | ORF   r/w   | RWZ   r
-  ACR   r     | ERF   r/w   | LNK   r     | OTF   r     | RM    r
-  AFM   r     | EXE   r     | M2TS  r     | PAC   r     | SEQ   r
-  AI    r/w   | EXIF  r/w/c | M4A/V r/w   | PAGES r     | SO    r
-  AIFF  r     | EXR   r     | MAX   r     | PBM   r/w   | SR2   r/w
-  APE   r     | EXV   r/w/c | MEF   r/w   | PCD   r     | SRF   r
-  ARW   r/w   | F4A/V r/w   | MIE   r/w/c | PDB   r     | SRW   r/w
-  ASF   r     | FFF   r/w   | MIFF  r     | PDF   r/w   | SVG   r
-  AVI   r     | FLA   r     | MKA   r     | PEF   r/w   | SWF   r
-  AZW   r     | FLAC  r     | MKS   r     | PFA   r     | THM   r/w
-  BMP   r     | FLIF  r/w   | MKV   r     | PFB   r     | TIFF  r/w
-  BPG   r     | FLV   r     | MNG   r/w   | PFM   r     | TORRENT r
-  BTF   r     | FPF   r     | MOBI  r     | PGF   r     | TTC   r
-  CHM   r     | FPX   r     | MODD  r     | PGM   r/w   | TTF   r
-  COS   r     | GIF   r/w   | MOI   r     | PLIST r     | VCF   r
-  CR2   r/w   | GZ    r     | MOS   r/w   | PICT  r     | VRD   r/w/c
-  CRW   r/w   | HDP   r/w   | MOV   r/w   | PMP   r     | VSD   r
-  CS1   r/w   | HDR   r     | MP3   r     | PNG   r/w   | WAV   r
-  DCM   r     | HTML  r     | MP4   r/w   | PPM   r/w   | WDP   r/w
-  DCP   r/w   | ICC   r/w/c | MPC   r     | PPT   r     | WEBP  r
-  DCR   r     | ICS   r     | MPG   r     | PPTX  r     | WEBM  r
-  DFONT r     | IDML  r     | MPO   r/w   | PS    r/w   | WMA   r
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSB   r/w   | WMV   r
-  DJVU  r     | IND   r/w   | MRW   r/w   | PSD   r/w   | WV    r
-  DLL   r     | INX   r     | MXF   r     | PSP   r     | X3F   r/w
-  DNG   r/w   | ISO   r     | NEF   r/w   | QTIF  r/w   | XCF   r
-  DOC   r     | ITC   r     | NRW   r/w   | RA    r     | XLS   r
-  DOCX  r     | J2C   r     | NUMBERS r   | RAF   r/w   | XLSX  r
-  DPX   r     | JNG   r/w   | O     r     | RAM   r     | XMP   r/w/c
-  DR4   r/w/c | JP2   r/w   | ODP   r     | RAR   r     | ZIP   r
-  DSS   r     | JPEG  r/w   | ODS   r     | RAW   r/w   |
+  3FR   r     | DVB   r/w   | JSON  r     | OFR   r     | RTF   r
+  3G2   r/w   | DYLIB r     | K25   r     | OGG   r     | RW2   r/w
+  3GP   r/w   | EIP   r     | KDC   r     | OGV   r     | RWL   r/w
+  A     r     | EPS   r/w   | KEY   r     | OPUS  r     | RWZ   r
+  AA    r     | EPUB  r     | LA    r     | ORF   r/w   | RM    r
+  AAX   r/w   | ERF   r/w   | LFP   r     | OTF   r     | SEQ   r
+  ACR   r     | EXE   r     | LNK   r     | PAC   r     | SO    r
+  AFM   r     | EXIF  r/w/c | M2TS  r     | PAGES r     | SR2   r/w
+  AI    r/w   | EXR   r     | M4A/V r/w   | PBM   r/w   | SRF   r
+  AIFF  r     | EXV   r/w/c | MAX   r     | PCD   r     | SRW   r/w
+  APE   r     | F4A/V r/w   | MEF   r/w   | PDB   r     | SVG   r
+  ARW   r/w   | FFF   r/w   | MIE   r/w/c | PDF   r/w   | SWF   r
+  ASF   r     | FLA   r     | MIFF  r     | PEF   r/w   | THM   r/w
+  AVI   r     | FLAC  r     | MKA   r     | PFA   r     | TIFF  r/w
+  AZW   r     | FLIF  r/w   | MKS   r     | PFB   r     | TORRENT r
+  BMP   r     | FLV   r     | MKV   r     | PFM   r     | TTC   r
+  BPG   r     | FPF   r     | MNG   r/w   | PGF   r     | TTF   r
+  BTF   r     | FPX   r     | MOBI  r     | PGM   r/w   | VCF   r
+  CHM   r     | GIF   r/w   | MODD  r     | PLIST r     | VRD   r/w/c
+  COS   r     | GZ    r     | MOI   r     | PICT  r     | VSD   r
+  CR2   r/w   | HDP   r/w   | MOS   r/w   | PMP   r     | WAV   r
+  CRW   r/w   | HDR   r     | MOV   r/w   | PNG   r/w   | WDP   r/w
+  CS1   r/w   | HEIC  r     | MP3   r     | PPM   r/w   | WEBP  r
+  DCM   r     | HEIF  r     | MP4   r/w   | PPT   r     | WEBM  r
+  DCP   r/w   | HTML  r     | MPC   r     | PPTX  r     | WMA   r
+  DCR   r     | ICC   r/w/c | MPG   r     | PS    r/w   | WMV   r
+  DFONT r     | ICS   r     | MPO   r/w   | PSB   r/w   | WV    r
+  DIVX  r     | IDML  r     | MQV   r/w   | PSD   r/w   | X3F   r/w
+  DJVU  r     | IIQ   r/w   | MRW   r/w   | PSP   r     | XCF   r
+  DLL   r     | IND   r/w   | MXF   r     | QTIF  r/w   | XLS   r
+  DNG   r/w   | INX   r     | NEF   r/w   | RA    r     | XLSX  r
+  DOC   r     | ISO   r     | NRW   r/w   | RAF   r/w   | XMP   r/w/c
+  DOCX  r     | ITC   r     | NUMBERS r   | RAM   r     | ZIP   r
+  DPX   r     | J2C   r     | O     r     | RAR   r     |
+  DR4   r/w/c | JNG   r/w   | ODP   r     | RAW   r/w   |
+  DSS   r     | JP2   r/w   | ODS   r     | RIFF  r     |
+  DV    r     | JPEG  r/w   | ODT   r     | RSRC  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4419,8 +4421,9 @@ single file.  In this case, C<@> may be used to represent the source file
 processing multiple files.  Specified tags are then copied from each file in
 turn as it is rewritten.  For advanced batch use, the source file name may
 also be specified using a I<FMT> string in which %d, %f and %e represent the
-directory, file name and extension of I<FILE>. See B<-w> option for I<FMT>
-string examples.
+directory, file name and extension of I<FILE>.  (eg. the current I<FILE>
+would be represented by C<%d%f.%e>, with the same effect as C<@>).  See the
+B<-w> option for I<FMT> string examples.
 
 A powerful redirection feature allows a destination tag to be specified for
 each copied tag.  With this feature, information may be written to a tag
@@ -4486,13 +4489,13 @@ this command:
 This is significant in the case where an overlap exists between the copied
 and assigned tags because later operations may override earlier ones.
 
-5) The normal behaviour of copied tags differs subtly from that of assigned
-tags for list-type tags.  When copying to a list, each copied tag overrides
-any previous operations on the list.  While this avoids duplicate list items
-when copying groups of tags from a file containing redundant information, it
-also prevents values of different tags from being copied into the same list
-when this is the intent.  So a B<-addTagsFromFile> option is provided which
-allows copying of multiple tags into the same list.  eg)
+5) The normal behaviour of copied tags differs from that of assigned tags
+for list-type tags and conditional replacements because each copy operation
+on a tag overrides any previous operations.  While this avoids duplicate
+list items when copying groups of tags from a file containing redundant
+information, it also prevents values of different tags from being copied
+into the same list when this is the intent.  So a B<-addTagsFromFile> option
+is provided which allows copying of multiple tags into the same list.  eg)
 
     exiftool -addtagsfromfile @ '-subject<make' '-subject<model' ...
 
@@ -4613,6 +4616,8 @@ values are:
     Baltic      cp1257           Windows Baltic
     Vietnam     cp1258           Windows Vietnamese
     Thai        cp874            Windows Thai
+    DOSLatinUS  cp437            DOS Latin US
+    DOSLatin1   cp850            DOS Latin1
     MacRoman    cp10000, Roman   Macintosh Roman
     MacLatin2   cp10029          Macintosh Latin2 (Central Europe)
     MacCyrillic cp10007          Macintosh Cyrillic
@@ -4852,8 +4857,8 @@ variable-width character set.
 For list-type tags, this causes only the item with the specified index to be
 extracted.  I<INDEX> is 0 for the first item in the list.  Negative indices
 may also be used to reference items from the end of the list.  Has no effect
-on single-valued tags.  Also applies to tag values when copying, and in
-B<-if> conditions.
+on single-valued tags.  Also applies to tag values when copying from a tag,
+and in B<-if> conditions.
 
 =item B<-n> (B<--printConv>)
 
@@ -4909,7 +4914,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 10.58 --
+    -- Generated by ExifTool 10.65 --
     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
@@ -5040,12 +5045,13 @@ include the leading '.'.  For example:
     -w dir2/%d%f.txt  # write to "dir2", keeping dir structure
     -w a%c.txt        # write to "a.txt" or "a1.txt" or "a2.txt"...
 
-Existing files will not be overwritten unless an exclamation point is added
-to the option name (ie. B<-w!> or B<-textOut!>), or a plus sign to append to
-the existing file (ie. B<-w+> or B<-textOut+>).  Both may be used (ie.
-B<-w+!> or B<-textOut+!>) to overwrite output files that didn't exist before
-the command was run, and append the output from multiple source files.  For
-example, to write one output file for all source files in each directory:
+Existing files will not be changed unless an exclamation point is added to
+the option name (ie. B<-w!> or B<-textOut!>) to overwrite the file, or a
+plus sign (ie. B<-w+> or B<-textOut+>) to append to the existing file.  Both
+may be used (ie. B<-w+!> or B<-textOut+!>) to overwrite output files that
+didn't exist before the command was run, and append the output from multiple
+source files.  For example, to write one output file for all source files in
+each directory:
 
     exiftool -filename -createdate -T -w+! %d/out.txt -r DIR
 
@@ -5245,9 +5251,9 @@ especially for PDF files with many embedded images.
 Process only files with (B<-ext>) or without (B<--ext>) a specified
 extension.  There may be multiple B<-ext> and B<--ext> options.  A plus sign
 may be added (ie. B<-ext+>) to add the specified extension to the normally
-processed files.  EXT may begin with a leading '.', and case is not
-significant.  C<"*"> may be used to process files with any extension (or
-none at all), as in the last three examples:
+processed files.  EXT may begin with a leading '.', which is ignored.  Case
+is not significant.  C<"*"> may be used to process files with any extension
+(or none at all), as in the last three examples:
 
     exiftool -ext JPG DIR             # process only JPG files
     exiftool --ext cr2 --ext dng DIR  # supported files but CR2/DNG

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

@@ -32,6 +32,11 @@ $VERSION = '1.05';
     Title   => { },
     Track   => { },
     Year    => { },
+    DURATION => {
+        Name => 'Duration',
+        ValueConv => '$val += 4294967296 if $val < 0 and $val >= -2147483648; $val * 1e-7',
+        PrintConv => 'ConvertDuration($val)',
+    },
     'Tool Version' => { Name => 'ToolVersion' },
     'Tool Name'    => { Name => 'ToolName' },
 );