exiftool_vendored 9.37.0 → 9.41.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTMxNTQzN2RjYzdmY2M4NDJiMjM0ZGIyMGNiNDI1OTFlNTI1M2JkYw==
-  data.tar.gz: !binary |-
-    MmMyZTU0MjYyNjA3ZGY2MTY0Y2I2YWRmZWQzYWJmMGI1MmYzNjcwOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTQ2NGUwMTMwNDkzMjdhYzRkNDk1MWNmODBiYjZiNzRmOWRhYzdhZTU4NmY5
-    NWRhMTU5MDk1ZWM1ZmFkYzdlYWY0NTQ1MWVjZjM1YzFiYzMwYzlkZjQwMmQ4
-    ZjdjODNiMjI2NzUyMjdkYjg2MjdkMmY2ZDgzYTU2NTRmMTY2ZDA=
-  data.tar.gz: !binary |-
-    MzAzZWIwMDNmYWFjN2IyZjUxODU3YjQ5ZTBkZTI2MDNiNjE0ZTRhMzI0Njlm
-    MzY0OWFmNWFhNjg5OTYyZjk1N2UzMWViZDJkZTI0MzM5MTk5YjBhOTY0NDZh
-    MTcxMzkzODZjNmRkNWQ4ZjdmYjc0NTY0NGMwNGM1M2JkNjg0ZmQ=
+SHA1:
+  metadata.gz: 82a88f2db7526ba7bc68a0b3cf6ee97290b10b15
+  data.tar.gz: 284960cf2566cc5e9f2abf143a73fab6f23298a4
+SHA512:
+  metadata.gz: 87de268fa289ad7491061cf2ecdda5d41acecf3a22b2025f30b7080ddabf3a2ff54dfd37c4f870238a0f28a1e37b3577e0c0a8bfd32cf6932267c1ebfa73a973
+  data.tar.gz: cbb852739d5f267ecbc1f0e0251ac8b9c48470f76c920a6620d2daf186c4a268f84272b32b2568e5b05e8589104c10a906fa90288a7e42c0a66f02cf3b7351e6

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/Changes

@@ -7,6 +7,80 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 9.27. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Nov. 16, 2013 - Version 9.41
+
+  - Added the ability to use multiple group qualifiers on tag names when writing
+    and copying (ie. "-QuickTime:Time:All=now")
+  - Added ability to geotag from Google Location Services KML files
+  - Added a new Pentax LensType (thanks Louis Granboulan)
+  - Added a new Canon LensType (thanks David Monro)
+  - Added a new Sony LensType2 (thanks Jos Roost)
+  - Decode a bunch more Nikon, Canon, Sony and FujiFilm WhiteBalance tags
+    (thanks Iliah Borg)
+  - Extract information from the new Pentax APP7 segment
+
+Nov. 8, 2013 - Version 9.40 - "Write QuickTime"
+
+  - Added ability to write XMP and edit date/time tags in QuickTime-format files
+    (ie. MOV, MP4)
+  - Added -api option to allow API options to be set via the command line
+  - Added ability to specify family 2 group name when writing
+  - Added write support for a number of new XMP tags
+  - Added a new Nikon LensID
+  - Added new Canon and Minolta/Sony LensType values (thanks Jos Roost)
+  - Added a few of the new values defined in the DICOM 2011 specification
+  - Add standard XMP to a PNG image when writing, even if XMP already exists in
+    another non-standard chunk
+  - Decode a few more Sony tags (thanks Jos Roost)
+  - Decode a few more QuickTime tags
+  - Decode a few more Panasonic tags (thanks Thomas Modes)
+  - Extract EXIF information from WEBP images
+  - Extract a few more unknown tags in Samsung MP4 videos
+  - Extract ProfileName from the PNG iCCP chunk
+  - Improved error message if no matches found when writing to tag(s) specified
+    by wildcards
+  - Improved XML output so EXIF tags now report a count (if constant, and > 1)
+  - Avoid writing a few XMP-crs tags which have XMP-exifEX equivalents unless
+    specified explicitly
+  - Patched POD documentation in MIE.pm to remove non-ASCII characters
+  - Fixed bug adding back XMP tags in PDF files after deleting all in the same
+    command (also made XMP the preferred group when writing PDF files)
+  - Fixed bug extracting some font information from QuickTime videos
+  - Fixed inconsistencies in behaviour when extracting XML as a block from
+    JPEG2000 images
+  - Fixed problem where FileName was changed when using -srcfile option and
+    writing only the Directory
+  - API Changes:
+      - Added the PNGEarlyXMP option
+  - Internal Changes:
+      - Changed all "$exifTool" variable names to "$et" throughout -- my
+        apologies to the diff engines
+
+Oct. 19, 2013 - Version 9.39
+
+  - Added a new PentaxCameraID and some new LensTypes (thanks Louis Granboulan)
+  - Added a new Nikon LensID
+  - Added a new Panasonic ShutterType
+  - Additions and improvements to Pentax makernote decoding for K-3
+  - Decode a number of new tags including purchase information from MP4 videos
+  - Decode FLIR information acquired by Extech MeterLink meters (thanks Tomas)
+  - Decode more Sony tags (thanks Jos Roost)
+  - Patched to suppress the run-time "No such file or directory" error that has
+    been seen when using the -csv option on Windows systems
+
+Oct. 7, 2013 - Version 9.38
+
+  - Added read support for DPX images
+  - Added a new Pentax LensType
+  - Added a few new CanonModelID values
+  - Added a new XMP-apple-fi tag
+  - Decode a few more Canon tags (thanks Tomasz Kawecki)
+  - Decode a few more Sony tags (thanks Jos Roost)
+  - Improved the names of a few Apple tags (thanks Neal Krawetz) and added new
+    Composite tag
+  - Tolerate NMEA sentences with missing degrees written by some crappy software
+  - Changed Duration conversion to print number of days if more than 24 hours
+
 Sept. 14, 2013 - Version 9.37
 
   - Added support for maker notes from Apple iPhone5 iOS 7

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/MANIFEST

@@ -38,6 +38,7 @@ html/TagNames/Casio.html
 html/TagNames/Composite.html
 html/TagNames/DICOM.html
 html/TagNames/DNG.html
+html/TagNames/DPX.html
 html/TagNames/DV.html
 html/TagNames/DarwinCore.html
 html/TagNames/DjVu.html
@@ -210,6 +211,7 @@ lib/Image/ExifTool/Charset/Turkish.pm
 lib/Image/ExifTool/Charset/Vietnam.pm
 lib/Image/ExifTool/DICOM.pm
 lib/Image/ExifTool/DNG.pm
+lib/Image/ExifTool/DPX.pm
 lib/Image/ExifTool/DV.pm
 lib/Image/ExifTool/DarwinCore.pm
 lib/Image/ExifTool/DjVu.pm
@@ -337,6 +339,7 @@ lib/Image/ExifTool/WritePDF.pl
 lib/Image/ExifTool/WritePNG.pl
 lib/Image/ExifTool/WritePhotoshop.pl
 lib/Image/ExifTool/WritePostScript.pl
+lib/Image/ExifTool/WriteQuickTime.pl
 lib/Image/ExifTool/WriteXMP.pl
 lib/Image/ExifTool/Writer.pl
 lib/Image/ExifTool/XMP.pm
@@ -390,6 +393,8 @@ t/DICOM_2.out
 t/DNG.t
 t/DNG_2.out
 t/DNG_3.out
+t/DPX.t
+t/DPX_2.out
 t/DV.t
 t/DV_2.out
 t/DjVu.t
@@ -464,6 +469,7 @@ t/Geotag_5.out
 t/Geotag_6.out
 t/Geotag_7.out
 t/Geotag_8.out
+t/Geotag_9.out
 t/HTML.t
 t/HTML_2.out
 t/IPTC.t
@@ -583,6 +589,7 @@ t/PNG.t
 t/PNG_2.out
 t/PNG_3.out
 t/PNG_4.out
+t/PNG_5.out
 t/PPM.t
 t/PPM_2.out
 t/PPM_3.out
@@ -611,6 +618,8 @@ t/PostScript_3.out
 t/QuickTime.t
 t/QuickTime_2.out
 t/QuickTime_3.out
+t/QuickTime_4.out
+t/QuickTime_5.out
 t/RIFF.t
 t/RIFF_2.out
 t/RIFF_3.out
@@ -687,6 +696,9 @@ t/Writer_47.out
 t/Writer_48.out
 t/Writer_50.out
 t/Writer_51.out
+t/Writer_52.out
+t/Writer_53.out
+t/Writer_54.out
 t/Writer_6.out
 t/Writer_7.out
 t/Writer_9.out
@@ -752,6 +764,7 @@ t/images/Casio2.jpg
 t/images/CasioQVCI.jpg
 t/images/DICOM.dcm
 t/images/DNG.dng
+t/images/DPX.dpx
 t/images/DV.dv
 t/images/DjVu.djvu
 t/images/EXE.elf
@@ -783,6 +796,7 @@ t/images/GPS.jpg
 t/images/GeoTiff.tif
 t/images/Geotag.gpx
 t/images/Geotag.igc
+t/images/Geotag.kml
 t/images/Geotag.log
 t/images/Geotag.xml
 t/images/Geotag2.log

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/META.yml

@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Image-ExifTool
-version:            9.37
+version:            9.41
 abstract:           Read and write meta information
 author:
     - Phil Harvey (phil@owl.phy.queensu.ca)

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/README

