exiftool_vendored 10.25.0 → 10.31.0

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool.pm

@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags);
 
-$VERSION = '10.25';
+$VERSION = '10.31';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -130,10 +130,10 @@ sub ReadValue($$$$$;$);
 @loadAllTables = qw(
     PhotoMechanic Exif GeoTiff CanonRaw KyoceraRaw Lytro MinoltaRaw PanasonicRaw
     SigmaRaw JPEG GIMP Jpeg2000 GIF BMP BMP::OS2 BPG BPG::Extensions PICT PNG
-    MNG DjVu DPX OpenEXR MIFF PGF PSP PhotoCD Radiance PDF PostScript
+    MNG FLIF DjVu DPX OpenEXR MIFF PGF PSP PhotoCD Radiance PDF PostScript
     Photoshop::Header Photoshop::Layers Photoshop::ImageData FujiFilm::RAF
     FujiFilm::IFD Samsung::Trailer Sony::SRF2 Sony::SR2SubIFD Sony::PMP ITC ID3
-    Vorbis Ogg APE APE::NewHeader APE::OldHeader Audible MPC MPEG::Audio
+    FLAC Ogg Vorbis APE APE::NewHeader APE::OldHeader Audible MPC MPEG::Audio
     MPEG::Video MPEG::Xing M2TS QuickTime QuickTime::ImageFile Matroska MOI MXF
     DV Flash Flash::FLV Real::Media Real::Audio Real::Metafile RIFF AIFF ASF
     DICOM MIE HTML XMP::SVG Palm Palm::MOBI Palm::EXTH Torrent EXE
@@ -174,14 +174,14 @@ $defaultLang = 'en';    # default language
 # 2) Put types with weak file signatures at end of list to avoid false matches
 @fileTypes = qw(JPEG CRW DR4 TIFF GIF MRW RAF X3F JP2 PNG MIE MIFF PS PDF PSD XMP
                 BMP BPG PPM RIFF AIFF ASF MOV MPEG Real SWF PSP FLV OGG FLAC APE
-                MPC MKV MXF DV PMP IND PGF ICC ITC FLIR FPF LFP HTML VRD RTF XCF
-                DSS QTIF FPX PICT ZIP GZIP PLIST RAR BZ2 TAR RWZ EXE EXR HDR CHM
-                LNK WMF AVC DEX DPX RAW Font RSRC M2TS PHP Torrent VCard AA PDB
-                MOI ISO MP3 DICOM PCD);
+                MPC MKV MXF DV PMP IND PGF ICC ITC FLIR FLIF FPF LFP HTML VRD
+                RTF XCF DSS QTIF FPX PICT ZIP GZIP PLIST RAR BZ2 TAR RWZ EXE EXR
+                HDR CHM LNK WMF AVC DEX DPX RAW Font RSRC M2TS PHP Torrent VCard
+                AA PDB MOI ISO MP3 DICOM PCD);
 
 # file types that we can write (edit)
-my @writeTypes = qw(JPEG TIFF GIF CRW MRW ORF RAF RAW PNG MIE PSD XMP PPM
-                    EPS X3F PS PDF ICC VRD DR4 JP2 EXIF AI AIT IND MOV EXV);
+my @writeTypes = qw(JPEG TIFF GIF CRW MRW ORF RAF RAW PNG MIE PSD XMP PPM EPS
+                    X3F PS PDF ICC VRD DR4 JP2 EXIF AI AIT IND MOV EXV FLIF);
 my %writeTypes; # lookup for writable file types (hash filled if required)
 
 # file extensions that we can't write for various base types
