exiftool_vendored 11.98.0 → 12.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd206618b02e9bdc096dbaf8dc497c6bce6a27e5782b42db0a308ba043752c49
-  data.tar.gz: 783ecd5157f77b7f56d7c85a3ddcb86aebc170e6e937ebfacfa7141a90f74cd8
+  metadata.gz: cf0281354d058359e076603ce713b412cd838a4c5ffe326534275ec858cb11a1
+  data.tar.gz: a556f35232b6cca374d9b118d8b8b8ac9bf4e09e5714fae9c1f3c216ca658b20
 SHA512:
-  metadata.gz: c4e18ca046d054a9a06289921a7ebd70801a64f3ac133de19156969077a1618841926104c9eef4cfdcd57ead9aed13ef2b1cd53b16a7b204fd6bba4342b633ef
-  data.tar.gz: 397e4a867443f593c3d73be6e549e9b0df9256ef551cad3ff39ef335bada1a47bf63fcdc58435672f39873418d74ecfec7ecc385008da471cd6cb34904f5c26a
+  metadata.gz: ec70f7062aaee4ed619bb00bf91fa3d23cee45ebb15b1c3b3c383ee8867ea29b63b01e199a49dd2ef59f727eb8a156015f817ff31271c81ed69d3d560ea90a78
+  data.tar.gz: 33512db4034b62eeddecc4b3b8ec5c370d089cc9526ec1e37989bf26fef200ffe563b3c42e4dd3395be867a81e2bd2790b816610d3249a70d49828de1fdecb9e

data/bin/Changes