@@ -14,38 +14,38 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  3G2   r     | ERF   r/w   | M4A/V r     | PBM   r/w   | RM    r
-  3GP   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
-  ACR   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
-  AFM   r     | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
-  AI    r/w   | F4A/V r     | MKA   r     | PFA   r     | SRW   r/w
-  AIFF  r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
-  APE   r     | FLA   r     | MKV   r     | PFM   r     | SWF   r
-  ARW   r/w   | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
-  ASF   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
-  AVI   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
-  BMP   r     | FPX   r     | MOV   r     | PICT  r     | TTC   r
-  BTF   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
-  CHM   r     | GZ    r     | MP4   r     | PNG   r/w   | VRD   r/w/c
-  COS   r     | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
-  CR2   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
-  CRW   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
-  CS1   r/w   | ICC   r/w/c | MQV   r     | PS    r/w   | WEBP  r
-  DCM   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
-  DCP   r/w   | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
-  DCR   r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
-  DFONT r     | INX   r     | NRW   r/w   | QTIF  r     | WV    r
-  DIVX  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
-  DJVU  r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
-  DLL   r     | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
-  DNG   r/w   | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
-  DOC   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
-  DOCX  r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
+  3FR   r     | EIP   r     | LNK   r     | PAC   r     | RWL   r/w
+  3G2   r/w   | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
+  3GP   r/w   | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
+  ACR   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
+  AFM   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
+  AI    r/w   | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
+  AIFF  r     | F4A/V r/w   | MKA   r     | PFA   r     | SRW   r/w
+  APE   r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
+  ARW   r/w   | FLA   r     | MKV   r     | PFM   r     | SWF   r
+  ASF   r     | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
+  AVI   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
+  BMP   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
+  BTF   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r
+  CHM   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
+  COS   r     | GZ    r     | MP4   r/w   | PNG   r/w   | VRD   r/w/c
+  CR2   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
+  CRW   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
+  CS1   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
+  DCM   r     | ICC   r/w/c | MQV   r/w   | PS    r/w   | WEBP  r
+  DCP   r/w   | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
+  DCR   r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
+  DFONT r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
+  DIVX  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WV    r
+  DJVU  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
+  DLL   r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
+  DNG   r/w   | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
+  DOC   r     | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
+  DOCX  r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
+  DPX   r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
   DV    r     | KDC   r     | OGV   r     | RSRC  r     |
-  DVB   r     | KEY   r     | ORF   r/w   | RTF   r     |
+  DVB   r/w   | KEY   r     | ORF   r/w   | RTF   r     |
   DYLIB r     | LA    r     | OTF   r     | RW2   r/w   |
-  EIP   r     | LNK   r     | PAC   r     | RWL   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------

data/bin/{Image-ExifTool-9.37 → Image-ExifTool-9.41}/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '9.37';
+my $version = '9.41';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -137,7 +137,7 @@ my $joinLists;      # flag set to join list values into a single string
 my $json;           # flag for JSON/PHP output format (1=JSON, 2=PHP)
 my $listItem;       # item number for extracting single item from a list
 my $listSep;        # list item separator (', ' by default)
-my $mainTool;       # main ExifTool object
+my $mt;             # main ExifTool object
 my $multiFile;      # non-zero if we are scanning multiple files
 my $outFormat;      # -1=Canon format, 0=same-line, 1=tag names, 2=values only
 my $outOpt;         # output file or directory name
@@ -237,7 +237,14 @@ sub Exit {
     exit shift;
 }
 # my warning and error routines (NEVER say "die"!)
