exiftool_vendored 11.86.0 → 11.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8b2a35941a1be46ec6f6ec706a1f786697c565b
-  data.tar.gz: 610e367b1525b9f47bdd8081cbb74e78b5202c15
+  metadata.gz: 16ac19b072446e8aa339ead73fcf30667099de1e
+  data.tar.gz: b0af8e8ed6c32171b6a9cd49e33b1053fd1e6c20
 SHA512:
-  metadata.gz: 412cc259f036526b23e5c6de1e9f960420c726fb52bcb230e310aea4d3cdcaa5d515ba4b5defc0dec28bc9eec52a031aacadf6de29b487b8d68b7c2aae5b97cd
-  data.tar.gz: 3a3d6888e8e2eb99bcc744a50f29dbe4fd210fe2127af4201a07a6452306ae20f962bea8584afc84ee585db127f1a53c20635f5338446af07019f1cca49d42e4
+  metadata.gz: 2f000720df7aede27a5e7d5c0b217711277d942ef3ba9888843f25116ceec81d508fa05dcfc959f4be82b646eafde499decef831ab5b269aca28d85ebda89f99
+  data.tar.gz: 032e0cc3dcf21e0acbdf44829008781976beb2477c96fc1730b4ee912423d7d166e8aae6e861d74ca3d16864a1622107aa8061bd7adb4809a72c2ae3aa20c0ab

data/bin/Changes

@@ -7,12 +7,34 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.85. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Feb. 20, 2020 - Version 11.88
+
+  - Added write support for new Google depth-map XMP tags
+  - Added config_files/depthmap.config to the distribution
+  - Added minor error when attempting to write FFF images due to incompatibility
+    with Hasselblad Phocus software
+  - Patched to avoid "Invalid iloc offset size" error when writing some
+    QuickTime-based files
+  - Fixed incorrect ColumnCount for CSV files
+  - Fixed various spelling errors (thanks Jens Schleusener)
+  - Fixed bug writing QuickTime:Rotation in HEIC files
+
+Feb. 13, 2020 - Version 11.87
+
+  - Added read support for CSV files
+  - Added "--" option to indicate the end of options
+  - Added ability to read/write/copy/delete the JPEG trailer as a block
+  - Added new Olympus CameraType and LensType values (thanks LibRaw)
+  - Decode a few more FujiFilm tags
+  - Enhanced -fast option (API FastScan) to bypass PNG CRC validation when
+    writing
+
 Feb. 4, 2020 - Version 11.86
 
   - Added support for DNG version 1.5
   - Added config_files/acdsee.config to the full distribution (thanks StarGeek)
   - Added a new Sony LensType (thanks Jos Roost and LibRaw)
-  - Decode two more bits in Nikon LensType (thanks LibRaw)
+  - Decode two more bits from Nikon LensType (thanks LibRaw)
   - Decode QuickTime MovieFragmentSequence
   - Patched HEIC writer to add missing iref box if necessary
   - Fixed typo in a Canon LensType value
@@ -463,7 +485,7 @@ May 31, 2019 - Version 11.46 - "CR3 update"
   - Added ability to write CanonVRD tags in CR3 images
   - Decode a couple more tags from Canon CR3 images
   - Enhanced Validate option to check for duplicate QuickTime atoms