@@ -4,9 +4,204 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 11.85. (Other versions are
+Note: The most recent production release is Version 12.00. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Nov. 12, 2020 - Version 12.10
+
+  - Added -validate test for proper TIFF magic number in JPEG EXIF header
+  - Added support for Nikon Z7 LensData version 0801
+  - Added a new XMP-GPano tag
+  - Decode ColorData for the Canon EOS 1DXmkIII (thanks LibRaw)
+  - Decode more tags for the Sony ILCE-7SM3 (thanks Jos Roost)
+  - Automatically apply QuickTimeUTC option for CR3 files
+  - Improved decoding of XAttrMDLabel from MacOS files
+  - Ignore time zones when writing date/time values and using the -d option
+  - Enhanced -echo3 and -echo4 options to allow exit status to be returned
+  - Changed -execute so the -q option no longer suppresses the "{ready}" message
+    when a synchronization number is used (eg. -execute123)
+
+Oct. 29, 2020 - Version 12.09
+
+  - Added ability to copy CanonMakerNotes from CR3 images to other file types
+  - Added read support for ON1 presets file (.ONP)
+  - Added two new CanonModelID values
+  - Added trailing "/" when writing QuickTime:GPSCoordinates
+  - Added a number of new XMP-crs tags
+  - Added a new Sony LensType (thanks Jos Roost)
+  - Added a new Nikon Z lens (thanks LibRaw)
+  - Added a new Canon LensType
+  - Decode ColorData for Canon EOS R5/R6
+  - Decode a couple of new HEIF tags
+  - Decode FirmwareVersion for Canon M50
+  - Improved decoding of Sony CreativeStyle tags (thanks Jos Roost)
+  - Improved parsing of Radiance files to recognize comments
+  - Renamed GIF AspectRatio tag to PixelAspectRatio
+  - Patched EndDir() feature so subdirectories are always processed when -r is
+    used (previously, EndDir() would end processing of a directory completely)
+  - Yet another tweak to the EventTime formatting rules (also allow time-only
+    values with fractional seconds and a time zone)
+  - Avoid loading GoPro module unnecessarily when reading MP4 videos from some
+    other cameras
+  - Fixed problem with an incorrect naming of CodecID tags in some MKV videos
+  - Fixed verbose output to avoid "adding" messages for existing flattened XMP
+    tags
+
+Oct. 15, 2020 - Version 12.08
+
+  - Added read support for MacOS "._" sidecar files
+  - Added a new Sony LensType (thanks Jos Roost)
+  - Recognize Mac OS X xattr files
+  - Extract ThumbnailImage from MP4 videos of more dashcam models
+  - Improved decoding of a number of Sony tags (thanks Jos Roost)
+  - Fixed problem where the special -if EndDir() function didn't work properly
+    for directories after the one in which it was initially called
+  - Patched to read DLL files which don't have a .rsrc section (thanks Hank)
+  - Patched to support new IGC date format when geotagging
+  - Patched to read DLL files with an invalid size in the header
+
+Oct. 2, 2020 - Version 12.07
+
+  - Added support for GoPro .360 videos
+  - Added some new Canon RF and Nikkor Z lenses (thanks LibRaw)
+  - Added some new Sony LensType and CreativeStyle values and decode some
+    ILCE-7C tags (thanks Jos Roost)
+  - Added a number of new Olympus SceneMode values (thanks Herb)
+  - Added a new Nikon LensID
+  - Decode more timed metadata from Insta360 videos (thanks Thomas Allen)
+  - Decode timed GPS from videos of more Garmin dashcam models
+  - Decode a new GoPro video tag
+  - Reformat time-only EventTime values when writing and prevent arbitrary
+    strings from being written
+  - Patched to accept backslashes in SourceFile entries for -csv option
+
+Sept. 11, 2020 - Version 12.06
+
+  - Added read support for Lyrics3 metadata (and fixed problem where APE
+    metadata may be ignored if Lyrics3 exists)
+  - Added a new Panasonic VideoBurstMode value (thanks Klaus Homeister)
+  - Added a new Olympus MultipleExposureMode value
+  - Added a new Nikon LensID
+  - Added back conversions for XMP-dwc EventTime that were removed in 12.04 with
+    a patch to allow time-only values
+  - Decode GIF AspectRatio
+  - Decode Olympus FocusBracketStepSize (thanks Karsten)
+  - Extract PNG iDOT chunk in Binary format with the name AppleDataOffsets
+  - Process PNG images which do not start with mandatory IHDR chunk
+
+Aug. 24, 2020 - Version 12.05
+
+  - Added a new Panasonic SelfTimer value (thanks Herb)
+  - Decode a few more DPX tags (thanks Harry Mallon)
+  - Extract AIFF APPL tag as ApplicationData
+  - Fixed bug writing QuickTime ItemList 'gnre' Genre values
+  - Fixed an incorrect value for Panasonic VideoBurstResolution (thanks Herb)
+  - Fixed problem when applying a time shift to some invalid makernote date/time
+    values
+
+Aug. 10, 2020 - Version 12.04
+
+  - Added read support for Zeiss ZISRAW CZI files
+  - Added some new values for a couple of Olympus tags (thanks Sebastian)
+  - Decode a number of new tags for the Sony ILCE-7SM3 (thanks Jos Roost)
+  - Removed formatting restrictions on XMP-dwc:EventTime to allow a time-only
+    value to be written
+  - Moved new QuckTime ItemList tags added in version 12.02 to the proper group
+    (they were incorrectly added to the Keys group)
+  - Improved QuickTime -v3 output to show default language codes
+  - Patched -lang option to work for the values of somet tags with coded
+    translations
+  - Patched the format of a number of QuickTime tags when writing for improved
+    compatibility with iTunes and AtomicParsley
+  - Patched to write a default QuickTime language code of 0x0000 (null) instead
+    of 0x55c4 ('und')
+
+July 29, 2020 - Version 12.03
+
+  - Added family 7 group names to allow tag ID's to be specified when reading
+    and writing
+  - Fixed a couple of typos in tag values (thanks Herb)
+  - API Changes:
+      - Added HexTagIDs option
+      - Enhanced GetNewValue() to allow family 7 groups names to be used
+  - Internal Changes:
+      - Changed Composite tag ID's to use "-" instead of "::" as a separator
+
+July 27, 2020 - Version 12.02
+
+  - Added support for a number of new QuickTime ItemList tags
+  - Added support for writing XMP-xmp:RatingPercent
+  - Added a new Sony LensType (thanks Jos Roost and LibRaw)
+  - Added a new Pentax LensType (thanks James O'Neill)
+  - Decode barcodes from Ricoh APP5 RMETA segment
+  - Decode a few new QuickTime tags written by Ricoh and Garmin cameras
+  - Decode timed GPS from Sony A7R IV MP4 videos
+  - Decode timed GPS from 70mai dashcam videos
+  - Decode a few new Panasonic tags (thanks Klaus Homeister)
+  - Decode altitude and more accurate latitude/longitude from Transcend Driver
+    Pro 230 MP4 videos
+  - Improved decoding of some Canon EOS 1DXmkIII custom functions
+  - Allow integer QuickTime TrackNumber and DiskNumber values
+  - Relax validity check of QuickTime:ContentCreateDate when writing with -n
+  - Removed "Com" from the start of some unknown ItemList tag names
+  - Patched CanonCustom decoding for bug in Canon EOS-1DX firmware
+  - Changed QuickTime CleanAperture tags decode as signed rationals
+
+June 24, 2020 - Version 12.01
+
+  - Added a new NEFCompression value (thanks Warren Hatch)
+  - Added a new Sony LensType (thanks Jos Roost)
+  - Decode timed GPS from Rove Stealth 4K dashcam videos
+  - Fixed bug which would corrupt TIFF images with 16-bit image data offsets
+    when writing (these are very rare)
+
+June 11, 2020 - Version 12.00 (production release)
+
+  - Added two new Olympus LensTypes (thanks Don Komarechka for one)
+  - Added two new Sony LensType values (thanks Jos Roost)
+  - Added a few new Nikon LensID's (thanks Mathieu Carbou)
+  - Added support for the Sony ZV-1 (thanks Jos Roost)
+  - Added a new CanonModelID (thanks Jos Roost)
+  - Added missing MimeType values for HEICS and HEIFS files
+  - Added definitions for a number of new XMP-crs tags
+  - Recognize WOFF and WOFF2 font files
+  - Decode streaming GPS from Roadhawk, EEEkit and 360Fly MP4 videos
+  - Decode a number of new tags for the Nikon D6 (thanks Warren Hatch)
+  - Decode a couple more AF tags for the D500/D850
+  - Decode a number of new Panasonic tags
+  - Improved Composite LensID logic (thanks Matt Stancliff)
+  - Enhanced -v option to state when a directory has 0 entries
+  - Removed a couple of incorrect Validate warnings for bilevel TIFF images
+  - Drop ContrastCurve tag when copying from NEF to JPEG
+  - Changed -csv output to add "Unknown" group name to column headings for
+    missing tags when -f and -G options are used
+  - Patched to support new XMP LensID format for Nikon cameras as written by
+    Apple Photos (thanks Mattsta)
+  - Fixed problem extracting metadata from Sigma DP2 Quattro X3F files
+  - Fixed End() and EndDir() functions so they work when writing and when the -v
+    option is used
+  - Fixed problem recognizing some PGM files
+  - Fixed bug in offsets for some Photoshop information in -v3 output
+  - Fixed problem writing a list containing empty elements inside an XMP
+    structure
+  - API Changes:
+      - Added NoMultiExif option
+      - Changed FilterW option to not write tag if $_ is set to undef
+
+May 11, 2020 - Version 11.99
+
+  - Added a new Nikon LensID (thanks Mykyta Kozlov)
+  - Added a new Canon LensType
+  - Added a newn PentaxModelID
+  - Decode a few new QuickTime tags
+  - Decode new ID3 Grouping tag
+  - Decode a few more MinoltaRaw tags (thanks LibRaw)
+  - Fixed runtime warning which could occur when reading corrupted RTF files
+  - Fixed another potential pitfall in M2TS Duration calculation
+  - Fixed problem extracting some unknown QuickTime:Keys tags
+  - Fixed problem decoding Nikon D850 orientation tags
+  - Fixed bug where TIFF image data may not be padded to an even number of bytes
+
 May 1, 2020 - Version 11.98
 
   - Added a new Nikon LensID (thanks Warren Hatch)
@@ -30,7 +225,8 @@ Apr. 24, 2020 - Version 11.96
 
 Apr. 23, 2020 - Version 11.95
 
-  - Added Exit() and ExitDir() functions for use in -if conditions
+  - Added Exit() and ExitDir() functions for use in -if conditions (NOTE: these
+    function names changed to End() and EndDir() in ExifTool 11.96)
   - Enhanced -geotag feature to support a more flexible input CSV file format
   - Enhanced -if and API Filter options to allow access to ExifTool object via
     $self

data/bin/MANIFEST

@@ -169,6 +169,7 @@ html/TagNames/Vorbis.html
 html/TagNames/WTV.html
 html/TagNames/XMP.html
 html/TagNames/ZIP.html
+html/TagNames/ZISRAW.html
 html/TagNames/iWork.html
 html/TagNames/index.html
 html/TagNames/style.css
@@ -410,6 +411,7 @@ lib/Image/ExifTool/XMP.pm
 lib/Image/ExifTool/XMP2.pl
 lib/Image/ExifTool/XMPStruct.pl
 lib/Image/ExifTool/ZIP.pm
+lib/Image/ExifTool/ZISRAW.pm
 lib/Image/ExifTool/iWork.pm
 perl-Image-ExifTool.spec
 t/AFCP.t
@@ -650,6 +652,8 @@ t/MWG_6.out
 t/MWG_7.out
 t/MXF.t
 t/MXF_2.out
+t/MacOS.t
+t/MacOS_2.out
 t/Matroska.t
 t/Matroska_2.out
 t/Minolta.t
@@ -915,6 +919,8 @@ t/ZIP_4.out
 t/ZIP_5.out
 t/ZIP_6.out
 t/ZIP_7.out
+t/ZISRAW.t
+t/ZISRAW_2.out
 t/images/AFCP.jpg
 t/images/AIFF.aif
 t/images/APE.ape
@@ -1003,6 +1009,7 @@ t/images/MOI.moi
 t/images/MP3.mp3
 t/images/MWG.jpg
 t/images/MXF.mxf
+t/images/MacOS.macos
 t/images/Matroska.mkv
 t/images/Minolta.jpg
 t/images/Minolta.mrw
@@ -1089,4 +1096,5 @@ t/images/XMP8.xmp
 t/images/XMP9.xmp
 t/images/ZIP.gz
 t/images/ZIP.zip
+t/images/ZISRAW.czi
 t/images/iWork.numbers

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.98"
+   "version" : "12.10"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 11.98
+version: 12.10

data/bin/README

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

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.98';
+my $version = '12.10';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -141,6 +141,7 @@ my $deleteOrig;     # 0=restore original files, 1=delete originals, 2=delete w/o
 my $disableOutput;  # flag to disable normal output
 my $doSetFileName;  # flag set if FileName may be written
 my $doUnzip;        # flag to extract info from .gz and .bz2 files
+my ($end,$endDir);  # flags to end processing
 my $escapeC;        # C-style escape
 my $escapeHTML;     # flag to escape printed values for html
 my $evalWarning;    # warning from eval
@@ -293,8 +294,8 @@ my %altRecommends = (
 my %unescapeChar = ( 't'=>"\t", 'n'=>"\n", 'r'=>"\r" );
 
 # special subroutines used in -if condition
-sub Image::ExifTool::EndDir() { return $$mt{EndDir} = 1 }
-sub Image::ExifTool::End()    { return $$mt{End} = 1 }
+sub Image::ExifTool::EndDir() { return $endDir = 1 }
+sub Image::ExifTool::End()    { return $end = 1 }
 
 # exit routine
 sub Exit {
@@ -365,13 +366,21 @@ if (grep /^-common_args$/i, @ARGV) {
 # loop over sets of command-line arguments separated by "-execute"
 Command: for (;;) {
 
-@echo3 and print STDOUT join("\n", @echo3), "\n";
-@echo4 and print STDERR join("\n", @echo4), "\n";
+if (@echo3) {
+    my $str = join "\n", @echo3, "\n";
+    $str =~ s/\$\{status\}/$rtnVal/ig;
+    print STDOUT $str;
+}
+if (@echo4) {
+    my $str = join "\n", @echo4, "\n";
+    $str =~ s/\$\{status\}/$rtnVal/ig;
+    print STDERR $str;
+}
 
 $rafStdin->Close() if $rafStdin;
 undef $rafStdin;
 
-# save or previous return codes
+# save our previous return codes
 $rtnValPrev = $rtnVal;
 $rtnValApp = $rtnVal if $rtnVal;
 
@@ -386,7 +395,7 @@ if ($binaryStdout) {
 
 # flush console and print "{ready}" message if -stay_open is in effect
 if ($stayOpen >= 2) {
-    if ($quiet) {
+    if ($quiet and not defined $executeID) {
         # flush output if possible
         eval { require IO::Handle } and STDERR->flush(), STDOUT->flush();
     } else {
@@ -443,6 +452,8 @@ undef $deleteOrig;
 undef $disableOutput;
 undef $doSetFileName;
 undef $doUnzip;
+undef $end;
+undef $endDir;
 undef $escapeHTML;
 undef $escapeC;
 undef $evalWarning;
@@ -551,7 +562,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 and not $endOfOpts)) {
+  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
@@ -1755,13 +1766,17 @@ if (@dbKeys) {
         undef $evalWarning;
         local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
         foreach (@dbKeys) {
+            my $db = $database{$_};
+            tr/\\/\// and $database{$_} = $db;  # allow for backslashes in SourceFile
             # (punt on using ConvertFileName here, so $absPath may be a mix of encodings)
             my $absPath = AbsPath($_);
             if (defined $absPath) {
-                $database{$absPath} = $database{$_} unless $database{$absPath};
+                $database{$absPath} = $db unless $database{$absPath};
                 if ($verbose and $verbose > 1) {
                     print $vout "Imported entry for '${_}' (full path: '${absPath}')\n";
                 }
+            } elsif ($verbose and $verbose > 1) {
+                print $vout "Imported entry for '${_}' (non-existent file)\n";
             }
         }
     }
@@ -2271,7 +2286,7 @@ TAG:    foreach $tag (@foundTags) {
                 # the same group, and if so suppress this tag instead
                 next if $noDups and $tag =~ /^(.*?) ?\(/ and defined $$info{$1} and
                         $group eq $et->GetGroup($1, $showGroup);
-                $group = 'Unknown' if not $group and ($xml or $json);
+                $group = 'Unknown' if not $group and ($xml or $json or $csv);
                 if ($fp and not ($allGroup or $csv)) {
                     if ($lastGroup ne $group) {
                         if ($html) {
@@ -3546,11 +3561,11 @@ sub ProcessFiles($;$)
                 push(@$list, $file);
             } else {
                 GetImageInfo($et, $file);
-                $$et{End} and Warn("End called - $file\n");
+                $end and Warn("End called - $file\n");
             }
         }
         $et->Options(CharsetFileName => $enc) if $utf8FileName{$file};
-        last if $$et{End};
+        last if $end;
     }
 }
 
@@ -3561,7 +3576,7 @@ sub ScanDir($$;$)
 {
     local $_;
     my ($et, $dir, $list) = @_;
-    my (@fileList, $done, $file, $utf8Name, $winSurrogate);
+    my (@fileList, $done, $file, $utf8Name, $winSurrogate, $endThisDir);
     my $enc = $et->Options('CharsetFileName');
     # recode as UTF-8 if necessary
     if ($enc) {
@@ -3628,9 +3643,10 @@ sub ScanDir($$;$)
             next if $file =~ /^\./ and ($recurse == 1 or $file eq '.' or $file eq '..');
             next if $ignore{$file} or ($ignore{SYMLINKS} and -l $path);
             ScanDir($et, $path, $list);
-            last if $$et{End};
+            last if $end;
             next;
         }
+        next if $endThisDir;
         # apply rules from -ext options
         my $accepted;
         if ($filterFlag) {
@@ -3668,14 +3684,15 @@ sub ScanDir($$;$)
             push(@$list, $path);
         } else {
             GetImageInfo($et, $path);
-            if ($$et{End}) {
+            if ($end) {
                 Warn("End called - $file\n");
                 last;
             }
-            if ($$et{EndDir}) {
-                $dir =~ s(/$)();
+            if ($endDir) {
+                $path =~ s(/$)();
                 Warn("EndDir called - $path\n");
-                last;
+                undef $endDir;
+                $endThisDir = 1;
             }
         }
     }
@@ -4379,46 +4396,47 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  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
-  DFONT r     | ICS   r     | MPO   r/w   | PSP   r     | X3F   r/w
-  DIVX  r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XCF   r
-  DJVU  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLS   r
-  DLL   r     | IND   r/w   | MXF   r     | RA    r     | XLSX  r
-  DNG   r/w   | INSP  r/w   | NEF   r/w   | RAF   r/w   | XMP   r/w/c
-  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   |
+  360   r/w   | DPX   r     | ITC   r     | ODP   r     | RIFF  r
+  3FR   r     | DR4   r/w/c | J2C   r     | ODS   r     | RSRC  r
+  3G2   r/w   | DSS   r     | JNG   r/w   | ODT   r     | RTF   r
+  3GP   r/w   | DV    r     | JP2   r/w   | OFR   r     | RW2   r/w
+  A     r     | DVB   r/w   | JPEG  r/w   | OGG   r     | RWL   r/w
+  AA    r     | DVR-MS r    | JSON  r     | OGV   r     | RWZ   r
+  AAE   r     | DYLIB r     | K25   r     | ONP   r     | RM    r
+  AAX   r/w   | EIP   r     | KDC   r     | OPUS  r     | SEQ   r
+  ACR   r     | EPS   r/w   | KEY   r     | ORF   r/w   | SKETCH r
+  AFM   r     | EPUB  r     | LA    r     | OTF   r     | SO    r
+  AI    r/w   | ERF   r/w   | LFP   r     | PAC   r     | SR2   r/w
+  AIFF  r     | EXE   r     | LNK   r     | PAGES r     | SRF   r
+  APE   r     | EXIF  r/w/c | LRV   r/w   | PBM   r/w   | SRW   r/w
+  ARQ   r/w   | EXR   r     | M2TS  r     | PCD   r     | SVG   r
+  ARW   r/w   | EXV   r/w/c | M4A/V r/w   | PCX   r     | SWF   r
+  ASF   r     | F4A/V r/w   | MACOS r     | PDB   r     | THM   r/w
+  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | TIFF  r/w
+  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TORRENT r
+  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TTC   r
+  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTF   r
+  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TXT   r
+  BTF   r     | FLV   r     | MKS   r     | PGF   r     | VCF   r
+  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VRD   r/w/c
+  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VSD   r
+  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | WAV   r
+  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WDP   r/w
+  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WEBP  r
+  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBM  r
+  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WMA   r
+  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMV   r
+  CZI   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WTV   r
+  DCM   r     | HTML  r     | MPC   r     | PSB   r/w   | WV    r
+  DCP   r/w   | ICC   r/w/c | MPG   r     | PSD   r/w   | X3F   r/w
+  DCR   r     | ICS   r     | MPO   r/w   | PSP   r     | XCF   r
+  DFONT r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XLS   r
+  DIVX  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLSX  r
+  DJVU  r     | IND   r/w   | MXF   r     | RA    r     | XMP   r/w/c
+  DLL   r     | INSP  r/w   | NEF   r/w   | RAF   r/w   | ZIP   r
+  DNG   r/w   | INSV  r     | NRW   r/w   | RAM   r     |
+  DOC   r     | INX   r     | NUMBERS r   | RAR   r     |
+  DOCX  r     | ISO   r     | O     r     | RAW   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4474,7 +4492,7 @@ L<Input-output text formatting|/Input-output text formatting>
   -f          (-forcePrint)        Force printing of all specified tags
   -g[NUM...]  (-groupHeadings)     Organize output by tag group
   -G[NUM...]  (-groupNames)        Print group name for each tag
-  -h          (-htmlFormat)        Use HMTL formatting for output
+  -h          (-htmlFormat)        Use HTML formatting for output
   -H          (-hex)               Show tag ID numbers in hexadecimal
   -htmlDump[OFFSET]                Generate HTML-format binary dump
   -j[[+]=JSONFILE] (-json)         Export/import tags in JSON format
@@ -4620,7 +4638,7 @@ delete or replace a tag (see L</WRITING EXAMPLES> for examples).  C<^=> is
 used to write an empty string instead of deleting the tag when no I<VALUE>
 is given, but otherwise it is equivalent to C<=>.
 
-I<TAG> may contain one or more leading family 0, 1 or 2 group names,
+I<TAG> may contain one or more leading family 0, 1, 2 or 7 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
 is specified, the tag is created in the preferred group, and updated in any
 other location where a same-named tag already exists.  The preferred group
@@ -4675,7 +4693,7 @@ the specified group(s) are removed individually, and in this case is it
 possible to exclude individual tags from a mass delete.  For example,
 C<-time:all --Exif:Time:All> removes all deletable Time tags except those in
 the EXIF.  This difference also applies if family 2 is specified when
-deleting all groups. For example, C<-2all:all=> deletes tags individually,
+deleting all groups.  For example, C<-2all:all=> deletes tags individually,
 while C<-all:all=> deletes entire blocks.
 
 5) The "APP" group names ("APP0" through "APP15") are used to delete JPEG
@@ -5075,13 +5093,13 @@ B<-csv>=I<CSVFILE> feature.
 
 Organize output by tag group.  I<NUM> specifies a group family number, and
 may be 0 (general location), 1 (specific location), 2 (category), 3
-(document number), 4 (instance number), 5 (metadata path) or 6 (EXIF/TIFF
-format).  B<-g0> is assumed if a family number is not specified, and family
-numbers may be added wherever B<-g> is mentioned in the documentation. 
-Multiple families may be specified by separating them with colons.  By
-default the resulting group name is simplified by removing any leading
+(document number), 4 (instance number), 5 (metadata path), 6 (EXIF/TIFF
+format) or 7 (tag ID).  B<-g0> is assumed if a family number is not
+specified.  May be combined with other options to add group names to the
+output.  Multiple families may be specified by separating them with colons. 
+By default the resulting group name is simplified by removing any leading
 C<Main:> and collapsing adjacent identical group names, but this can be
-avoided by placing a colon before the first family number (eg. B<-g:3:1>). 
+avoided by placing a colon before the first family number (eg. B<-g:3:1>).
 Use the B<-listg> option to list group names for a specified family.  The
 SavePath and SaveFormat API options are automatically enabled if the
 respective family 5 or 6 group names are requested.  See the
@@ -5286,7 +5304,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.98 --
+    -- Generated by ExifTool 12.10 --
     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
@@ -5719,7 +5737,9 @@ involves an additional processing pass of each file, but this impact may be
 reduced by specifying a I<NUM> for the B<-fast> level used during the
 metadata-extraction phase.  For example, B<-fileOrder4> may be used if
 I<TAG> is a pseudo System tag.  If multiple B<-fileOrder> options are used,
-the extraction is done at the lowest B<-fast> level.
+the extraction is done at the lowest B<-fast> level.  Note that files are
+sorted across directory boundaries if multiple input directories are
+specified.
 
 =item B<-i> I<DIR> (B<-ignore>)
 
@@ -5769,7 +5789,8 @@ of the file processing.  Both functions have a return value of 1.  Case is
 significant for function names.
 
     End()    - end processing after this file
-    EndDir() - end processing of files in this directory
+    EndDir() - end processing of files in this directory (not
+               compatible with the B<-fileOrder> option)
 
 Notes:
 
@@ -6231,7 +6252,9 @@ about the configuration file syntax.
 Echo I<TEXT> to stdout (B<-echo> or B<-echo1>) or stderr (B<-echo2>).  Text
 is output as the command line is parsed, before the processing of any input
 files.  I<NUM> may also be 3 or 4 to output text (to stdout or stderr
-respectively) after processing is complete.
+respectively) after processing is complete.  For B<-echo3> and B<-echo4>,
+"${status}" may be used in the I<TEXT> string to represent the numerical
+exit status of the command (see L</EXIT STATUS>).
 
 =item B<-efile>[I<NUM>][!] I<ERRFILE>
 
@@ -6252,7 +6275,8 @@ commands were executed as separate command lines (with the exception of the
 B<-config> and B<-use> options which remain in effect for subsequent
 commands).  Allows multiple commands to be executed from a single command
 line.  I<NUM> is an optional number that is echoed in the "{ready}" message
-when using the B<-stay_open> feature.
+when using the B<-stay_open> feature.  If a I<NUM> is specified, the B<-q>
+option no longer suppresses the output "{readyNUM}" message.
 
 =item B<-srcfile> I<FMT>
 
@@ -6297,12 +6321,15 @@ line (see the B<-@> option for details).
 
 3) Write C<-execute\n> to I<ARGFILE>, where C<\n> represents a newline
 sequence.  (Note: You may need to flush your write buffers here if using
-buffered output.)  Exiftool will then execute the command with the arguments
+buffered output.)  ExifTool will then execute the command with the arguments
 received up to this point, send a "{ready}" message to stdout when done
 (unless the B<-q> or B<-T> option is used), and continue trying to read
 arguments for the next command from I<ARGFILE>.  To aid in command/response
 synchronization, any number appended to the C<-execute> option is echoed in
-the "{ready}" message.  For example, C<-execute613> results in "{ready613}".
+the "{ready}" message.  For example, C<-execute613> results in "{ready613}". 
+When this number is added, B<-q> no longer suppresses the "{ready}" message.
+(Also, see the B<-echo3> and B<-echo4> options for additional ways to pass
+signals back to your application.)
 
 4) Repeat steps 2 and 3 for each command.
 
@@ -6317,7 +6344,7 @@ writing the following lines to the currently open I<ARGFILE>:
     -@
     NEWARGFILE
 
-This causes I<ARGFILE> to be closed, and I<NEWARGFILE> to be kept open.
+This causes I<ARGFILE> to be closed, and I<NEWARGFILE> to be kept open. 
 (Without the B<-stay_open> here, exiftool would have returned to reading
 arguments from I<ARGFILE> after reaching the end of I<NEWARGFILE>.)