@@ -217,6 +217,7 @@ my %fileTypeLookup = (
     AIFF => ['AIFF', 'Audio Interchange File Format'],
     AIT  =>  'AI',
     APE  => ['APE',  "Monkey's Audio format"],
+    APNG => ['PNG',  'Animated Portable Network Graphics'],
     ARW  => ['TIFF', 'Sony Alpha RAW format'],
     ASF  => ['ASF',  'Microsoft Advanced Systems Format'],
     AVC  => ['AVC',  'Advanced Video Connection'], # (extensions are actually _AU,_AD,_IM,_ID)
@@ -281,6 +282,7 @@ my %fileTypeLookup = (
     FFF  => [['TIFF','FLIR'], 'Hasselblad Flexible File Format'],
     FLAC => ['FLAC', 'Free Lossless Audio Codec'],
     FLA  => ['FPX',  'Macromedia/Adobe Flash project'],
+    FLIF => ['FLIF', 'Free Lossless Image Format'],
     FLIR => ['FLIR', 'FLIR File Format'], # (not an actual extension)
     FLV  => ['FLV',  'Flash Video'],
     FPF  => ['FPF',  'FLIR Public image Format'],
@@ -520,6 +522,7 @@ my %fileDescription = (
     AI   => 'application/vnd.adobe.illustrator',
     AIFF => 'audio/x-aiff',
     APE  => 'audio/x-monkeys-audio',
+    APNG => 'image/apng',
     ASF  => 'video/x-ms-asf',
     ARW  => 'image/x-sony-arw',
     BMP  => 'image/bmp',
@@ -555,6 +558,7 @@ my %fileDescription = (
     FFF  => 'image/x-hasselblad-fff',
     FLA  => 'application/vnd.adobe.fla',
     FLAC => 'audio/flac',
+    FLIF => 'image/flif',
     FLV  => 'video/x-flv',
     Font => 'application/x-font-type1', # covers PFA, PFB and PFM (not sure about PFM)
     FPX  => 'image/vnd.fpx',
@@ -774,6 +778,7 @@ my %moduleName = (
     EXR  => '\x76\x2f\x31\x01',
     EXV  => '\xff\x01Exiv2',
     FLAC => '(fLaC|ID3)',
+    FLIF => 'FLIF[0-\x6f][0-2]',
     FLIR => '[AF]FF\0',
     FLV  => 'FLV\x01',
     Font => '((\0\x01\0\0|OTTO|true|typ1)[\0\x01]|ttcf\0[\x01\x02]\0\0|\0[\x01\x02]|' .
@@ -980,7 +985,7 @@ my %systemTagsNotes = (
         Notes => q{
             may be written with a full path name to set FileName and Directory in one
             operation.  This is such a powerful feature that a TestName tag is provided
-            to allow dry-run tests before actually writing the file name. See
+            to allow dry-run tests before actually writing the file name.  See
             L<filename.html|../filename.html> for more information on writing the
             FileName, Directory and TestName tags
         },
@@ -996,6 +1001,7 @@ my %systemTagsNotes = (
     },
     TestName => {
         Writable => 1,
+        Protected => 1,
         WriteOnly => 1,
         Notes => q{
             this write-only tag may be used instead of FileName for dry-run tests of the
@@ -1764,8 +1770,15 @@ sub Options($$;@)
                 $$options{$param} = 'Latin';    # all others default to Latin
             }
         } elsif ($param eq 'UserParam') {
+            # clear options if $newVal is undef
+            defined $newVal or $$options{$param} = {}, next;
             # allow initialization of entire UserParam hash
-            ref $newVal eq 'HASH' and $$options{$param} = { %$newVal }, next;
+            if (ref $newVal eq 'HASH') {
+                my %newParams;
+                $newParams{lc $_} = $$newVal{$_} foreach sort keys %$newVal;
+                $$options{$param} = \%newParams;
+                next;
+            }
             # set/reset single UserParam parameter
             if ($newVal =~ /(.*?)=(.*)/s) {
                 $param = lc $1;
@@ -1809,6 +1822,8 @@ sub Options($$;@)
                 }
                 # must forget saved values since they depend on Escape method
                 $$self{BOTH} = { };
+            } elsif ($param eq 'GlobalTimeShift') {
+                delete $$self{GLOBAL_TIME_OFFSET};  # reset our calculated offset
             }
             $$options{$param} = $newVal;
         }
@@ -2537,7 +2552,7 @@ sub GetValue($$;$)
     # start with the raw value
     my $value = $$self{VALUE}{$tag};
     if (not defined $value) {
-        return wantarray ? () : undef unless ref $tag;
+        return () unless ref $tag;
         # get the value of a structure field
         $tagInfo = $tag;
         $tag = $$tagInfo{Name};
@@ -2628,7 +2643,7 @@ sub GetValue($$;$)
             } else {
                 $value = \@valList;
             }
-            return wantarray ? () : undef unless @$value;
+            return () unless @$value;
         }
         # initialize array so we can iterate over values in list
         if (ref $value eq 'ARRAY') {
@@ -2659,7 +2674,7 @@ sub GetValue($$;$)
                         next if defined $val[$_] or not $$tagInfo{Require}{$_};
                         $$self{OPTIONS}{Filter} = $oldFilter if defined $oldFilter;
                         $$self{ESCAPE_PROC} = $oldEscape;
-                        return wantarray ? () : undef;
+                        return ();
                     }
                     $$self{OPTIONS}{Filter} = $oldFilter if defined $oldFilter;
                     $$self{ESCAPE_PROC} = $oldEscape;
@@ -2743,7 +2758,7 @@ sub GetValue($$;$)
             $conv = $$convList[$i] if $convList;
         }
         # return undefined now if no value
-        return wantarray ? () : undef unless defined $value;
+        return () unless defined $value;
         # join back into single value if split for conversion list
         if ($convList and ref $value eq 'ARRAY') {
             $value = join($convType eq 'PrintConv' ? '; ' : ' ', @$value);
@@ -2793,8 +2808,8 @@ sub GetValue($$;$)
 #------------------------------------------------------------------------------
 # Get tag identification number
 # Inputs: 0) ExifTool object reference, 1) tag key
-# Returns: Scalar context: Tag ID if available, otherwise ''
-#          List context: 0) Tag ID (or ''), 1) language code (or undef)
+# Returns: Scalar context: tag ID if available, otherwise ''
+#          List context: 0) tag ID (or ''), 1) language code (or undef)
 sub GetTagID($$)
 {
     my ($self, $tag) = @_;
@@ -2853,8 +2868,8 @@ sub GetDescription($$)
 #         1) tag key (or reference to tagInfo hash, not part of the public API)
 #         2) [optional] group family (-1 to get extended group list, or multiple
 #            families separated by colons to return multiple groups as a string)
-# Returns: Scalar context: Group name (for family 0 if not otherwise specified)
-#          Array context: Group name if family specified, otherwise list of
+# Returns: Scalar context: group name (for family 0 if not otherwise specified)
+#          List context: group name if family specified, otherwise list of
 #          group names for each family.  Returns '' for undefined tag.
 # Notes: Mutiple families may be specified with ':' in family argument (eg. '1:2')
 sub GetGroup($$;$)
@@ -3153,7 +3168,7 @@ sub GetShortcuts()
 #            or FileType value if a description is requested
 #         1) flag to return long description instead of type ('0' to return any recognized type)
 # Returns: File type (or desc) or undef if extension not supported or if
-#          description is the same as the input FileType.  In array context,
+#          description is the same as the input FileType.  In list context,
 #          may return more than one file type if the file may be different formats.
 #          Returns list of all supported extensions if no file specified
 sub GetFileType(;$$)
@@ -3189,7 +3204,7 @@ sub GetFileType(;$$)
         my $mod = $moduleName{$$fileType[0]};
         undef $fileType if defined $mod and $mod eq '0';
     }
-    $fileType or return wantarray ? () : undef;
+    $fileType or return ();
     $fileType = $$fileType[0];      # get file type (or list of types)
     if (wantarray) {
         return @$fileType if ref $fileType eq 'ARRAY';
@@ -3376,7 +3391,7 @@ sub NextTagKey($$)
 
 #------------------------------------------------------------------------------
 # Encode file name for calls to system i/o routines
-# Inputs: 0) ExifTool ref, 1) file name, 2) flag to force conversion
+# Inputs: 0) ExifTool ref, 1) file name in CharSetFileName, 2) flag to force conversion
 # Returns: true if Windows Unicode routines should be used (in which case
 #          the file name will be encoded as a null-terminated UTF-16LE string)
 sub EncodeFileName($$;$)
@@ -4153,6 +4168,7 @@ sub AddCompositeTags($;$)
         my $tag = $$tagInfo{Name};
         $$tagInfo{Module} = $module if $$tagInfo{Writable};
         $$tagInfo{Override} = 1 if $override and not defined $$tagInfo{Override};
+        $$tagInfo{IsComposite} = 1;
         # allow Composite tags with the same name
         if ($$compTable{$tag}) {
             # determine if we want to override this tag
@@ -5122,7 +5138,7 @@ sub ConvertFileName($$)
 }
 
 #------------------------------------------------------------------------------
-# Inverse conversion for file name (encode
+# Inverse conversion for file name (encode in CharsetFileName)
 # Inputs: 0) ExifTool ref, 1) file name in external character set
 # Returns: file name in CharsetFileName character set
 sub InverseFileName($$)
@@ -6945,7 +6961,7 @@ sub HandleTag($$$$;%)
     my $pfmt = $parms{Format};
     my $tagInfo = $parms{TagInfo} || $self->GetTagInfo($tagTablePtr, $tag, \$val, $pfmt, $parms{Count});
     my $dataPt = $parms{DataPt};
-    my ($subdir, $format, $count, $size, $noTagInfo, $rational);
+    my ($subdir, $format, $noTagInfo, $rational);
 
     if ($tagInfo) {
         $subdir = $$tagInfo{SubDirectory}
@@ -6981,7 +6997,7 @@ sub HandleTag($$$$;%)
         $parms{Value} .= " ($rational)" if defined $rational;
         $parms{Table} = $tagTablePtr;
         if ($format) {
-            $count or $count = int(($parms{Size} || 0) / ($formatSize{$format} || 1));
+            my $count = int(($parms{Size} || 0) / ($formatSize{$format} || 1));
             $parms{Format} = $format . "[$count]";
         }
         $self->VerboseInfo($tag, $tagInfo, %parms);
@@ -7080,7 +7096,7 @@ sub FoundTag($$$)
     if ($$tagInfo{RawConv}) {
         # initialize @val for use in Composite RawConv expressions
         my @val;
-        if (ref $value eq 'HASH') {
+        if (ref $value eq 'HASH' and $$tagInfo{IsComposite}) {
             foreach (keys %$value) { $val[$_] = $$valueHash{$$value{$_}}; }
         }
         my $conv = $$tagInfo{RawConv};
@@ -7290,7 +7306,7 @@ sub SetFileType($;$$$)
 
 #------------------------------------------------------------------------------
 # Override the FileType and MIMEType tags
-# Inputs: 0) ExifTool object ref, 1) file type
+# Inputs: 0) ExifTool object ref, 1) file type, 2) MIME type, 3) normal extension
 # Notes:  does nothing if FileType was not previously defined (ie. when writing)
 sub OverrideFileType($$;$$)
 {

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool.pod

@@ -65,42 +65,42 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | DV    r     | KDC   r     | OGV   r     | RW2   r/w
-  3G2   r/w   | DVB   r/w   | KEY   r     | OPUS  r     | RWL   r/w
-  3GP   r/w   | DYLIB r     | LA    r     | ORF   r/w   | RWZ   r
-  A     r     | EIP   r     | LFP   r     | OTF   r     | RM    r
-  AA    r     | EPS   r/w   | LNK   r     | PAC   r     | SEQ   r
-  AAX   r/w   | EPUB  r     | M2TS  r     | PAGES r     | SO    r
-  ACR   r     | ERF   r/w   | M4A/V r/w   | PBM   r/w   | SR2   r/w
-  AFM   r     | EXE   r     | MEF   r/w   | PCD   r     | SRF   r
-  AI    r/w   | EXIF  r/w/c | MIE   r/w/c | PDB   r     | SRW   r/w
-  AIFF  r     | EXR   r     | MIFF  r     | PDF   r/w   | SVG   r
-  APE   r     | EXV   r/w/c | MKA   r     | PEF   r/w   | SWF   r
-  ARW   r/w   | F4A/V r/w   | MKS   r     | PFA   r     | THM   r/w
-  ASF   r     | FFF   r/w   | MKV   r     | PFB   r     | TIFF  r/w
-  AVI   r     | FLA   r     | MNG   r/w   | PFM   r     | TORRENT r
-  AZW   r     | FLAC  r     | MOBI  r     | PGF   r     | TTC   r
-  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | TTF   r
-  BPG   r     | FPF   r     | MOI   r     | PLIST r     | VCF   r
-  BTF   r     | FPX   r     | MOS   r/w   | PICT  r     | VRD   r/w/c
-  CHM   r     | GIF   r/w   | MOV   r/w   | PMP   r     | VSD   r
-  COS   r     | GZ    r     | MP3   r     | PNG   r/w   | WAV   r
-  CR2   r/w   | HDP   r/w   | MP4   r/w   | PPM   r/w   | WDP   r/w
-  CRW   r/w   | HDR   r     | MPC   r     | PPT   r     | WEBP  r
-  CS1   r/w   | HTML  r     | MPG   r     | PPTX  r     | WEBM  r
-  DCM   r     | ICC   r/w/c | MPO   r/w   | PS    r/w   | WMA   r
-  DCP   r/w   | ICS   r     | MQV   r/w   | PSB   r/w   | WMV   r
-  DCR   r     | IDML  r     | MRW   r/w   | PSD   r/w   | WV    r
-  DFONT r     | IIQ   r/w   | MXF   r     | PSP   r     | X3F   r/w
-  DIVX  r     | IND   r/w   | NEF   r/w   | QTIF  r/w   | XCF   r
-  DJVU  r     | INX   r     | NRW   r/w   | RA    r     | XLS   r
-  DLL   r     | ISO   r     | NUMBERS r   | RAF   r/w   | XLSX  r
-  DNG   r/w   | ITC   r     | O     r     | RAM   r     | XMP   r/w/c
-  DOC   r     | J2C   r     | ODP   r     | RAR   r     | ZIP   r
-  DOCX  r     | JNG   r/w   | ODS   r     | RAW   r/w   |
-  DPX   r     | JP2   r/w   | ODT   r     | RIFF  r     |
-  DR4   r/w/c | JPEG  r/w   | OFR   r     | RSRC  r     |
-  DSS   r     | K25   r     | OGG   r     | RTF   r     |
+  3FR   r     | DV    r     | K25   r     | OGG   r     | RTF   r
+  3G2   r/w   | DVB   r/w   | KDC   r     | OGV   r     | RW2   r/w
+  3GP   r/w   | DYLIB r     | KEY   r     | OPUS  r     | RWL   r/w
+  A     r     | EIP   r     | LA    r     | ORF   r/w   | RWZ   r
+  AA    r     | EPS   r/w   | LFP   r     | OTF   r     | RM    r
+  AAX   r/w   | EPUB  r     | LNK   r     | PAC   r     | SEQ   r
+  ACR   r     | ERF   r/w   | M2TS  r     | PAGES r     | SO    r
+  AFM   r     | EXE   r     | M4A/V r/w   | PBM   r/w   | SR2   r/w
+  AI    r/w   | EXIF  r/w/c | MEF   r/w   | PCD   r     | SRF   r
+  AIFF  r     | EXR   r     | MIE   r/w/c | PDB   r     | SRW   r/w
+  APE   r     | EXV   r/w/c | MIFF  r     | PDF   r/w   | SVG   r
+  ARW   r/w   | F4A/V r/w   | MKA   r     | PEF   r/w   | SWF   r
+  ASF   r     | FFF   r/w   | MKS   r     | PFA   r     | THM   r/w
+  AVI   r     | FLA   r     | MKV   r     | PFB   r     | TIFF  r/w
+  AZW   r     | FLAC  r     | MNG   r/w   | PFM   r     | TORRENT r
+  BMP   r     | FLIF  r/w   | MOBI  r     | PGF   r     | TTC   r
+  BPG   r     | FLV   r     | MODD  r     | PGM   r/w   | TTF   r
+  BTF   r     | FPF   r     | MOI   r     | PLIST r     | VCF   r
+  CHM   r     | FPX   r     | MOS   r/w   | PICT  r     | VRD   r/w/c
+  COS   r     | GIF   r/w   | MOV   r/w   | PMP   r     | VSD   r
+  CR2   r/w   | GZ    r     | MP3   r     | PNG   r/w   | WAV   r
+  CRW   r/w   | HDP   r/w   | MP4   r/w   | PPM   r/w   | WDP   r/w
+  CS1   r/w   | HDR   r     | MPC   r     | PPT   r     | WEBP  r
+  DCM   r     | HTML  r     | MPG   r     | PPTX  r     | WEBM  r
+  DCP   r/w   | ICC   r/w/c | MPO   r/w   | PS    r/w   | WMA   r
+  DCR   r     | ICS   r     | MQV   r/w   | PSB   r/w   | WMV   r
+  DFONT r     | IDML  r     | MRW   r/w   | PSD   r/w   | WV    r
+  DIVX  r     | IIQ   r/w   | MXF   r     | PSP   r     | X3F   r/w
+  DJVU  r     | IND   r/w   | NEF   r/w   | QTIF  r/w   | XCF   r
+  DLL   r     | INX   r     | NRW   r/w   | RA    r     | XLS   r
+  DNG   r/w   | ISO   r     | NUMBERS r   | RAF   r/w   | XLSX  r
+  DOC   r     | ITC   r     | O     r     | RAM   r     | XMP   r/w/c
+  DOCX  r     | J2C   r     | ODP   r     | RAR   r     | ZIP   r
+  DPX   r     | JNG   r/w   | ODS   r     | RAW   r/w   |
+  DR4   r/w/c | JP2   r/w   | ODT   r     | RIFF  r     |
+  DSS   r     | JPEG  r/w   | OFR   r     | RSRC  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -557,9 +557,12 @@ different when copying tags with L</SetNewValuesFromFile>.
 =item DateFormat
 
 Format for printing date/time values.  See C<strftime> in the L<POSIX>
-package for details about the format string.  The default is similar to a
-format of "%Y:%m:%d %H:%M:%S".  If date can not be converted, value is left
-unchanged unless the StrictDate option is set.  Timezones are ignored.
+package for details about the format string.  If date can not be converted,
+value is left unchanged unless the StrictDate option is set.  Timezones are
+ignored. The inverse conversion (ie. when calling L</SetNewValue>) is only
+performed if POSIX::strptime is installed.  The default setting of undef
+causes date/time values to remain in standard EXIF format (similar to a
+DateFormat of "%Y:%m:%d %H:%M:%S").
 
 =item Duplicates
 
@@ -585,13 +588,9 @@ name with a '-' in the arguments to L</ImageInfo>.
 
 This setting affects the reading and editing of extended XMP in JPEG images.
 According to the XMP specification, extended XMP is only valid if it has the
-GUID specified by the HasExtendedXMP tag.  ExifTool 9.95 and earlier would
-read extended XMP regardless of GUID, but with the addition of this option
-in version 9.96 the default behaviour was changed to conform with the XMP
-specification (to read only extended XMP with the proper GUID).  This option
-should be set to 2 to emulate pre-9.96 behaviour and read all extended XMP. 
-It may also be set to a GUID to read a specific extended XMP, or 0 to ignore
-extended XMP entirely.
+GUID specified by the HasExtendedXMP tag, so by default ExifTool will ignore
+other extended XMP, but this option allows full control over the extended
+XMP to be extracted.
 
      0   - ignore all extended XMP
      1   - read extended XMP with valid GUID only (default)
@@ -726,7 +725,7 @@ separator used when combining values.  Default is undef.
 
 =item ListItem
 
-Return only a specific item from List-type values.  A value of 0 returns the
+Return only a specific item from list-type values.  A value of 0 returns the
 first item in the list, 1 return the second item, etc.  Negative indices may
 also be used, with -1 representing the last item in the list.  Applies only
 to the top-level list of nested lists.  Default is undef to return all items
@@ -768,7 +767,7 @@ to '' if L</IgnoreMinorErrors> is set.  Default is undef.
 
 =item NoPDFList
 
-Flag to avoid splitting PDF List-type tag values into separate items.
+Flag to avoid splitting PDF list-type tag values into separate items.
 Default is undef.
 
 =item Password
@@ -889,17 +888,21 @@ unknown tags are also extracted from binary data blocks.  Default is 0.
 =item UserParam
 
 Special option to set/get user-defined parameters.  Useful to allow external
-input into tag name expressions and ValueConv logic.  I<PARAM> is the
-user-defined parameter name (case insensitive).
+input into tag name expressions and ValueConv logic.  Valid UserParam values
+are:
 
   PARAM         - Get parameter
   PARAM=        - Clear parameter
   PARAM=VALUE   - Set parameter
+  <hash ref>    - Set entire UserParam hash lookup
+  undef         - Clear all user parameters
+
+Where I<PARAM> is the user-defined parameter name (case insensitive).
 
 User-defined parameters may be accessed in tag name expressions by prefixing
 the parameter name with a dollar sign, just like normal tags.  If called
-without a parameter name, C<Options('UserParam')> returns a reference to the
-hash of all user parameters (with lower-case names).
+without no additional arguments, C<Options('UserParam')> returns a reference
+to the hash of all user parameters (with lower-case names).
 
 =item Verbose
 
@@ -1292,6 +1295,12 @@ name for each value, or call with a reference to the list of values.
     # add a keyword without replacing existing keywords in the file
     $exifTool->SetNewValue(Keywords => $word, AddValue => 1);
 
+    # conditionally add a tag if it didn't exist before,
+    # or replace it if it had a specified value ("old value")
+    $exifTool->SetNewValue(Description => '', DelValue => 1);
+    $exifTool->SetNewValue(Description => 'old value', DelValue => 1);
+    $exifTool->SetNewValue(Description => 'new value');
+
     # set a tag in a specific group
     $exifTool->SetNewValue(Headline => $val, Group => 'XMP');
     $exifTool->SetNewValue('XMP:Headline' => $val);  # (equivalent)
@@ -1367,8 +1376,13 @@ list and overwrite non-list tags).  Default is 0.
 
 =item DelValue
 
-Delete existing tag from a file if it has the specified value.  Option
-values are 0 or 1.  Default is 0.
+Delete existing tag from a file if it has the specified value.  For
+list-type tags this deletes a specified item from the list.  For non-list
+tags this may be used to conditionally replace a tag by providing a new
+value in a separate call to L<SetNewValue> (see examples above).  For
+structured tags, the entire structure is deleted/replaced only if all of the
+specified fields match the existing structure.  Option values are 0 or 1. 
+Default is 0.
 
 =item EditGroup
 
@@ -1463,8 +1477,8 @@ explicitly, either by group (with 'Adobe:*') or as a block (with 'Adobe').
 
 The following ExifTool options are effective in the call to L</SetNewValue>:
 
-Charset, Escape, IgnoreMinorErrors, Lang, ListSep, ListSplit, PrintConv,
-Verbose and WriteMode.
+Charset, DateFormat, Escape, IgnoreMinorErrors, Lang, ListSep, ListSplit,
+PrintConv, StrictDate, Verbose and WriteMode.
 
 =head2 GetNewValue
 
@@ -2219,12 +2233,12 @@ for unsupported files is undef).
 
 A string, based on the file extension, which indicates the basic format of
 the file.  Note that some files may be based on other formats (like many RAW
-image formats are based on TIFF).  In array context, may return more than
-one file type if the file may be based on different formats.  Returns undef
-if files with this extension are not yet supported by ExifTool.  Returns a
-list of extensions for all supported file types if no input extension is
-specified (or all recognized file types if the description flag is set to 0). 
-Returns a more detailed description of the specific file format when the
+image formats are based on TIFF).  In list context, may return more than one
+file type if the file may be based on different formats.  Returns undef if
+files with this extension are not yet supported by ExifTool.  Returns a list
+of extensions for all supported file types if no input extension is
+specified (or all recognized file types if the description flag is set to
+0). Returns a more detailed description of the specific file format when the
 description flag is set.
 
 =back
@@ -2478,7 +2492,7 @@ string contains special characters, otherwise PDFDocEncoding is used.
 Some Photoshop resource names are stored as Pascal strings with unknown
 encoding.  By default, ExifTool assumes MacRoman encoding and converts this
 to UTF-8, but the internal and external character sets may be specified with
-L</CharsetPhotoshop> and L</Charset> options respectively.
+the L</CharsetPhotoshop> and L</Charset> options respectively.
 
 =head2 QuickTime