-  - Relaxed contraints when writing IPTC date tags to allow use of separators
+  - Relaxed constraints when writing IPTC date tags to allow use of separators
     other than a colon
   - Fixed CR3 writing to update CTBO table with any changed offsets or sizes
     (although this table doesn't seem to be used by any RAW viewer, it may be
@@ -1531,7 +1553,7 @@ Apr. 10, 2017 - Version 10.49
   - Decode a new Panasonic tag
   - Fixed problem decoding Sony VariableLowPassFilter values (thanks Jos Roost)
   - Fixed problem setting XMP:About when creating new XMP in a file
-  - Fixed an incorect Pentax DriveMode value (thanks Andras Salamon)
+  - Fixed an incorrect Pentax DriveMode value (thanks Andras Salamon)
   - API Changes
       - Allow access to the advanced formatting expression via a new ExifTool
         "FMT_EXPR" member variable
@@ -2050,7 +2072,7 @@ Jan. 4, 2016 - Version 10.09
 
   - Added ability to extract OS X system metadata ("MDItem" tags)
   - Added a value conversion for GoogleTrackDuration
-  - Enchanced the -i option to allow full path names to be specified
+  - Enhanced the -i option to allow full path names to be specified
   - Fixed a potential runtime error when writing corrupted JPEG images
   - API Changes:
       - Added MDItemTags option
@@ -3369,7 +3391,7 @@ Jan. 18, 2013 - Version 9.14
   - Decode new Canon 6D CustomFunctions
   - Improved calculation of ScaleFactor35efl for Canon cameras
   - Changed priority of PDF Info tags so tags from most recent Info dictionary
-    take precedence (to partially accomodate the questionable Acrobat Pro
+    take precedence (to partially accommodate the questionable Acrobat Pro
     incremental update technique)
   - Changed some verbose warnings when attempting to write "unsafe" tags
   - Changed behaviour so that "unsafe" tags are not copied for any tag specified
@@ -3715,7 +3737,7 @@ Apr. 3, 2012 - Version 8.86
   - Decode some new CanonVRD DLO tags
   - Changed decoding of CanonVRD VRDVersion tag
   - Changed formatting of a Pentax LensType for consistency with other lenses
-  - Patched decoding of Reconyx:DateTimeOriginal to accomodate values written
+  - Patched decoding of Reconyx:DateTimeOriginal to accommodate values written
     with an incorrect byte order by some models
 
 Mar. 25, 2012 - Version 8.85 (production release)
@@ -4283,7 +4305,7 @@ Jan. 29, 2011 - Version 8.47
 
 Jan. 22, 2011 - Version 8.46
 
-  - Simpified definition of user-defined XMP structures: flattened tags are now
+  - Simplified definition of user-defined XMP structures: flattened tags are now
     automatically generated, and UserDefined::xmpStruct is no longer needed (but
     backward compatibility is maintained with the old-style definitions)
   - Added ability to handle multi-dimensional arrays in structured output
@@ -5306,7 +5328,7 @@ June 7, 2009 - Version 7.77
   - Decode large preview in APP2 of images from newer Samsung models
   - Extract FujiFilm PreviewImage from improperly written FPXR segment
   - Improved decoding of Nikon WB levels for some models
-  - Reduced memory useage when writing DNG and some other RAW image files
+  - Reduced memory usage when writing DNG and some other RAW image files
   - Changed format of Canon D30 SerialNumber to remove the hyphen and add
     leading 0's if less than 9 characters (now same format as printed on camera)
   - Changed writing of GPSTimeStamp and GPSDateStamp to adjust date/time to UTC
@@ -5969,7 +5991,7 @@ May 28, 2008 - Version 7.29
   - Renamed Pentax ModelRevision tag to ProductionCode and improved print
     conversion to indicate if camera has been serviced
   - Added check to prevent EXIF tags from being written to JPEG images if they
-    would obviously exceed the maximimum JPEG segment size limit
+    would obviously exceed the maximum JPEG segment size limit
   - Relaxed error checks when writing JPEG images to allow MakerNotes to be
     rebuilt if the MakerNote IFD is not contained within the MakerNotes data
   - Fixed decoding of Pentax ExternalFlashGuideNumber when AF360 is used with
@@ -7103,7 +7125,7 @@ Sept. 21, 2006 - Version 6.42 (production release)
 Sept. 18, 2006 - Version 6.41
 
   - Fixed calculation of Canon ISO in some images and renamed ShotISO to BaseISO
-  - Minor improvment to order of operations when deleting multiple groups and
+  - Minor improvement to order of operations when deleting multiple groups and
     adding back information in batch mode
 
 Sept. 14, 2006 - Version 6.40
@@ -7228,7 +7250,7 @@ June 19, 2006 - Version 6.25
   - Added read/write support for WDP (Windows Media Photo) images
   - Improved algorithm to recognize maker notes offsets which need fixing
   - Properly handle maker notes which have value offsets relative to the
-    individial IFD entries (Kyocera, Rollei and some Konica and Toshiba models)
+    individual IFD entries (Kyocera, Rollei and some Konica and Toshiba models)
   - Decode a couple of new Sigma lens values in Canon LensType
   - Decreased block size for buffered files to improve performance over slow
     pipes
@@ -7486,7 +7508,7 @@ Feb. 1, 2006 - Version 5.99
   - Added Canon maker note footer when rewriting Canon maker notes
   - Attempt to fix problem where ScaleFactor35efl was calculated incorrectly for
     some Canon images
-  - Reduce memory useage and speed up writing of large TIFF images
+  - Reduce memory usage and speed up writing of large TIFF images
   - Fixed problem with binary data offsets in verbose dump
   - Fixed problem writing Comment if 'File' group specified
   - Fixed bug which could cause formatting error in htmlDump output
@@ -7712,7 +7734,7 @@ Oct. 24, 2005 - Version 5.71
 
 Oct. 23, 2005 - Version 5.70
 
-  - Significant internal changes to improve speed and reduce memory useage
+  - Significant internal changes to improve speed and reduce memory usage
   - Fixed a bug introduced in version 5.63 which caused incorrect XMP GPS
     coordinates to be returned
   - Changed handling of Kodak date records
@@ -7766,7 +7788,7 @@ Oct. 7, 2005 - Version 5.65
   - Decode a few more Photoshop tags
   - Issue an error if there is extra data after the normal end of file when
     rewriting TIFF images (avoids possible data loss if attempting to write an
-    unsuported RAW image with a TIFF-like data structure)
+    unsupported RAW image with a TIFF-like data structure)
   - Added ability to replace existing tags with user defined tags
   - Denote minor errors/warnings by adding '[minor]' to the message (these are
     the errors which can be ignored with the -m option)
@@ -8473,7 +8495,7 @@ Jan. 28, 2005 - Version 4.42
     specific IPTC tag values with 'TAG-=VALUE'
   - Made EXIF SceneType writable
   - Renamed Nikon ISOUsed tag to ISO
-  - Added documention of Canon RAW (CRW) file format
+  - Added documentation of Canon RAW (CRW) file format
 
 Jan. 27, 2005 - Version 4.41
 
@@ -8956,7 +8978,7 @@ Mar. 26, 2004 - Version 3.27
 
   - Optimized a few routines to speed things up a bit
   - API Changes:
-      - Changed GetDescription() documention to indicate it is called with an
+      - Changed GetDescription() documentation to indicate it is called with an
         ExifTool object (this is still optional, but will be mandatory with the
         next version)
 

data/bin/MANIFEST

@@ -19,6 +19,7 @@ config_files/acdsee.config
 config_files/age.config
 config_files/bibble.config
 config_files/convert_regions.config
+config_files/depthmap.config
 config_files/example.config
 config_files/fotoware.config
 config_files/gps2utm.config
@@ -793,6 +794,7 @@ t/Text_3.out
 t/Text_4.out
 t/Text_5.out
 t/Text_6.out
+t/Text_7.out
 t/Torrent.t
 t/Torrent_2.out
 t/Unknown.t
@@ -1057,6 +1059,7 @@ t/images/Sigma.x3f
 t/images/SigmaDP2.x3f
 t/images/Sony.jpg
 t/images/Sony.pmp
+t/images/Text.csv
 t/images/Text1.txt
 t/images/Text2.txt
 t/images/Text3.txt

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.86",
+   "version" : "11.88",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

data/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '11.86'
+version: '11.88'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -14,34 +14,35 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DSS   r     | J2C   r     | ODS   r     | RSRC  r
-  3G2   r/w   | DV    r     | JNG   r/w   | ODT   r     | RTF   r
-  3GP   r/w   | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
-  A     r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
-  AA    r     | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
-  AAE   r     | EIP   r     | K25   r     | OPUS  r     | RM    r
-  AAX   r/w   | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
-  ACR   r     | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
-  AFM   r     | ERF   r/w   | LA    r     | PAC   r     | SO    r
-  AI    r/w   | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
-  AIFF  r     | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
-  APE   r     | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
-  ASF   r     | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
-  AVI   r     | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
-  AVIF  r/w   | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
-  AZW   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
-  BMP   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
-  BPG   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
-  BTF   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
-  CHM   r     | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
-  COS   r     | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
-  CR2   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
-  CR3   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
-  CRW   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
+  3FR   r     | DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r
+  3G2   r/w   | DSS   r     | J2C   r     | ODS   r     | RSRC  r
+  3GP   r/w   | DV    r     | JNG   r/w   | ODT   r     | RTF   r
+  A     r     | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
+  AA    r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
+  AAE   r     | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
+  AAX   r/w   | EIP   r     | K25   r     | OPUS  r     | RM    r
+  ACR   r     | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
+  AFM   r     | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
+  AI    r/w   | ERF   r/w   | LA    r     | PAC   r     | SO    r
+  AIFF  r     | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
+  APE   r     | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
+  ARQ   r/w   | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
+  ARW   r/w   | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
+  ASF   r     | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
+  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
+  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
+  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
+  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
+  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
+  BTF   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
+  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
+  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
+  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
+  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
+  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
+  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
+  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
+  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
   DCM   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WMV   r
   DCP   r/w   | HTML  r     | MPC   r     | PSB   r/w   | WTV   r
   DCR   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | WV    r
@@ -53,7 +54,6 @@ supported by ExifTool (r = read, w = write, c = create):
   DOC   r     | INSV  r     | NRW   r/w   | RAM   r     | ZIP   r
   DOCX  r     | INX   r     | NUMBERS r   | RAR   r     |
   DPX   r     | ISO   r     | O     r     | RAW   r/w   |
-  DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -105,8 +105,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-11.86.tar.gz | tar -xf -
-  cd Image-ExifTool-11.86
+  gzip -dc Image-ExifTool-11.88.tar.gz | tar -xf -
+  cd Image-ExifTool-11.88
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -189,10 +189,11 @@ distribution package:
     xmp2iptc.args             - Arguments for converting XMP to IPTC
     xmp2pdf.args              - Arguments for converting XMP to PDF
   config_files/             - Sample ExifTool configuration files:
-    acdsee.config             - Definitions for writing ACDSEE XMP regions
+    acdsee.config             - Definitions for writing ACDSee XMP regions
     age.config                - Calculate Age of person in photo
     bibble.config             - Definitions for writing Bibble XMP tags
     convert_regions.config    - Convert between MWG, MP and IPTC regions
+    depthmap.config           - Extract Google DepthMap images
     example.config            - General example showing config features
     fotoware.config           - Definitions for writing Fotoware XMP tags
     gps2utm.config            - Generate UTM coordinate tags from GPS info
@@ -201,7 +202,7 @@ distribution package:
     picasa_faces.config       - Convert from Picasa to MWG/MP face regions
     rotate_regions.config     - Rotate MWG and MP region tags
     tiff_version.config       - Determine the version of a TIFF file
-    time_zone.config          - Calcuate time zone from EXIF tags
+    time_zone.config          - Calculate time zone from EXIF tags
   exiftool                  - The exiftool application (Perl script)
   fmt_files/                - Output formatting example files:
     gpx.fmt                   - Format file for creating GPX track

data/bin/config_files/acdsee.config

@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------
 # File:         acdsee.config
 #
-# Description:  This config file defines acdsee XMP region tags for writing.
+# Description:  This config file defines ACDSee XMP region tags for writing.
 #
 # Usage:        exiftool -config acdsee.config -ACDSEETAG=VALUE FILE ...
 #
@@ -56,11 +56,9 @@ my %sACDSeeRegionStruct = (
         Name => 'RegionInfoACDSee',
         # the "Struct" entry defines the structure fields
         Struct => {
-            # NAMESPACE => { 'acdsee-rs' => 'http://ns.acdsee.com/regions/' },
             # optional structure name (used for warning messages only)
             STRUCT_NAME => 'ACDSee RegionInfo',        
             RegionList => {
-                #FlatName => 'Region',
                 Struct => \%sACDSeeRegionStruct,
                 List => 'Bag',
             },

data/bin/config_files/depthmap.config

@@ -0,0 +1,56 @@
+#------------------------------------------------------------------------------
+# File:         depthmap.config
+#
+# Description:  Composite tag definitions to extract DepthMap and ConfidenceMap
+#               images from Google Dynamic-depth images
+#
+# Usage:        exiftool -config depthmap.config -W %d%f_%t.%s -depthmap -confidencemap -b DIR
+#
+# Requires:     ExifTool version 11.88 or later
+#
+# Revisions:    2020/02/20 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+sub GetTrailerImage($$)
+{
+    my ($val, $type) = @_;
+    my @uri = ref $$val[1] ? @{$$val[1]} : $$val[1];
+    my @len = ref $$val[2] ? @{$$val[2]} : $$val[2];
+    my $start = 0;
+    for (my $i=0; $i<@uri; ++$i) {
+        if ($uri[$i] =~ /$type/) {
+            my $img = substr(${$$val[0]}, $start, $len[$i]);
+            return \$img;
+        }
+        $start += $len[$i];
+    }
+    return undef;
+}
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Composite' => {
+        DepthMap => {
+            Require => {
+                0 => 'Trailer',
+                1 => 'ContainerDirectoryItemDataURI',
+                2 => 'ContainerDirectoryItemLength',
+            },
+            ValueConv => 'GetTrailerImage(\@val, "depthmap")',
+        },
+        ConfidenceMap => {
+            Require => {
+                0 => 'Trailer',
+                1 => 'ContainerDirectoryItemDataURI',
+                2 => 'ContainerDirectoryItemLength',
+            },
+            ValueConv => 'GetTrailerImage(\@val, "confidencemap")',
+        },
+    },
+);
+
+%Image::ExifTool::UserDefined::Options = (
+    RequestTags => 'Trailer',
+);
+
+#------------------------------------------------------------------------------
+1;  #end

data/bin/config_files/example.config

@@ -215,6 +215,8 @@
                 2 => 'OtherImage',
                 # (DNG and A100 ARW may be have 2 PreviewImage's)
                 3 => 'PreviewImage (1)',
+                # (if the MPF has 2 previews, MPImage3 could be the larger one)
+                4 => 'MPImage3',
             },
             # ValueConv may also be a code reference
             # Inputs: 0) reference to list of values, 1) ExifTool object