-sub Warn  { warn(@_) if $quiet < 2 or $_[0] =~ /^Error/; }
+sub Warn  {
+    if ($quiet < 2 or $_[0] =~ /^Error/) {
+        my $oldWarn = $SIG{'__WARN__'};
+        delete $SIG{'__WARN__'};
+        warn(@_);
+        $SIG{'__WARN__'} = $oldWarn if defined $oldWarn;
+    }
+}
 sub Error { Warn @_; $rtnVal = 1; }
 sub WarnOnce($) {
     Warn(@_) and $warnedOnce{$_[0]} = 1 unless $warnedOnce{$_[0]};
@@ -315,7 +322,7 @@ $rtnVal = 0 unless defined $rtnVal;
 
 # initialize necessary static file-scope variables
 # (not done: @commonArgs, @moreArgs, $critical, $binaryStdout, $helped,
-#  $interrupted, $mainTool, $pause, $rtnVal, $stayOpen, $stayOpenBuff, $stayOpenFile)
+#  $interrupted, $mt, $pause, $rtnVal, $stayOpen, $stayOpenBuff, $stayOpenFile)
 undef @csvFiles;
 undef @csvTags;
 undef @delFiles;
@@ -428,14 +435,14 @@ if ($^O eq 'MSWin32' and eval 'require File::Glob') {
     $doGlob = 1;
 }
 
-$mainTool = new Image::ExifTool;        # create ExifTool object
+$mt = new Image::ExifTool;      # create ExifTool object
 
 # don't extract duplicates by default unless set by UserDefined::Options
-$mainTool->Options(Duplicates => 0) unless %Image::ExifTool::UserDefined::Options
+$mt->Options(Duplicates => 0) unless %Image::ExifTool::UserDefined::Options
     and defined $Image::ExifTool::UserDefined::Options{Duplicates};
 
 # default is to join lists if the List option was set in the config file
-$joinLists = 1 if defined $mainTool->Options('List') and not $mainTool->Options('List');
+$joinLists = 1 if defined $mt->Options('List') and not $mt->Options('List');
 
 # parse command-line options in 2 passes...
 # pass 1: set all of our ExifTool options
@@ -619,13 +626,20 @@ for (;;) {
         unshift @ARGV, @newArgs;
         next;
     }
-    /^(-?)(a|duplicates)$/i and $mainTool->Options(Duplicates => ($1 ? 0 : 1)), next;
+    /^(-?)(a|duplicates)$/i and $mt->Options(Duplicates => ($1 ? 0 : 1)), next;
+    if ($a eq 'api') {
+        my $opt = shift;
+        defined $opt or Error("Expected OPT[=VAL] argument for -api option\n"), $badCmd=1, next;
+        my $val = ($opt =~ s/=(.*)//) ? $1 : 1;
+        $mt->Options($opt => (length($val) ? $val : undef));
+        next;
+    }
     /^arg(s|format)$/i and $argFormat = 1, next;
-    /^b(inary)?$/i and $mainTool->Options(Binary => 1), $binaryOutput = 1, next;
+    /^b(inary)?$/i and $mt->Options(Binary => 1), $binaryOutput = 1, next;
     if (/^c(oordFormat)?$/i) {
         my $fmt = shift;
         $fmt or Error("Expecting coordinate format for -c option\n"), $badCmd=1, next;
-        $mainTool->Options('CoordFormat', $fmt);
+        $mt->Options('CoordFormat', $fmt);
         next;
     }
     if ($a eq 'charset') {
@@ -637,14 +651,14 @@ for (;;) {
             PrintTagList('Available character sets', sort keys %charsets);
             $helped = 1;
         } elsif ($charset !~ s/^(\w+)=// or lc($1) eq 'exiftool') {
-            $mainTool->Options(Charset => $charset);
-            $utf8 = ($mainTool->Options('Charset') eq 'UTF8');
+            $mt->Options(Charset => $charset);
+            $utf8 = ($mt->Options('Charset') eq 'UTF8');
         } else {
             # set internal encoding of specified metadata type
             my $type = { id3 => 'ID3', iptc => 'IPTC', exif => 'EXIF',
                          photoshop => 'Photoshop', quicktime => 'QuickTime' }->{lc $1};
             $type or Warn("Unknown type for -charset option: $1\n"), next;
-            $mainTool->Options("Charset$type" => $charset);
+            $mt->Options("Charset$type" => $charset);
         }
         next;
     }
@@ -676,13 +690,13 @@ for (;;) {
     if (/^d$/ or $a eq 'dateformat') {
         my $fmt = shift;
         $fmt or Error("Expecting date format for -d option\n"), $badCmd=1, next;
-        $mainTool->Options('DateFormat', $fmt);
+        $mt->Options('DateFormat', $fmt);
         next;
     }
     (/^D$/ or $a eq 'decimal') and $showTagID = 'D', next;
     /^delete_original(!?)$/i and $deleteOrig = ($1 ? 2 : 1), next;
-    (/^e$/ or $a eq '-composite') and $mainTool->Options(Composite => 0), next;
-    (/^-e$/ or $a eq 'composite') and $mainTool->Options(Composite => 1), next;
+    (/^e$/ or $a eq '-composite') and $mt->Options(Composite => 0), next;
+    (/^-e$/ or $a eq 'composite') and $mt->Options(Composite => 1), next;
     (/^E$/ or $a eq 'escapehtml') and require Image::ExifTool::HTML and $escapeHTML = 1, next;
     ($a eq 'ex' or $a eq 'escapexml') and $escapeXML = 1, next;
     if (/^echo(\d)?$/i) {
@@ -699,8 +713,8 @@ for (;;) {
         next;
     }
     if (/^(ee|extractembedded)$/i) {
-        $mainTool->Options(ExtractEmbedded => 1);
-        $mainTool->Options(Duplicates => 1);
+        $mt->Options(ExtractEmbedded => 1);
+        $mt->Options(Duplicates => 1);
         next;
     }
     # (-execute handled at top of loop)
@@ -714,30 +728,30 @@ for (;;) {
         next;
     }
     if (/^f$/ or $a eq 'forceprint') {
-        $forcePrint = $mainTool->Options('MissingTagValue');
+        $forcePrint = $mt->Options('MissingTagValue');
         unless (defined $forcePrint) {
             $forcePrint = '-';
-            $mainTool->Options(MissingTagValue => '-');
+            $mt->Options(MissingTagValue => '-');
         }
         next;
     }
     if (/^F([-+]?\d*)$/ or /^fixbase([-+]?\d*)$/i) {
-        $mainTool->Options(FixBase => $1);
+        $mt->Options(FixBase => $1);
         next;
     }
     if (/^fast(\d*)$/i) {
-        $mainTool->Options(FastScan => (length $1 ? $1 : 1));
+        $mt->Options(FastScan => (length $1 ? $1 : 1));
         next;
     }
     if ($a eq 'fileorder') {
         push @fileOrder, shift if @ARGV;
         next;
     }
-    $a eq 'globaltimeshift' and $mainTool->Options(GlobalTimeShift => shift), next;
+    $a eq 'globaltimeshift' and $mt->Options(GlobalTimeShift => shift), next;
     if (/^(g)(roupHeadings|roupNames)?([\d:]*)$/i) {
         $showGroup = $3 || 0;
         $allGroup = ($2 ? lc($2) eq 'roupnames' : $1 eq 'G');
-        $mainTool->Options(SavePath => 1) if $showGroup =~ /\b5\b/;
+        $mt->Options(SavePath => 1) if $showGroup =~ /\b5\b/;
         next;
     }
     if ($a eq 'geotag') {
@@ -764,7 +778,7 @@ for (;;) {
     if (/^htmldump([-+]?\d+)?$/i) {
         $verbose = ($verbose || 0) + 1;
         $html = 2;
-        $mainTool->Options(HtmlDumpBase => $1) if defined $1;
+        $mt->Options(HtmlDumpBase => $1) if defined $1;
         next;
     }
     if (/^i(gnore)?$/i) {
@@ -798,7 +812,7 @@ for (;;) {
             $csvAdd = 2 if $1 eq '+=';
             $vout = \*STDERR if $srcStdin;
             $verbose and print $vout "Reading JSON file $jsonFile\n";
-            my $chset = $mainTool->Options('Charset');
+            my $chset = $mt->Options('Charset');
             require Image::ExifTool::Import;
             my $msg = Image::ExifTool::Import::ReadJSON($jsonFile, \%database, $forcePrint, $chset);
             $msg and Warn("$msg\n");
@@ -807,28 +821,28 @@ for (;;) {
         } else {
             $json = 1;
             $html = $xml = 0;
-            $mainTool->Options(Duplicates => 1);
+            $mt->Options(Duplicates => 1);
             require Image::ExifTool::XMP;   # for FixUTF8()
         }
         next;
     }
     /^(k|pause)$/i and $pause = 1, next;
     (/^l$/ or $a eq 'long') and --$outFormat, next;
-    (/^L$/ or $a eq 'latin') and $utf8 = 0, $mainTool->Options(Charset => 'Latin'), next;
+    (/^L$/ or $a eq 'latin') and $utf8 = 0, $mt->Options(Charset => 'Latin'), next;
     if ($a eq 'lang') {
         my $lang = (@ARGV and $ARGV[0] !~ /^-/) ? shift : undef;
         if ($lang) {
             # make lower case and use underline as a separator (ie. 'en_ca')
             $lang =~ tr/-A-Z/_a-z/;
-            $mainTool->Options(Lang => $lang);
-            next if $lang eq $mainTool->Options('Lang');
+            $mt->Options(Lang => $lang);
+            next if $lang eq $mt->Options('Lang');
         } else {
             $pass or push(@nextPass, '-lang'), next;
         }
         my $langs = "Available languages:\n";
         $langs .= "  $_ - $Image::ExifTool::langName{$_}\n" foreach @Image::ExifTool::langs;
         $langs =~ tr/_/-/;  # display dashes instead of underlines in language codes
-        $langs = $mainTool->Decode($langs, 'UTF8');
+        $langs = $mt->Decode($langs, 'UTF8');
         $langs = Image::ExifTool::HTML::EscapeHTML($langs) if $escapeHTML;
         $lang and Error("Invalid or unsupported language '$lang'.\n$langs"), $badCmd=1, next;
         print $langs;
@@ -840,9 +854,9 @@ for (;;) {
         defined $listItem or Warn("Expecting index for -listItem option\n");
         next;
     }
-    /^(m|ignoreminorerrors)$/i and $mainTool->Options(IgnoreMinorErrors => 1), next;
-    /^(n|-printconv)$/i and $mainTool->Options(PrintConv => 0), next;
-    /^(-n|printconv)$/i and $mainTool->Options(PrintConv => 1), next;
+    /^(m|ignoreminorerrors)$/i and $mt->Options(IgnoreMinorErrors => 1), next;
+    /^(n|-printconv)$/i and $mt->Options(PrintConv => 0), next;
+    /^(-n|printconv)$/i and $mt->Options(PrintConv => 1), next;
     if (/^o(ut)?$/i) {
         $outOpt = shift;
         defined $outOpt or Error("Expected output file or directory name for -o option\n"), $badCmd=1, next;
@@ -855,7 +869,7 @@ for (;;) {
     /^overwrite_original_in_place$/i and $overwriteOrig = 2, next;
     (/^p$/ or $a eq 'printformat') and LoadPrintFormat(shift), next;
     (/^P$/ or $a eq 'preserve') and $preserveTime = 1, next;
-    /^password$/i and $mainTool->Options(Password => shift), next;
+    /^password$/i and $mt->Options(Password => shift), next;
     if ($a eq 'progress') {
         $progress = 0;
         $verbose = 0 unless defined $verbose;
@@ -879,11 +893,11 @@ for (;;) {
     /^restore_original$/i and $deleteOrig = 0, next;
     (/^S$/ or $a eq 'veryshort') and $outFormat+=2, next;
     /^s(hort)?(\d*)$/i and $outFormat = $2 eq '' ? $outFormat + 1 : $2, next;
-    /^scanforxmp$/i and $mainTool->Options(ScanForXMP => 1), next;
+    /^scanforxmp$/i and $mt->Options(ScanForXMP => 1), next;
     if (/^sep(arator)?$/i) {
         $listSep = shift;
         defined $listSep or Error("Expecting list item separator for -sep option\n"), $badCmd=1, next;
-        $mainTool->Options(ListSep => $listSep);
+        $mt->Options(ListSep => $listSep);
         $joinLists = 1;
         # also split when writing values
         my $listSplit = quotemeta $listSep;
@@ -891,7 +905,7 @@ for (;;) {
         $listSplit =~ s/(\\ )+/\\s\*/g;
         # but a single space alone matches one or more whitespace characters
         $listSplit = '\\s+' if $listSplit eq '\\s*';
-        $mainTool->Options(ListSplit => $listSplit);
+        $mt->Options(ListSplit => $listSplit);
         next;
     }
     /^sort$/i and $sortOpt = 1, next;
@@ -928,7 +942,7 @@ for (;;) {
     }
     if (/^(-)?struct$/i) {
         $structOpt = $1 ? 0 : 1;
-        $mainTool->Options(Struct => $structOpt);
+        $mt->Options(Struct => $structOpt);
         # require XMPStruct in case we need to serialize a structure
         require 'Image/ExifTool/XMPStruct.pl' if $structOpt;
         next;
@@ -936,16 +950,16 @@ for (;;) {
     /^t(ab)?$/  and $tabFormat = 1, next;
     if (/^T$/ or $a eq 'table') {
         $tabFormat = 1; $outFormat+=2; ++$quiet;
-        $forcePrint = $mainTool->Options('MissingTagValue');
+        $forcePrint = $mt->Options('MissingTagValue');
         unless (defined $forcePrint) {
             $forcePrint = '-';
-            $mainTool->Options(MissingTagValue => '-');
+            $mt->Options(MissingTagValue => '-');
         }
         next;
     }
     if (/^(u)(nknown(2)?)?$/i) {
         my $inc = ($3 or (not $2 and $1 eq 'U')) ? 2 : 1;
-        $mainTool->Options(Unknown => $mainTool->Options('Unknown') + $inc);
+        $mt->Options(Unknown => $mt->Options('Unknown') + $inc);
         next;
     }
     if ($a eq 'use') {
@@ -957,7 +971,6 @@ for (;;) {
                 eval "require $module" or
                 eval "require '$module'")
         {
-            delete $SIG{'__WARN__'};
             Error("Error using module $module\n");
             $badCmd = 1;
         }
@@ -995,7 +1008,7 @@ for (;;) {
         my $wm = shift;
         defined $wm or Error("Expecting argument for -$_ option\n"), $badCmd=1, next;
         $wm =~ /^[wcg]*$/i or Error("Invalid argument for -$_ option\n"), $badCmd=1, next;
-        $mainTool->Options(WriteMode => $wm);
+        $mt->Options(WriteMode => $wm);
         next;
     }
     if (/^x$/ or $a eq 'exclude') {
@@ -1009,14 +1022,14 @@ for (;;) {
         }
         next;
     }
-    (/^X$/ or $a eq 'xmlformat') and $xml = 1, $html = $json = 0, $mainTool->Options(Duplicates => 1), next;
+    (/^X$/ or $a eq 'xmlformat') and $xml = 1, $html = $json = 0, $mt->Options(Duplicates => 1), next;
     if (/^php$/i) {
         $json = 2;
         $html = $xml = 0;
-        $mainTool->Options(Duplicates=>1);
+        $mt->Options(Duplicates=>1);
         next;
     }
-    /^z(ip)?$/i and $doUnzip = 1, $mainTool->Options(Compress => 1, Compact => 1), next;
+    /^z(ip)?$/i and $doUnzip = 1, $mt->Options(Compress => 1, Compact => 1), next;
     $_ eq '' and push(@files, '-'), $srcStdin = 1, next;   # read STDIN
     length $_ eq 1 and $_ ne '*' and Error("Unknown option -$_\n"), $badCmd=1, next;
     if (/^[^<]+(<?)=(.*)/s) {
@@ -1078,11 +1091,11 @@ for (;;) {
 
 # set verbose output to STDERR if output could be to console
 $vout = \*STDERR if $srcStdin and ($isWriting or @newValues);
-$mainTool->Options(TextOut => $vout) if $vout eq \*STDERR;
+$mt->Options(TextOut => $vout) if $vout eq \*STDERR;
 
 # change default EXIF string encoding if MWG used
-if ($useMWG and not defined $mainTool->Options('CharsetEXIF')) {
-    $mainTool->Options(CharsetEXIF => 'UTF8');
+if ($useMWG and not defined $mt->Options('CharsetEXIF')) {
+    $mt->Options(CharsetEXIF => 'UTF8');
 }
 
 # print help
@@ -1152,24 +1165,24 @@ if ($textOut and $csv and $csv eq 'CSV' and not $isWriting) {
 
 if ($escapeHTML or $json) {
     # must be UTF8 for HTML conversion and JSON output
-    $mainTool->Options(Charset => 'UTF8');
+    $mt->Options(Charset => 'UTF8');
     # use Escape option to do our HTML escaping unless XML output
-    $mainTool->Options(Escape => 'HTML') if $escapeHTML and not $xml;
+    $mt->Options(Escape => 'HTML') if $escapeHTML and not $xml;
 } elsif ($escapeXML and not $xml) {
-    $mainTool->Options(Escape => 'XML');
+    $mt->Options(Escape => 'XML');
 }
 
 # set sort option
 if ($sortOpt) {
     # (note that -csv sorts alphabetically by default anyway if more than 1 file)
     my $sort = ($outFormat > 0 or $xml or $json or $csv) ? 'Tag' : 'Descr';
-    $mainTool->Options(Sort => $sort, Sort2 => $sort);
+    $mt->Options(Sort => $sort, Sort2 => $sort);
 }
 
 # set up for RDF/XML, JSON and PHP output formats
 if ($xml) {
     require Image::ExifTool::XMP;   # for EscapeXML()
-    my $charset = $mainTool->Options('Charset');
+    my $charset = $mt->Options('Charset');
     # standard XML encoding names for supported Charset settings
     # (ref http://www.iana.org/assignments/character-sets)
     my %encoding = (
@@ -1188,7 +1201,7 @@ if ($xml) {
     # switch to UTF-8 if we don't have a standard encoding name
     unless ($encoding{$charset}) {
         $charset = 'UTF8';
-        $mainTool->Options(Charset => $charset);
+        $mt->Options(Charset => $charset);
     }
     # set file header/trailer for XML output
     $fileHeader = "<?xml version='1.0' encoding='$encoding{$charset}'?>\n" .
@@ -1196,7 +1209,7 @@ if ($xml) {
     $fileTrailer = "</rdf:RDF>\n";
     # extract as a list unless short output format
     $joinLists = 1 if $outFormat > 0;
-    $mainTool->Options(List => 1) unless $joinLists;
+    $mt->Options(List => 1) unless $joinLists;
     $showGroup = $allGroup = 1;         # always show group 1
     # set binaryOutput flag to 0 or undef (0 = output encoded binary in XML)
     $binaryOutput = ($outFormat > 0 ? undef : 0) if $binaryOutput;
@@ -1215,10 +1228,10 @@ if ($xml) {
         #  to escape sequences in the strings)
         $binaryOutput = 0 if $binaryOutput;
     }
-    $mainTool->Options(List => 1) unless $joinLists;
-    $mainTool->Options(Duplicates => 0) unless defined $showGroup;
+    $mt->Options(List => 1) unless $joinLists;
+    $mt->Options(Duplicates => 0) unless defined $showGroup;
 } elsif ($structOpt) {
-    $mainTool->Options(List => 1);
+    $mt->Options(List => 1);
 } else {
     $joinLists = 1;     # join lists for all other unstructured output formats
 }
@@ -1249,9 +1262,9 @@ if ($verbose) {
     undef $binaryOutput unless $tagOut;    # disable conflicting option
     if ($html) {
         $html = 2;    # flag for html dump
-        $mainTool->Options(HtmlDump => $verbose);
+        $mt->Options(HtmlDump => $verbose);
     } else {
-        $mainTool->Options(Verbose => $verbose) unless $tagOut;
+        $mt->Options(Verbose => $verbose) unless $tagOut;
     }
 } elsif (defined $verbose) {
     # auto-flush output when -v0 is used
@@ -1277,7 +1290,7 @@ if (@newValues) {
         if (ref $_ eq 'HASH') {
             # save new values now if we stored a "SaveCount" marker
             if ($$_{SaveCount}) {
-                $saveCount = $mainTool->SaveNewValues();
+                $saveCount = $mt->SaveNewValues();
                 $needSave = 0;
                 # insert marker to load values from CSV file now if this was the CSV file
                 push @dynamicFiles, \$csv if $$_{SaveCount} == $csvSaveCount;
@@ -1309,7 +1322,7 @@ if (@newValues) {
                 $setTags = $setTagsList{$newVal}[$i] if $setTagsList{$newVal}[$i];
             }
             # set specified tags from this file
-            unless (DoSetFromFile($mainTool, $newVal, $setTags)) {
+            unless (DoSetFromFile($mt, $newVal, $setTags)) {
                 $rtnVal = 1;
                 next Command;
             }
@@ -1345,14 +1358,14 @@ if (@newValues) {
             # set $newVal to '' if deleting nothing
             $newVal = '' if $1 eq '-' and not defined $newVal;
         }
-        my ($rtn, $wrn) = $mainTool->SetNewValue($tag, $newVal, %opts);
+        my ($rtn, $wrn) = $mt->SetNewValue($tag, $newVal, %opts);
         $needSave = 1;
         ++$isWriting if $rtn;
         $wrn and Warn "Warning: $wrn\n";
     }
     # exclude specified tags
     foreach (@exclude) {
-        $mainTool->SetNewValue($_, undef, Replace => 2);
+        $mt->SetNewValue($_, undef, Replace => 2);
         $needSave = 1;
     }
     unless ($isWriting or $outOpt or @tags) {
@@ -1371,20 +1384,20 @@ if ($isWriting and @tags and not $outOpt) {
 }
 # save current state of new values if setting values from target file
 # or if we may be translating to a different format
-$mainTool->SaveNewValues() if $outOpt or (@dynamicFiles and $needSave);
+$mt->SaveNewValues() if $outOpt or (@dynamicFiles and $needSave);
 
 $multiFile = 1 if @files > 1;
-@exclude and $mainTool->Options(Exclude => \@exclude);
+@exclude and $mt->Options(Exclude => \@exclude);
 
 undef $binaryOutput if $html;
 
 if ($binaryOutput) {
     $outFormat = 99;    # shortest possible output format
-    $mainTool->Options(PrintConv => 0);
+    $mt->Options(PrintConv => 0);
     unless ($textOut or $binaryStdout) {
         binmode(STDOUT);
         $binaryStdout = 1;
-        $mainTool->Options(TextOut => ($vout = \*STDERR));
+        $mt->Options(TextOut => ($vout = \*STDERR));
     }
     # disable conflicting options
     undef $showGroup;
@@ -1392,7 +1405,7 @@ if ($binaryOutput) {
 
 # sort by groups to look nicer depending on options
 if (defined $showGroup and not (@tags and $allGroup)) {
-    $mainTool->Options(Sort => "Group$showGroup");
+    $mt->Options(Sort => "Group$showGroup");
 }
 
 if (defined $textOut) {
@@ -1420,14 +1433,14 @@ if ($outOpt) {
 }
 
 # set flag to fix description lengths if necessary
-$fixLen = ($utf8 and $mainTool->Options('Lang') ne 'en' and eval 'require Encode');
+$fixLen = ($utf8 and $mt->Options('Lang') ne 'en' and eval 'require Encode');
 
 # sort input files if specified
 if (@fileOrder) {
     my @allFiles;
     ProcessFiles(undef, \@allFiles);
     my $sortTool = new Image::ExifTool;
-    $sortTool->Options(PrintConv => $mainTool->Options('PrintConv'));
+    $sortTool->Options(PrintConv => $mt->Options('PrintConv'));
     $sortTool->Options(Duplicates => 0);
     my (%sortBy, %isFloat, @rev, $file);
     # save reverse sort flags
@@ -1469,22 +1482,24 @@ if (@fileOrder) {
 # set file count for progress message
 $progressMax = scalar @files if defined $progress;
 
-# store duplicate database information under canonical filenames
+# store duplicate database information under absolute path
 my @dbKeys = keys %database;
 if (@dbKeys and require Cwd) {
+    undef $evalWarning;
+    local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
     foreach (@dbKeys) {
-        my $canonFile = Cwd::abs_path($_);
-        if (defined $canonFile) {
-            $database{$canonFile} = $database{$_} unless $database{$canonFile};
+        my $absFile = Cwd::abs_path($_);
+        if (defined $absFile) {
+            $database{$absFile} = $database{$_} unless $database{$absFile};
         } else {
             # (may happen on Mac if the filename encoding is incorrect in the database)
-            Warn "Error generating canonical filename for $_\n";
+            Warn "Error generating absolute path for $_\n";
         }
     }
 }
 
 # process all specified files
-ProcessFiles($mainTool);
+ProcessFiles($mt);
 
 if ($filtered and not $validFile) {
     Warn "No file with specified extension\n";
@@ -1573,7 +1588,7 @@ Exit $rtnVal;   # all done
 # Inputs: 0) ExifTool object reference, 1) file name
 sub GetImageInfo($$)
 {
-    my ($exifTool, $orig) = @_;
+    my ($et, $orig) = @_;
     my (@foundTags, $info, $file, $ind);
 
     # determine the name of the source file based on the original input file name
@@ -1617,8 +1632,8 @@ sub GetImageInfo($$)
         # return all tags but explicitly mention tags on command line so
         # requested images will generate the appropriate warnings
         @foundTags = ('*', @tags) if @tags;
-        $info = $exifTool->ImageInfo(Infile($pipe,$isWriting), \@foundTags, $opts);
-        my $cond = $exifTool->InsertTagValues(\@foundTags, $condition, \%info);
+        $info = $et->ImageInfo(Infile($pipe,$isWriting), \@foundTags, $opts);
+        my $cond = $et->InsertTagValues(\@foundTags, $condition, \%info);
 
         #### eval "-if" condition (%info)
         my $result = eval $cond;
@@ -1630,7 +1645,6 @@ sub GetImageInfo($$)
             if ($verbose) {
                 chomp $evalWarning;
                 $evalWarning =~ s/ at \(eval .*//s;
-                delete $SIG{'__WARN__'};
                 Warn "Condition: $evalWarning - $file\n";
             }
         }
@@ -1667,19 +1681,19 @@ sub GetImageInfo($$)
         $fp or ++$countBad, return;
         # delete file if we exit prematurely (unless appending)
         $tmpText = $outfile unless $append;
-        $exifTool->Options(TextOut => $fp);
+        $et->Options(TextOut => $fp);
     }
 
     if ($isWriting) {
         print $vout "======== $file$progStr\n" if defined $verbose;
-        SetImageInfo($exifTool, $file, $orig);
-        $info = $exifTool->GetInfo('Warning', 'Error');
-        PrintErrors($exifTool, $info, $file);
+        SetImageInfo($et, $file, $orig);
+        $info = $et->GetInfo('Warning', 'Error');
+        PrintErrors($et, $info, $file);
         # close output text file if necessary
         if ($outfile) {
             undef $tmpText;
             close($fp);
-            $exifTool->Options(TextOut => $vout);
+            $et->Options(TextOut => $vout);
             if ($info->{Error}) {
                 unlink $outfile;    # erase bad file
             } elsif ($append) {
@@ -1715,25 +1729,25 @@ sub GetImageInfo($$)
         # get the information we wanted
         if (@tags and not %printFmt) {
             @foundTags = @tags;
-            $info = $exifTool->GetInfo(\@foundTags);
+            $info = $et->GetInfo(\@foundTags);
         }
     } else {
         # request specified tags unless using print format option
-        my $oldDups = $exifTool->Options('Duplicates');
+        my $oldDups = $et->Options('Duplicates');
         if (%printFmt) {
-            $exifTool->Options(Duplicates => 1);
-            $exifTool->Options(RequestAll => 1);
+            $et->Options(Duplicates => 1);
+            $et->Options(RequestAll => 1);
         } else {
             @foundTags = @tags;
         }
         # extract the information
-        $info = $exifTool->ImageInfo(Infile($pipe), \@foundTags);
-        $exifTool->Options(Duplicates => $oldDups);
+        $info = $et->ImageInfo(Infile($pipe), \@foundTags);
+        $et->Options(Duplicates => $oldDups);
     }
     # all done now if we already wrote output text file (ie. verbose option)
     if ($fp) {
         if ($outfile) {
-            $exifTool->Options(TextOut => \*STDOUT);
+            $et->Options(TextOut => \*STDOUT);
             undef $tmpText;
             if ($info->{Error}) {
                 close($fp);
@@ -1753,9 +1767,9 @@ sub GetImageInfo($$)
     # (because we are likely ignoring them and piping stdout to file)
     # or if there is none of the requested information available
     if ($binaryOutput or not %$info) {
-        my $errs = $exifTool->GetInfo('Warning', 'Error');
-        PrintErrors($exifTool, $errs, $file) and $rtnVal = 1;
-    } elsif ($exifTool->GetValue('Error')) {
+        my $errs = $et->GetInfo('Warning', 'Error');
+        PrintErrors($et, $errs, $file) and $rtnVal = 1;
+    } elsif ($et->GetValue('Error')) {
         $rtnVal = 1;
     }
 
@@ -1772,7 +1786,7 @@ sub GetImageInfo($$)
         my ($type, $doc, $grp);
         undef $fileTrailer;
         # repeat for each embedded document if necessary
-        my $lastDoc = $exifTool->Options('ExtractEmbedded') ? $exifTool->{DOC_COUNT} : 0;
+        my $lastDoc = $et->Options('ExtractEmbedded') ? $$et{DOC_COUNT} : 0;
         foreach $type ('HEAD', 'BODY', 'TAIL') {
             my $prf = $printFmt{$type} or next;
             for ($doc=0; $doc<=$lastDoc; ++$doc) {
@@ -1790,7 +1804,7 @@ sub GetImageInfo($$)
                 }
                 my @lines;
                 foreach (@$prf) {
-                    my $line = $exifTool->InsertTagValues(\@foundTags, $_, 'Warn');
+                    my $line = $et->InsertTagValues(\@foundTags, $_, 'Warn');
                     push @lines, $line if defined $line;
                 }
                 $lineCount += scalar @lines;
@@ -1803,8 +1817,8 @@ sub GetImageInfo($$)
             }
         }
         delete $printFmt{HEAD} unless $outfile; # print header only once per output file
-        my $errs = $exifTool->GetInfo('Warning', 'Error');
-        PrintErrors($exifTool, $errs, $file);
+        my $errs = $et->GetInfo('Warning', 'Error');
+        PrintErrors($et, $errs, $file);
     } elsif (not $disableOutput) {
         my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep);
         if ($fp) {
@@ -1824,7 +1838,7 @@ sub GetImageInfo($$)
                 # define namespaces for all tag groups
                 my %groups;
                 foreach $tag (@foundTags) {
-                    my ($grp, $grp1) = $exifTool->GetGroup($tag);
+                    my ($grp, $grp1) = $et->GetGroup($tag);
                     unless ($grp1) {
                         next unless defined $forcePrint;
                         $grp = $grp1 = 'Unknown';
@@ -1853,7 +1867,7 @@ sub GetImageInfo($$)
         }
         # suppress duplicates manually in JSON and short XML output
         my $noDups = ($json or ($xml and $outFormat > 0));
-        my $printConv = $mainTool->Options('PrintConv');
+        my $printConv = $mt->Options('PrintConv');
         my $lastGroup = '';
 TAG:    foreach $tag (@foundTags) {
             my $tagName = GetTagName($tag);
@@ -1863,7 +1877,7 @@ TAG:    foreach $tag (@foundTags) {
             if (ref $val) {
                 if (defined $binaryOutput and not $binaryOutput) { # happens with -X -b or -php -b
                     # avoid extracting Protected binary tags (ie. data blocks) [insider information]
-                    next if $exifTool->{TAG_INFO}{$tag}{Protected};
+                    next if $$et{TAG_INFO}{$tag}{Protected};
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
                 if ($structOpt) {
@@ -1896,11 +1910,11 @@ TAG:    foreach $tag (@foundTags) {
                 }
             }
             if (defined $showGroup) {
-                $group = $exifTool->GetGroup($tag, $showGroup);
+                $group = $et->GetGroup($tag, $showGroup);
                 # look ahead to see if this tag may suppress a priority tag in
                 # the same group, and if so suppress this tag instead
                 next if $noDups and $tag =~ /^(.*?) ?\(/ and defined $$info{$1} and
-                        $group eq $exifTool->GetGroup($1, $showGroup);
+                        $group eq $et->GetGroup($1, $showGroup);
                 $group = 'Unknown' if not $group and ($xml or $json);
                 if ($fp and not ($allGroup or $csv)) {
                     if ($lastGroup ne $group) {
@@ -1930,14 +1944,14 @@ TAG:    foreach $tag (@foundTags) {
             for (;;) {
                 if ($tagOut) {
                     # determine suggested extension for output file
-                    my $ext = SuggestedExtension($exifTool, \$val, $tagName);
+                    my $ext = SuggestedExtension($et, \$val, $tagName);
                     if (%wext and ($wext{$ext} || $wext{'*'} || -1) < 0) {
                         if ($verbose and $verbose > 1) {
                             print $vout "Not writing $ext output file for $tagName\n";
                         }
                         next TAG;
                     }
-                    my @groups = $mainTool->GetGroup($tag);
+                    my @groups = $mt->GetGroup($tag);
                     $outfile and close($fp), undef($tmpText); # (shouldn't happen)
                     ($fp, $outfile, $append) = OpenOutputFile($orig, $tagName, \@groups, $ext);
                     $fp or ++$countBad, next TAG;
@@ -1992,7 +2006,7 @@ TAG:    foreach $tag (@foundTags) {
             }
 
             # get description if we need it (use tag name if $outFormat > 0)
-            my $desc = $outFormat > 0 ? $tagName : $exifTool->GetDescription($tag);
+            my $desc = $outFormat > 0 ? $tagName : $et->GetDescription($tag);
 
             if ($xml) {
                 # RDF/XML output format
@@ -2020,7 +2034,7 @@ TAG:    foreach $tag (@foundTags) {
                 }
                 my ($xtra, $valNum, $descClose);
                 if ($showTagID) {
-                    my ($id, $lang) = $exifTool->GetTagID($tag);
+                    my ($id, $lang) = $et->GetTagID($tag);
                     if ($id =~ /^\d+$/) {
                         $id = sprintf("0x%.4x", $id) if $showTagID eq 'H';
                     } else {
@@ -2032,8 +2046,8 @@ TAG:    foreach $tag (@foundTags) {
                     $xtra = '';
                 }
                 if ($tabFormat) {
-                    my $table = $exifTool->GetTableName($tag);
-                    my $index = $exifTool->GetTagIndex($tag);
+                    my $table = $et->GetTableName($tag);
+                    my $index = $et->GetTagIndex($tag);
                     $xtra .= " et:table='$table'";
                     $xtra .= " et:index='$index'" if defined $index;
                 }
@@ -2060,7 +2074,7 @@ TAG:    foreach $tag (@foundTags) {
                         if ($printConv) {
                             # print PrintConv value
                             print $fp "\n   <et:prt$val</et:prt>";
-                            $val = $exifTool->GetValue($tag, 'ValueConv');
+                            $val = $et->GetValue($tag, 'ValueConv');
                             $val = '' unless defined $val;
                             # go back to print ValueConv value only if different
                             next unless IsEqual($val, $lastVal);
@@ -2086,14 +2100,14 @@ TAG:    foreach $tag (@foundTags) {
                 if ($showTagID or $outFormat < 0) {
                     $val = { val => $val };
                     if ($showTagID) {
-                        my $id = $exifTool->GetTagID($tag);
+                        my $id = $et->GetTagID($tag);
                         $id = sprintf('0x%.4x', $id) if $showTagID eq 'H' and $id =~ /^\d+$/;
                         $$val{id} = $id;
                     }
                     if ($outFormat < 0) {
                         $$val{desc} = $desc;
                         if ($printConv) {
-                            my $num = $exifTool->GetValue($tag, 'ValueConv');
+                            my $num = $et->GetValue($tag, 'ValueConv');
                             $$val{num} = $num unless IsEqual($num, $$val{val});
                         }
                     }
@@ -2104,7 +2118,7 @@ TAG:    foreach $tag (@foundTags) {
             }
             my $id;
             if ($showTagID) {
-                $id = $exifTool->GetTagID($tag);
+                $id = $et->GetTagID($tag);
                 if ($id =~ /^(\d+)(\.\d+)?$/) { # only print numeric ID's
                     $id = sprintf("0x%.4x", $1) if $showTagID eq 'H';
                 } else {
@@ -2228,15 +2242,15 @@ TAG:    foreach $tag (@foundTags) {
 # Returns: true on success
 sub SetImageInfo($$$)
 {
-    my ($exifTool, $file, $orig) = @_;
+    my ($et, $file, $orig) = @_;
     my ($outfile, $restored, $isTemporary, $isStdout, $outType, $tagsFromSrc);
     my $infile = $file;    # save infile in case we change it again
 
     undef $tmpFile; # make sure this isn't defined
 
     # clear any existing errors or warnings since we check these on return
-    delete $exifTool->{VALUE}->{Error};
-    delete $exifTool->{VALUE}->{Warning};
+    delete $$et{VALUE}{Error};
+    delete $$et{VALUE}{Warning};
 
     # first, try to determine our output file name so we can return quickly
     # if it already exists (note: this test must be delayed until after we
@@ -2272,7 +2286,7 @@ sub SetImageInfo($$$)
                 }
                 if ($file ne '') {
                     # restore previous new values unless done already
-                    $exifTool->RestoreNewValues() unless $restored;
+                    $et->RestoreNewValues() unless $restored;
                     $restored = 1;
                     # translate to this type by setting specified tags from file
                     my @setTags = @tags;
@@ -2288,7 +2302,7 @@ sub SetImageInfo($$$)
                     # assume "-tagsFromFile @" unless -tagsFromFile already specified
                     # (%setTags won't be empty if -tagsFromFile used)
                     if (not %setTags or (@setTags and not $setTags{'@'})) {
-                        return 0 unless DoSetFromFile($exifTool, $file, \@setTags);
+                        return 0 unless DoSetFromFile($et, $file, \@setTags);
                     } elsif (@setTags) {
                         # add orphaned tags to existing "-tagsFromFile @" for this file only
                         push @setTags, @{$setTags{'@'}};
@@ -2313,7 +2327,7 @@ sub SetImageInfo($$$)
     # set tags from destination file if required
     if (@dynamicFiles) {
         # restore previous values if necessary
-        $exifTool->RestoreNewValues() unless $restored;
+        $et->RestoreNewValues() unless $restored;
         my ($dyFile, %setTagsIndex);
         foreach $dyFile (@dynamicFiles) {
             if (not ref $dyFile) {
@@ -2334,7 +2348,7 @@ sub SetImageInfo($$$)
                     $setTags = $setTagsList{$dyFile}[$i] if $setTagsList{$dyFile}[$i];
                 }
                 # set new values values from file
-                return 0 unless DoSetFromFile($exifTool, $fromFile, $setTags);
+                return 0 unless DoSetFromFile($et, $fromFile, $setTags);
             } elsif (ref $dyFile eq 'ARRAY') {
                 # a dynamic file containing a simple tag value
                 my $fname = FilenameSPrintf($$dyFile[1], $orig);
@@ -2342,29 +2356,32 @@ sub SetImageInfo($$$)
                 my $opts = $$dyFile[2];
                 if (defined $fname and SlurpFile($fname, \$buff)) {
                     $verbose and print $vout "Reading $$dyFile[0] from $fname\n";
-                    ($rtn, $wrn) = $mainTool->SetNewValue($$dyFile[0], $buff, %$opts);
+                    ($rtn, $wrn) = $mt->SetNewValue($$dyFile[0], $buff, %$opts);
                     $wrn and Warn "$wrn\n";
                 }
                 # remove this tag if we couldn't set it properly
-                $rtn or $mainTool->SetNewValue($$dyFile[0], undef, Replace => 2,
-                                               ProtectSaved => $$opts{ProtectSaved});
+                $rtn or $mt->SetNewValue($$dyFile[0], undef, Replace => 2,
+                                         ProtectSaved => $$opts{ProtectSaved});
                 next;
             } elsif (ref $dyFile eq 'SCALAR') {
                 # set new values from CSV database
                 my ($f, $found, $tag);
+                undef $evalWarning;
+                local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
                 # read tags for SourceFile '*' plus the specific file
                 foreach $f ('*', $file) {
                     my $csvInfo = $database{$f};
                     unless ($csvInfo) {
                         next if $f eq '*' or not require Cwd;
-                        # check canonical file name
-                        $csvInfo = $database{Cwd::abs_path($f)} or next;
+                        # check absolute path
+                        my $absPath = Cwd::abs_path($f);
+                        next unless defined $absPath and $csvInfo = $database{$absPath};
                     }
                     $found = 1;
                     $verbose and print $vout "Setting new values from $csv database\n";
                     foreach $tag (sort keys %$csvInfo) {
                         next if $tag =~ /\b(SourceFile|Directory|FileName)$/i; # don't write these
-                        my ($rtn, $wrn) = $mainTool->SetNewValue($tag, $$csvInfo{$tag},
+                        my ($rtn, $wrn) = $mt->SetNewValue($tag, $$csvInfo{$tag},
                                           Protected => 1, AddValue => $csvAdd,
                                           ProtectSaved => $csvSaveCount);
                         $wrn and Warn "$wrn\n" if $verbose;
@@ -2373,8 +2390,8 @@ sub SetImageInfo($$$)
                 unless ($found) {
                     Warn("No SourceFile '$file' in imported $csv database\n");
                     if (require Cwd) {
-                        my $cFile = Cwd::abs_path($file);
-                        Warn("(canonical path: '$cFile')\n");
+                        my $absFile = Cwd::abs_path($file);
+                        Warn("(absolute path: '$absFile')\n") if defined $absFile;
                     }
                     return 0;
                 }
@@ -2390,21 +2407,21 @@ sub SetImageInfo($$$)
         }
     } else {
         # determine what our output file name should be
-        my $newFileName = $exifTool->GetNewValues('FileName');
-        my $newDir = $exifTool->GetNewValues('Directory');
+        my $newFileName = $et->GetNewValues('FileName');
+        my $newDir = $et->GetNewValues('Directory');
         if (defined $newFileName or defined $newDir or ($doSetFileName and defined $outfile)) {
             if ($newFileName) {
                 $newFileName = FilenameSPrintf($newFileName, $orig);
                 if (defined $outfile) {
-                    $outfile = Image::ExifTool::GetNewFileName($orig, $outfile) if $orig ne '';
+                    $outfile = Image::ExifTool::GetNewFileName($file, $outfile) if $file ne '';
                     $outfile = Image::ExifTool::GetNewFileName($outfile, $newFileName);
-                } elsif ($orig ne '') {
-                    $outfile = Image::ExifTool::GetNewFileName($orig, $newFileName);
+                } elsif ($file ne '') {
+                    $outfile = Image::ExifTool::GetNewFileName($file, $newFileName);
                 }
             }
             if ($newDir) {
                 $newDir = FilenameSPrintf($newDir, $orig);
-                $outfile = Image::ExifTool::GetNewFileName(defined $outfile ? $outfile : $orig, $newDir);
+                $outfile = Image::ExifTool::GetNewFileName(defined $outfile ? $outfile : $file, $newDir);
             }
             $outfile = NextUnusedFilename($outfile, $infile);
             if (-e $outfile) {
@@ -2425,7 +2442,7 @@ sub SetImageInfo($$$)
         }
         unless (defined $tmpFile) {
             # count the number of tags and pseudo-tags we are writing
-            my ($numSet, $numPseudo) = $exifTool->CountNewValues();
+            my ($numSet, $numPseudo) = $et->CountNewValues();
             if (-e $file) {
                 unless ($numSet) {
                     # no need to write if no tags set
@@ -2453,10 +2470,10 @@ sub SetImageInfo($$$)
             }
             # quickly rename file and/or set file date if this is all we are doing
             if ($numSet == $numPseudo) {
-                my $r1 = $exifTool->SetFileModifyDate($file,undef,'FileCreateDate');
-                my $r2 = $exifTool->SetFileModifyDate($file);
+                my $r1 = $et->SetFileModifyDate($file,undef,'FileCreateDate');
+                my $r2 = $et->SetFileModifyDate($file);
                 my $r3 = 0;
-                $r3 = $exifTool->SetFileName($file, $outfile) if defined $outfile;
+                $r3 = $et->SetFileName($file, $outfile) if defined $outfile;
                 if ($r1 > 0 or $r2 > 0 or $r3 > 0) {
                     ++$countGoodWr;
                 } elsif ($r1 < 0 or $r2 < 0 or $r3 < 0) {
@@ -2482,7 +2499,7 @@ sub SetImageInfo($$$)
         }
     }
     # rewrite the file
-    my $success = $exifTool->WriteInfo(Infile($file), $outfile, $outType);
+    my $success = $et->WriteInfo(Infile($file), $outfile, $outType);
 
     # get file time if preserving it
     my ($aTime, $mTime, $cTime);
@@ -2889,9 +2906,9 @@ sub Infile($;$)
 sub DoSetFromFile($$$)
 {
     local $_;
-    my ($exifTool, $file, $setTags) = @_;
+    my ($et, $file, $setTags) = @_;
     $verbose and print $vout "Setting new values from $file\n";
-    my $info = $exifTool->SetNewValuesFromFile(Infile($file,1), @$setTags);
+    my $info = $et->SetNewValuesFromFile(Infile($file,1), @$setTags);
     my $numSet = scalar(keys %$info);
     if ($$info{Error}) {
         # delete all error and warning tags
@@ -2908,7 +2925,7 @@ sub DoSetFromFile($$$)
         ++$warns while $$info{"Warning ($warns)"};
         $numSet -= $warns;
     }
-    PrintErrors($exifTool, $info, $file) and ++$countBadWr, return 0;
+    PrintErrors($et, $info, $file) and ++$countBadWr, return 0;
     Warn "Warning: No writable tags set from $file\n" unless $numSet;
     return 1;
 }
@@ -2928,7 +2945,7 @@ sub CleanFilename($)
 # Notes: arg 0 is not used if arg 1 is defined
 sub ProcessFiles($;$)
 {
-    my ($exifTool, $list) = @_;
+    my ($et, $list) = @_;
     my $file;
     foreach $file (@files) {
         if (defined $progressMax) {
@@ -2937,7 +2954,7 @@ sub ProcessFiles($;$)
         }
         if (-d $file) {
             $multiFile = $validFile = 1;
-            ScanDir($mainTool, $file, $list);
+            ScanDir($mt, $file, $list);
         } elsif ($filterFlag and not AcceptFile($file)) {
             if (-e $file) {
                 $filtered = 1;
@@ -2949,7 +2966,7 @@ sub ProcessFiles($;$)
         } else {
             $validFile = 1;
             $list and push(@$list, $file), next;
-            GetImageInfo($exifTool, $file);
+            GetImageInfo($et, $file);
         }
     }
 }
@@ -2959,7 +2976,7 @@ sub ProcessFiles($;$)
 # Inputs: 0) ExifTool ref, 1) directory name, 2) list ref to return file names
 sub ScanDir($$;$)
 {
-    my ($exifTool, $dir, $list) = @_;
+    my ($et, $dir, $list) = @_;
     opendir(DIR_HANDLE, $dir) or Warn("Error opening directory $dir\n"), return;
     my @fileList = readdir(DIR_HANDLE);
     closedir(DIR_HANDLE);
@@ -2971,7 +2988,7 @@ sub ScanDir($$;$)
         if (-d $path) {
             next unless $recurse and $file !~ /^\./; # ignore dirs starting with "."
             next if $ignore{$file} or ($ignore{SYMLINKS} and -l $path);
-            ScanDir($exifTool, $path, $list);
+            ScanDir($et, $path, $list);
             next;
         }
         # apply rules from -ext options
@@ -2996,7 +3013,7 @@ sub ScanDir($$;$)
             }
         }
         $list and push(@$list, $path), next;
-        GetImageInfo($exifTool, $path);
+        GetImageInfo($et, $path);
     }
     ++$countDir;
 }
@@ -3054,7 +3071,7 @@ sub AddPrintFormat($)
 # Returns: file extension (lower case), or 'dat' if unknown
 sub SuggestedExtension($$$)
 {
-    my ($exifTool, $valPt, $tag) = @_;
+    my ($et, $valPt, $tag) = @_;
     my $ext;
     if (not $binaryOutput) {
         $ext = 'txt';
@@ -3073,7 +3090,7 @@ sub SuggestedExtension($$$)
     } elsif ($$valPt =~ /^RIFF....WAVE/s) {
         $ext = 'wav';
     } elsif ($tag eq 'OriginalRawFileData' and
-        defined($ext = $exifTool->GetValue('OriginalRawFileName')))
+        defined($ext = $et->GetValue('OriginalRawFileName')))
     {
         $ext =~ s/^.*\.//s;
         $ext = $ext ? lc($ext) : 'raw';
@@ -3466,12 +3483,12 @@ sub PrintTagList($@)
 # Returns: true if there was an Error
 sub PrintErrors($$$)
 {
-    my ($exifTool, $info, $file) = @_;
+    my ($et, $info, $file) = @_;
     my ($tag, $key);
     foreach $tag (qw(Warning Error)) {
         next unless $$info{$tag};
         my @keys = ( $tag );
-        push @keys, sort(grep /^$tag /, keys %$info) if $exifTool->Options('Duplicates');
+        push @keys, sort(grep /^$tag /, keys %$info) if $et->Options('Duplicates');
         foreach $key (@keys) {
             Warn "$tag: $info->{$key} - $file\n";
         }
@@ -3531,38 +3548,38 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  3G2   r     | ERF   r/w   | M4A/V r     | PBM   r/w   | RM    r
-  3GP   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
-  ACR   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
-  AFM   r     | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
-  AI    r/w   | F4A/V r     | MKA   r     | PFA   r     | SRW   r/w
-  AIFF  r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
-  APE   r     | FLA   r     | MKV   r     | PFM   r     | SWF   r
-  ARW   r/w   | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
-  ASF   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
-  AVI   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
-  BMP   r     | FPX   r     | MOV   r     | PICT  r     | TTC   r
-  BTF   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
-  CHM   r     | GZ    r     | MP4   r     | PNG   r/w   | VRD   r/w/c
-  COS   r     | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
-  CR2   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
-  CRW   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
-  CS1   r/w   | ICC   r/w/c | MQV   r     | PS    r/w   | WEBP  r
-  DCM   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
-  DCP   r/w   | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
-  DCR   r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
-  DFONT r     | INX   r     | NRW   r/w   | QTIF  r     | WV    r
-  DIVX  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
-  DJVU  r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
-  DLL   r     | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
-  DNG   r/w   | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
-  DOC   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
-  DOCX  r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
+  3FR   r     | EIP   r     | LNK   r     | PAC   r     | RWL   r/w
+  3G2   r/w   | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
+  3GP   r/w   | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
+  ACR   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
+  AFM   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
+  AI    r/w   | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
+  AIFF  r     | F4A/V r/w   | MKA   r     | PFA   r     | SRW   r/w
+  APE   r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
+  ARW   r/w   | FLA   r     | MKV   r     | PFM   r     | SWF   r
+  ASF   r     | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
+  AVI   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
+  BMP   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
+  BTF   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r
+  CHM   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
+  COS   r     | GZ    r     | MP4   r/w   | PNG   r/w   | VRD   r/w/c
+  CR2   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
+  CRW   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
+  CS1   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
+  DCM   r     | ICC   r/w/c | MQV   r/w   | PS    r/w   | WEBP  r
+  DCP   r/w   | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
+  DCR   r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
+  DFONT r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
+  DIVX  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WV    r
+  DJVU  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
+  DLL   r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
+  DNG   r/w   | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
+  DOC   r     | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
+  DOCX  r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
+  DPX   r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
   DV    r     | KDC   r     | OGV   r     | RSRC  r     |
-  DVB   r     | KEY   r     | ORF   r/w   | RTF   r     |
+  DVB   r/w   | KEY   r     | ORF   r/w   | RTF   r     |
   DYLIB r     | LA    r     | OTF   r     | RW2   r/w   |
-  EIP   r     | LNK   r     | PAC   r     | RWL   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -3587,10 +3604,10 @@ Case is not significant for any command-line option (including tag and group
 names), except for single-character options when the corresponding
 upper-case option exists.  Many single-character options have equivalent
 long-name versions (shown in brackets), and some options have inverses which
-are invoked with a leading double-dash.  Note that multiple single-character
-options may NOT be combined into one argument because this would be
-interpreted as a tag name.  Contrary to standard practice, options may
-appear after source file names on the exiftool command line.
+are invoked with a leading double-dash.  Unrecognized options are
+interpreted as tag names (for this reason, multiple single-character options
+may NOT be combined into one argument).  Contrary to standard practice,
+options may appear after source file names on the exiftool command line.
 
 =head2 Option Summary
 
@@ -3687,6 +3704,7 @@ L<Other options|/Other options>
 
 L<Advanced options|/Advanced options>
 
+  -api OPT[=VAL]                   Set ExifTool API option
   -common_args                     Define common arguments
   -config CFGFILE                  Specify configuration file name
   -echo[NUM] TEXT                  Echo text to stdout or stderr
@@ -3742,9 +3760,10 @@ tags from being copied (when redirecting to another tag, it is the source
 tag that should be excluded), or to exclude groups from being deleted when
 deleting all information (ie. C<-all= --exif:all> deletes all but EXIF
 information).  But note that this will not exclude individual tags from a
-group delete.  Instead, individual tags may be recovered using the
-B<-tagsFromFile> option (ie. C<-all= -tagsfromfile @ -artist>). Wildcards
-are permitted as described above for B<-TAG>.
+group delete (unless a family 2 group is specified, see note 4 below). 
+Instead, individual tags may be recovered using the B<-tagsFromFile> option
+(ie. C<-all= -tagsfromfile @ -artist>). Wildcards are permitted as described
+above for B<-TAG>.
 
 =item B<->I<TAG>[+-]B<=>[I<VALUE>]
 
@@ -3756,24 +3775,25 @@ C<+=> may also be used to increment numerical values, and C<-=> may be used
 to conditionally delete or replace a tag (see L</WRITING EXAMPLES> for
 examples).
 
-I<TAG> may contain a leading family 0 or 1 group name separated by a colon.
-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 is the first group in the following list where I<TAG> is
-valid: 1) EXIF, 2) IPTC, 3) XMP.
+I<TAG> may contain one or more leading family 0, 1 or 2 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
+is the first group in the following list where I<TAG> is valid: 1) EXIF, 2)
+IPTC, 3) XMP.
 
 The wildcards C<*> and C<?> may be used in tag names to assign the same
 value to multiple tags.  When specified with wildcards, "unsafe" tags are
 not written.  A tag name of C<All> is eqivalent to C<*> (except that it
 doesn't require quoting, while arguments with wildcards do on systems with
 shell globbing), and is often used when deleting all metadata (ie. C<-All=>)
-or an entire group (ie. C<-GROUP:All=>).  Note that not all groups are
-deletable, and that the JPEG APP14 "Adobe" group is not removed by default
-with C<-All=> because it may affect the appearance of the image.  Use the
-B<-listd> option for a complete list of deletable groups, and see note 3
-below regarding the "APP" groups.  Also, within an image some groups may be
-contained within others, and these groups are removed if the containing
-group is deleted:
+or an entire group (ie. C<-GROUP:All=>, see note 4 below).  Note that not
+all groups are deletable, and that the JPEG APP14 "Adobe" group is not
+removed by default with C<-All=> because it may affect the appearance of the
+image.  Use the B<-listd> option for a complete list of deletable groups,
+and see note 5 below regarding the "APP" groups.  Also, within an image some
+groups may be contained within others, and these groups are removed if the
+containing group is deleted:
 
   JPEG Image:
   - Deleting EXIF or IFD0 also deletes ExifIFD, GlobParamIFD,
@@ -3787,9 +3807,9 @@ group is deleted:
 
 Notes:
 
-1) Many tag values may be assigned in a single command.  If two assignments
-affect the same tag, the latter takes precedence (except for list-type tags,
-where both values are written).
+1) B<Many tag values may be assigned in a single command>.  If two
+assignments affect the same tag, the latter takes precedence (except for
+list-type tags, where both values are written).
 
 2) In general, MakerNotes tags are considered "Permanent", and may be edited
 but not created or deleted individually.  This avoids many potential
@@ -3801,7 +3821,16 @@ maker notes.
 never actually deleted from the file.  So ExifTool alone may not be used to
 securely edit metadata in PDF files.
 
-4) The "APP" group names ("APP0" through "APP15") are used to delete JPEG
+4) Specifying C<-GROUP:all=> deletes the entire group as a block unless a
+family 2 group is specified, in which case the tags are deleted
+individually.  (Since the family 2 categories do not represent physical
+metadata blocks.)  So only in this case may individual tags be excluded from
+the mass delete.  For example, C<-time:all --Exif:Time:All> removes all
+deletable Time tags except those in the EXIF.  This difference also applies
+when deleting all by family 2 group (ie. C<-2all:all=>) which deletes tags
+individually, as opposed to C<-all:all=> which deletes entire blocks.
+
+5) The "APP" group names ("APP0" through "APP15") are used to delete JPEG
 application segments which are not associated with another deletable group. 
 For example, specifying C<-APP14:All=> will NOT delete the APP14 "Adobe"
 segment because this is accomplished with C<-Adobe:All>.
@@ -3835,10 +3864,10 @@ groups.  This allows some information to be automatically transferred to the
 appropriate group when copying between images of different formats. However,
 if a group name is specified for a tag then the information is written only
 to this group (unless redirected to another group, see below).  If C<All> is
-used as a group name, then the information is written to the same family 1
-group in the destination I<FILE>.  In this way, C<-All:All> is used to copy
-all information while preserving the family 1 group (ie. the specific
-location in the metadata) of each tag.
+used as a group name, then each tag is written to the same family 1 group it
+had in the source file (ie. the same specific location in the metadata), but
+a different family may be specified by adding a leading family number to the
+group name (ie. C<-0All:all>).
 
 I<SRCFILE> may be the same as I<FILE> to move information around within a
 single file.  In this case, C<@> may be used to represent the source file
@@ -4060,13 +4089,17 @@ examples demonstrate basic use of this option:
     # update metadata for all images in a directory from CSV file
     exiftool -csv=a.csv dir
 
-Empty values are ignored when importing.  To force a tag to be deleted, use
-the B<-f> option and set the value to "-" in the CSV file (or to the
-MissingTagValue if this API option was used).  May be combined with the
-B<-g> or B<-G> option to add group names to the tags.  If the B<-a> option
-is used to allow duplicate tag names, the duplicate tags are only included
-in the CSV output if the column headings are unique.  Adding the B<-G4>
-option ensures a unique column heading for each tag.
+Empty values are ignored when importing.  Also, FileName and Directory
+columns are ignored if they exist (ie. ExifTool will not attempt to write
+these tags with a CSV import).  To force a tag to be deleted, use the B<-f>
+option and set the value to "-" in the CSV file (or to the MissingTagValue
+if this API option was used).
+
+When exporting a CSV file, the B<-g> or B<-G> option to add group names to
+the tag headings.  If the B<-a> option is used to allow duplicate tag names,
+the duplicate tags are only included in the CSV output if the column
+headings are unique.  Adding the B<-G4> option ensures a unique column
+heading for each tag.
 
 List-type tags are stored as simple strings in a CSV file, but the B<-sep>
 option may be used to split them back into separate items when importing.
@@ -4180,8 +4213,8 @@ may be suffixed with a C<#> to disable print conversion.
 =item B<-l> (B<-long>)
 
 Use long 2-line Canon-style output format.  Adds a description and
-unconverted value to the XML, JSON or PHP output when B<-X>, B<-j> or
-B<-php> is used.
+unconverted value (if it is different from the converted value) to the XML,
+JSON or PHP output when B<-X>, B<-j> or B<-php> is used.
 
 =item B<-L> (B<-latin>)
 
@@ -4266,7 +4299,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 9.37 --
+    -- Generated by ExifTool 9.41 --
     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
@@ -4498,7 +4531,7 @@ although %c is only valid for output file names.
 
 This enhanced version of the B<-w> option allows a separate output file to
 be created for each extracted tag.  The differences between B<-W> and B<-w>
-are listed below:
+are as follows:
 
 1) With B<-W>, a new output file is created for each extracted tag.
 
@@ -4933,8 +4966,8 @@ read/write support for tags as recommended by the Metadata Working Group.
 To save typing, C<-use MWG> is assumed if the C<MWG> group is specified for
 any tag on the command line.  See the
 L<MWG Tags documentation|Image::ExifTool::TagNames/MWG Tags> for more
-details.  (Note that this option is not reversible, and remains in effect
-until the application terminates, even across the C<-execute> option.)
+details.  Note that this option is not reversible, and remains in effect
+until the application terminates, even across the C<-execute> option.
 
 =back
 
@@ -5052,6 +5085,13 @@ load exiftool for each invocation.
 
 =over 5
 
+=item B<-api> I<OPT[=VAL]>
+
+Set ExifTool API option.  I<OPT> is a case-sensitive API option name.  The
+option value is set to 1 if I<=VAL> is omitted.  See L<Image::ExifTool
+Options|Image::ExifTool/Options> for a list of available API options.  This
+overrides API options set via the config file.
+
 =item B<-common_args>
 
 Specifies that all arguments following this option are common to all