data/bin/config_files/gps2utm.config

@@ -39,7 +39,7 @@ sub tan($)
 sub _cleanup_name($)
 {   my $copy = lc(shift);
     for($copy)
-    {   s/\([^)]+\)//g;   # remove text between parantheses
+    {   s/\([^)]+\)//g;  # remove text between parentheses
         s/[\s-]//g;      # no blanks or dashes
     }
     $copy;

data/bin/config_files/tiff_version.config

@@ -95,7 +95,7 @@ sub has_defined {
     },
 );
 
-# A couple of shortcuts to test for the existance of certain tags
+# A couple of shortcuts to test for the existence of certain tags
 %Image::ExifTool::UserDefined::Shortcuts = (
     TiffVersion5Tags => [
         'EXIF:Artist', 'EXIF:ColorMap', 'EXIF:ModifyDate', 'EXIF:HostComputer', 'EXIF:SubfileType',

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.86';
+my $version = '11.88';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -504,6 +504,7 @@ my @fileOrder;      # tags to use for ordering of input files
 my $fileOrderFast;  # -fast level for -fileOrder option
 my $addGeotime;     # automatically added geotime argument
 my $doGlob;         # flag set to do filename wildcard expansion
+my $endOfOpts;      # flag set if "--" option encountered
 my $escapeXML;      # flag to escape printed values for xml
 my $setTagsFile;    # filename for last TagsFromFile option
 my $sortOpt;        # sort option is used
@@ -540,7 +541,7 @@ if (not $preserveTime and $^O eq 'MSWin32') {
 for (;;) {
 
   # execute the command now if no more arguments or -execute is used
-  if (not @ARGV or $ARGV[0] =~ /^(-|\xe2\x88\x92)execute(\d*)$/i) {
+  if (not @ARGV or ($ARGV[0] =~ /^(-|\xe2\x88\x92)execute(\d*)$/i and not $endOfOpts)) {
     if (@ARGV) {
         $executeID = $2;        # save -execute number for "{ready}" response
         $helped = 1;            # don't show help if we used -execute
@@ -591,6 +592,7 @@ for (;;) {
         # process arguments which were deferred to the next pass
         unshift @ARGV, @nextPass;
         undef @nextPass;
+        undef $endOfOpts;
         ++$pass;
         next;
     }
@@ -600,8 +602,14 @@ for (;;) {
   $_ = shift;
   next if $badCmd;      # flush remaining arguments if aborting this command
 
-  if (s/^(-|\xe2\x88\x92)//) {  # allow funny dashes (nroff dash bug for cut-n-paste from pod)
+  # allow funny dashes (nroff dash bug for cut-n-paste from pod)
+  if (not $endOfOpts and s/^(-|\xe2\x88\x92)//) {
     s/^\xe2\x88\x92/-/;         # translate double-dash too
+    if ($_ eq '-') {
+        $pass or push @nextPass, '--';
+        $endOfOpts = 1;
+        next;
+    }
     my $a = lc $_;
     if (/^list([wfrdx]|wf|g(\d*))?$/i) {
         $pass or push @nextPass, "-$_";
@@ -3228,10 +3236,10 @@ sub FormatCSV($)
     {
         $val = 'base64:' . Image::ExifTool::XMP::EncodeBase64($val, 1);
     }
-    # currently, the value may contain NULL characters.  It is unclear
-    # whether or not this is valid CSV, but some readers may not like it.
-    # (if this becomes a problem, in the future values may need to be truncated at
-    # the first NULL character, but this would disable the use of CSV for binary data)
+    # currently, there is a chance that the value may contain NULL characters unless
+    # the -b option is used to encode as Base64.  It is unclear whether or not this
+    # is valid CSV, but some readers may not like it.  (If this becomes a problem,
+    # in the future values may need to be truncated at the first NULL character.)
     $val = qq{"$val"} if $val =~ s/"/""/g or $val =~ /(^\s+|\s+$)/ or $val =~ /[,\n\r]/;
     return $val;
 }
@@ -3795,7 +3803,7 @@ sub SuggestedExtension($$$)
         $ext = 'vrd';
     } elsif ($$valPt =~ /^IIII\x04\0\x04\0/) {
         $ext = 'dr4';
-    } elsif ($$valPt =~ /^(.{10}|.{522})(\x11\x01|\x00\x11)/) {
+    } elsif ($$valPt =~ /^(.{10}|.{522})(\x11\x01|\x00\x11)/s) {
         $ext = 'pict';
     } else {
         $ext = 'dat';
@@ -4291,34 +4299,35 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DSS   r     | J2C   r     | ODS   r     | RSRC  r
-  3G2   r/w   | DV    r     | JNG   r/w   | ODT   r     | RTF   r
-  3GP   r/w   | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
-  A     r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
-  AA    r     | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
-  AAE   r     | EIP   r     | K25   r     | OPUS  r     | RM    r
-  AAX   r/w   | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
-  ACR   r     | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
-  AFM   r     | ERF   r/w   | LA    r     | PAC   r     | SO    r
-  AI    r/w   | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
-  AIFF  r     | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
-  APE   r     | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
-  ASF   r     | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
-  AVI   r     | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
-  AVIF  r/w   | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
-  AZW   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
-  BMP   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
-  BPG   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
-  BTF   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
-  CHM   r     | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
-  COS   r     | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
-  CR2   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
-  CR3   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
-  CRW   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
+  3FR   r     | DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r
+  3G2   r/w   | DSS   r     | J2C   r     | ODS   r     | RSRC  r
+  3GP   r/w   | DV    r     | JNG   r/w   | ODT   r     | RTF   r
+  A     r     | DVB   r/w   | JP2   r/w   | OFR   r     | RW2   r/w
+  AA    r     | DVR-MS r    | JPEG  r/w   | OGG   r     | RWL   r/w
+  AAE   r     | DYLIB r     | JSON  r     | OGV   r     | RWZ   r
+  AAX   r/w   | EIP   r     | K25   r     | OPUS  r     | RM    r
+  ACR   r     | EPS   r/w   | KDC   r     | ORF   r/w   | SEQ   r
+  AFM   r     | EPUB  r     | KEY   r     | OTF   r     | SKETCH r
+  AI    r/w   | ERF   r/w   | LA    r     | PAC   r     | SO    r
+  AIFF  r     | EXE   r     | LFP   r     | PAGES r     | SR2   r/w
+  APE   r     | EXIF  r/w/c | LNK   r     | PBM   r/w   | SRF   r
+  ARQ   r/w   | EXR   r     | LRV   r/w   | PCD   r     | SRW   r/w
+  ARW   r/w   | EXV   r/w/c | M2TS  r     | PCX   r     | SVG   r
+  ASF   r     | F4A/V r/w   | M4A/V r/w   | PDB   r     | SWF   r
+  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | THM   r/w
+  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TIFF  r/w
+  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TORRENT r
+  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTC   r
+  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TTF   r
+  BTF   r     | FLV   r     | MKS   r     | PGF   r     | TXT   r
+  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VCF   r
+  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VRD   r/w/c
+  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | VSD   r
+  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WAV   r
+  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WDP   r/w
+  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBP  r
+  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WEBM  r
+  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMA   r
   DCM   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WMV   r
   DCP   r/w   | HTML  r     | MPC   r     | PSB   r/w   | WTV   r
   DCR   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | WV    r
@@ -4330,7 +4339,6 @@ supported by ExifTool (r = read, w = write, c = create):
   DOC   r     | INSV  r     | NRW   r/w   | RAM   r     | ZIP   r
   DOCX  r     | INX   r     | NUMBERS r   | RAR   r     |
   DPX   r     | ISO   r     | O     r     | RAW   r/w   |
-  DR4   r/w/c | ITC   r     | ODP   r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4442,6 +4450,7 @@ L<Other options|/Other options>
   -k          (-pause)             Pause before terminating
   -list[w|f|wf|g[NUM]|d|x]         List various exiftool capabilities
   -ver                             Print exiftool version number
+  --                               End of options
 
 L<Special features|/Special features>
 
@@ -5193,7 +5202,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.86 --
+    -- Generated by ExifTool 11.88 --
     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
@@ -5771,6 +5780,9 @@ of a temporary file before deleting the temporary.  The extra step results
 in slower performance, so the B<-overwrite_original> option should be used
 instead unless necessary.
 
+Note that this option reverts to the behaviour of the B<-overwrite_original>
+option when also writing the FileName and/or Directory tags.
+
 =item B<-P> (B<-preserve>)
 
 Preserve the filesystem modification date/time (C<FileModifyDate>) of the
@@ -5959,6 +5971,11 @@ addition system information (see the README file of the full distribution
 for more details about optional libraries), or B<-v2> to also list the Perl
 include directories.
 
+=item B<-->
+
+Indicates the end of options.  Any remaining arguments are treated as file
+names, even if they begin with a dash (C<->).
+
 =back
 
 =head3 Special features
@@ -6357,7 +6374,7 @@ there are three cases where file write permission is also required:
 B<-overwrite_original> option is used, or b) the C<_original> backup already
 exists.
 
-Hidden files in Windows behave as read-only files when attemping to write
+Hidden files in Windows behave as read-only files when attempting to write
 any real tags to the file -- an error is generated when using the
 B<-overwrite_original_in_place>, otherwise writing should be successful and
 the hidden attribute will be removed.  But the B<-if> option may be used to