exiftool_vendored 11.53.0 → 11.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fbb02d04f7a13c79740ef2c0ca3aa5397dbb8f
-  data.tar.gz: a0bdb72ec276cfc6612f9551fd78f681352f1853
+  metadata.gz: 75e69c1212095c9e4bb0a1180cad9fed096909b1
+  data.tar.gz: 424cf805d468397a25bdcd1c92ec9ecc3ddb6ee2
 SHA512:
-  metadata.gz: c8771355f5818b9bb5720b8a3caa567b111fa6582120519746658e03135b3df367b4c861a9b40eb7c274d36e858ac96949c1c3e4063162a27251a85537853f72
-  data.tar.gz: 128d993de5cb91c2e8929893d8cc6481c446203de05f0f8807e41aaa3131a76152b34e825a36d472b98a7939fceb64234b298e0c01ecaf669f9261aee7975464
+  metadata.gz: 6a7d5afd611e6115f689dc17346357705458ec171a19ca2afbb215cfe5683782f02b158acef907a0a2801a9dd7e654fbded8ad990f3f52cf832b6a6b8d57982d
+  data.tar.gz: 12a0ffc20a0fd147eb6a85e00e76d21a1f725b03cc9ca0ee647a99debd0c1ab13a08832090ce62e0cd423b88e816b640279e750b7ec7e812b0ed8c784a28d8f8

data/bin/Changes

@@ -7,6 +7,26 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 11.50. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+July 2, 2019 - Version 11.54
+
+  - Added new Canon and Sony/Minolta LensType values (thanks LibRaw)
+  - Added a number of new Sony/Minolta LensType values (thanks Jos Roost)
+  - Added "Unknown" value for new EXIF CompositeImage tag
+  - Added ability to write GSpherical tags in video track of MOV/MP4 files
+  - Added support for geotagging from GPS/IMU CSV-format files
+  - Improved Russian translation (thanks Alexander)
+  - Improved Validate feature to check ExifVersion/GPSVersionID numbers
+  - Accept unsigned numbers when setting GPSAltitudeRef from a numerical value
+  - Fixed decoding of DepthMapWidth/Height for some Samsung live-focus images
+  - Fixed a couple of incorrect/incomplete CanonModelID values (thanks LibRaw)
+  - Fixed problem identifying some Canon lenses when used on a Sony camera with
+    a Metabones adapter
+  - API Changes:
+      - Added FilterW option
+      - Enhanced Compact option to improve flexibility and include features of
+        XMPShorthand option
+      - Removed XMPShorthand option from documentation
+
 June 24, 2019 - Version 11.53 - "Exif 2.32"
 
   - Added support for the new tags of the Exif 2.32 specification
@@ -1398,16 +1418,16 @@ Oct. 5, 2016 - Version 10.29
     (ie. the date/time is not converted) unless the API StrictDate option is set
     in which case a warning is issued and the tag is not written
 
-Sept. 27, 2016 - Version 10.28 - "EXIF 2.31"
+Sept. 27, 2016 - Version 10.28 - "Exif 2.31"
 
-  - Added support for new EXIF 2.31 tags
+  - Added support for new Exif 2.31 tags
   - Added some new Canon LensType values (thanks Norbert Wasser for one)
   - Added a new Olympus LensType (thanks LibRaw and Niels Kristian Bech Jensen)
   - Added a new Sony LensType and SonyModelID (thanks Jos Roost)
   - Added a new Pentax LensType
   - Added fotoware.config and bibble.config files to the distribution
   - Made Composite SubSecDateTimeOriginal, SubSecCreateDate and SubSecModifyDate
-    tags writable, and expanded to include new EXIF 2.31 time zone tags
+    tags writable, and expanded to include new Exif 2.31 time zone tags
   - Fixed problem writing user-defined structured tag elements with a dot (.) in
     their tag ID
 
@@ -4288,7 +4308,7 @@ June 2, 2010 - Version 8.21
   - Updated default GPSVersionID to 2.3.0.0 when writing
   - Fixed bug geotagging from KML file (lat/long were swapped)
 
-May 26, 2010 - Version 8.20
+May 26, 2010 - Version 8.20 - "Exif 2.3"
 
   - Added read support for Open Document files (ODP, ODS, ODT)
   - Added Composite:AudioBitrate tag for VBR MPEG audio

data/bin/META.json

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

data/bin/META.yml

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

data/bin/README

@@ -104,8 +104,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-11.53.tar.gz | tar -xf -
-  cd Image-ExifTool-11.53
+  gzip -dc Image-ExifTool-11.54.tar.gz | tar -xf -
+  cd Image-ExifTool-11.54
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.53';
+my $version = '11.54';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -140,6 +140,7 @@ my $deleteOrig;     # 0=restore original files, 1=delete originals, 2=delete w/o
 my $disableOutput;  # flag to disable normal output
 my $doSetFileName;  # flag set if FileName may be written
 my $doUnzip;        # flag to extract info from .gz and .bz2 files
+my $escapeC;        # C-style escape
 my $escapeHTML;     # flag to escape printed values for html
 my $evalWarning;    # warning from eval
 my $executeID;      # -execute ID number
@@ -220,6 +221,11 @@ my $isCRLF = { MSWin32 => 1, os2 => 1, dos => 1 }->{$^O};
 # lookup for JSON characters that we escape specially
 my %jsonChar = ( '"'=>'"', '\\'=>'\\', "\t"=>'t', "\n"=>'n', "\r"=>'r' );
 
+# lookup for C-style escape sequences
+my %escC = ( "\n" => '\n', "\r" => '\r', "\t" => '\t', '\\' => '\\\\');
+my %unescC = ( a => "\a", b => "\b", f => "\f", n => "\n", r => "\r",
+               t => "\t", 0 => "\0", '\\' => '\\' );
+
 # options requiring additional arguments
 # (used only to skip over these arguments when reading -stay_open ARGFILE)
 # (arg is converted to lower case then tested again unless an entry was found with the same case)
@@ -429,6 +435,7 @@ undef $disableOutput;
 undef $doSetFileName;
 undef $doUnzip;
 undef $escapeHTML;
+undef $escapeC;
 undef $evalWarning;
 undef $executeID;
 undef $failCondition;
@@ -827,6 +834,7 @@ for (;;) {
     (/^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 'ec' or $a eq 'escapec') and $escapeC = 1, next; # (undocumented) added in 11.54
     ($a eq 'ex' or $a eq 'escapexml') and $escapeXML = 1, next;
     if (/^echo(\d)?$/i) {
         my $n = $1 || 1;
@@ -1005,7 +1013,7 @@ for (;;) {
     /^(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;
-    $a eq 'nop' and $helped=1, next; # undocumented; no operation
+    $a eq 'nop' and $helped=1, next; # (undocumented) no operation, added in 11.25
     if (/^o(ut)?$/i) {
         $outOpt = shift;
         defined $outOpt or Error("Expected output file or directory name for -o option\n"), $badCmd=1, next;
@@ -1048,7 +1056,7 @@ for (;;) {
     }
     /^q(uiet)?$/i and ++$quiet, next;
     /^r(ecurse)?(\.?)$/i and $recurse = ($2 ? 2 : 1), next;
-    if ($a eq 'require') { # undocumented, added in version 8.65
+    if ($a eq 'require') { # (undocumented) added in version 8.65
         my $ver = shift;
         unless (defined $ver and Image::ExifTool::IsFloat($ver)) {
             Error("Expecting version number for -require option\n");
@@ -1574,6 +1582,9 @@ if (@newValues) {
             # set $newVal to '' if deleting nothing
             $newVal = '' if $1 eq '-' and not defined $newVal;
         }
+        if ($escapeC and defined $newVal) {
+            $newVal =~ s/\\(x([0-9a-fA-F]{2})|.)/$2 ? chr(hex($2)) : $unescC{$1} || $1/seg;
+        }
         my ($rtn, $wrn) = $mt->SetNewValue($tag, $newVal, %opts);
         $needSave = 1;
         ++$isWriting if $rtn;
@@ -2439,10 +2450,14 @@ TAG:    foreach $tag (@foundTags) {
                 }
             }
 
-            # translate unprintable chars in value and remove trailing spaces
-            $val =~ tr/\x01-\x1f\x7f/./;
-            $val =~ s/\x00//g;
-            $val =~ s/\s+$//;
+            if ($escapeC) {
+                $val =~ s/([\0-\x1f\\\x7f])/$escC{$1} || sprintf('\x%.2x', ord $1)/eg;
+            } else {
+                # translate unprintable chars in value and remove trailing spaces
+                $val =~ tr/\x01-\x1f\x7f/./;
+                $val =~ s/\x00//g;
+                $val =~ s/\s+$//;
+            }
 
             if ($html) {
                 print $fp "<tr>";
@@ -5119,7 +5134,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.53 --
+    -- Generated by ExifTool 11.54 --
     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
@@ -5788,7 +5803,7 @@ available).  When writing, causes compressed information to be written if
 supported by the metadata format (eg. compressed textual metadata in PNG),
 disables the recommended padding in embedded XMP (saving 2424 bytes when
 writing XMP in a file), and writes XMP in shorthand format -- the equivalent
-of setting the API Compress, Compact and XMPShorthand options to 1.
+of setting the API Compress and Compact="Padding,Shorthand".
 
 =back
 
@@ -6066,9 +6081,10 @@ previews in a directory where other JPG images may exist:
 
     exiftool -ext nef -tagsfromfile @ -srcfile %d%f.jpg dir
 
-If than one B<-srcfile> option is specified, the files are tested in order
-and the first existing source file is processed.  If none of the source
-files already exist, then exiftool uses the first B<-srcfile> specified.
+If more than one B<-srcfile> option is specified, the files are tested in
+order and the first existing source file is processed.  If none of the
+source files already exist, then exiftool uses the first B<-srcfile>
+specified.
 
 A I<FMT> of C<@> may be used to represent the original I<FILE>, which may be
 useful when specifying multiple B<-srcfile> options (eg. to fall back to

data/bin/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 %fileTypeLookup);
 
-$VERSION = '11.53';
+$VERSION = '11.54';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -90,6 +90,7 @@ sub GetExtended($$);
 sub Set64u(@);
 sub DecodeBits($$;$);
 sub EncodeBits($$;$$);
+sub Filter($@);
 sub HexDump($;$%);
 sub DumpTrailer($$);
 sub DumpUnknownTrailer($$);
@@ -915,6 +916,25 @@ my %weakMagic = ( MP3 => 1 );
 # (when done, the process proc must exit after SetFileType if FastScan is 3)
 my %processType = map { $_ => 1 } qw(JPEG TIFF XMP AIFF EXE Font PS Real VCard);
 
+# Compact/XMPShorthand option settings
+my %compactOpt = (
+    nopadding => 'NoPadding', noindent => 'NoIndent', nonewline => 'NoNewline',
+    shorthand => 'Shorthand', onedesc => 'OneDesc',
+    all => ['NoPadding','NoIndent','NoNewline','Shorthand','OneDesc'],
+    allspace => ['NoPadding','NoIndent','NoNewline'], allformat => ['Shorthand','OneDesc'],
+    # aliases to cover anticipated user typos
+    nonewlines => 'NoNewline', nospace => 'NoIndent', nospaces => 'NoIndent',
+    nopad => 'NoPadding', onedescr => 'OneDesc',
+    # allow numerical settings for backward compatibility
+    0 => 'None',
+    1 => 'NoPadding',
+    2 => ['NoPadding','NoIndent'],
+    3 => ['NoPadding','NoIndent','OneDesc'],
+    4 => ['NoPadding','NoIndent','OneDesc','NoNewline'],
+    5 => ['NoPadding','NoIndent','OneDesc','NoNewline','Shorthand'],
+);
+my %xmpShorthandOpt = ( 0 => 'None', 1 => 'Shorthand', 2 => ['Shorthand','OneDesc'] );
+
 # lookup for valid character set names (keys are all lower case)
 %charsetName = (
     #   Charset setting                       alias(es)
@@ -1951,6 +1971,8 @@ sub Options($$;@)
             }
         }
         $oldVal = $$options{$param};
+        # get previous Compact/XMPShorthand setting
+        $oldVal = $$oldVal{$param} if ref $oldVal eq 'HASH';
         last unless @_;
         my $newVal = shift;
         if ($param eq 'Lang') {
@@ -2054,6 +2076,23 @@ sub Options($$;@)
             $$options{$param} = $newVal;
             # set the new ListJoin option for forward compatibility
             $$options{ListJoin} = $newVal ? undef : $$options{ListSep};
+        } elsif ($param eq 'Compact' or $param eq 'XMPShorthand') {
+            # set Compact and XMPShorthand options, preserving backward compatibility
+            my ($p, %compact);
+            foreach $p ('Compact','XMPShorthand') {
+                my $val = $param eq $p ? $newVal : $$options{Compact}{$p};
+                if (defined $val) {
+                    my @v = ($val =~ /\w+/g);
+                    my $opt = ($p eq 'Compact') ? \%compactOpt : \%xmpShorthandOpt;
+                    foreach (@v) {
+                        my $set = $$opt{lc $_} or warn("Invalid $p setting '${_}'\n"), return $oldVal;
+                        ref $set or $compact{$set} = 1, next;
+                        $compact{$_} = 1 foreach @$set;
+                    }
+                }
+                $compact{$p} = $val; # preserve most recent setting
+            }
+            $$options{Compact} = $$options{XMPShorthand} = \%compact;
         } else {
             if ($param eq 'Escape') {
                 # set ESCAPE_PROC
@@ -2109,7 +2148,7 @@ sub ClearOptions($)
         CharsetPhotoshop => 'Latin', # internal encoding for Photoshop resource names
         CharsetQuickTime => 'MacRoman', # internal QuickTime string encoding
         CharsetRIFF => 0,       # internal RIFF string encoding (0=default to Latin)
-        Compact     => 0,       # write compact XMP
+        Compact     => { },     # write compact XMP
         Composite   => 1,       # flag to calculate Composite tags
         Compress    => undef,   # flag to write new values as compressed if possible
         CoordFormat => undef,   # GPS lat/long coordinate format
@@ -2121,6 +2160,7 @@ sub ClearOptions($)
         ExtractEmbedded =>undef,# flag to extract information from embedded documents
         FastScan    => undef,   # flag to avoid scanning for trailer
         Filter      => undef,   # output filter for all tag values
+        FilterW     => undef,   # input filter when writing tag values
         FixBase     => undef,   # fix maker notes base offsets
         GeoMaxIntSecs => 1800,  # geotag maximum interpolation time (secs)
         GeoMaxExtSecs => 1800,  # geotag maximum extrapolation time (secs)
@@ -2168,7 +2208,7 @@ sub ClearOptions($)
         WriteMode   => 'wcg',   # enable all write modes by default
         XAttrTags   => undef,   # extract MacOS extended attribute tags
         XMPAutoConv => 1,       # automatic conversion of unknown XMP tag values
-        XMPShorthand=> 0,       # short form XMP
+        XMPShorthand=> 0,       # (unused, but needed for backward compatibility)
     };
     # keep necessary member variables in sync with options
     delete $$self{CUR_LANG};
@@ -3085,7 +3125,7 @@ sub GetValue($$;$)
             # $valueConv is undefined if there was no print conversion done
             $valueConv = $value;
         }
-        $self->Filter(\$value) if defined $$self{OPTIONS}{Filter};
+        Filter($$self{OPTIONS}{Filter}, \$value);
         # return Both values as a list (ValueConv, PrintConv)
         return ($valueConv, $value);
     }
@@ -3093,7 +3133,7 @@ sub GetValue($$;$)
     DoEscape($value, $$self{ESCAPE_PROC}) if $$self{ESCAPE_PROC};
 
     # filter if necessary
-    $self->Filter(\$value) if defined $$self{OPTIONS}{Filter} and $type eq 'PrintConv';
+    Filter($$self{OPTIONS}{Filter}, \$value) if $$self{OPTIONS}{Filter} and $type eq 'PrintConv';
 
     if (ref $value eq 'ARRAY') {
         if (defined $$self{OPTIONS}{ListItem}) {
@@ -5243,32 +5283,32 @@ sub GetDescriptions($$)
 
 #------------------------------------------------------------------------------
 # Apply filter to value(s) if necessary
-# Inputs: 0) ExifTool ref, 1-N) references to values(s) to filter
+# Inputs: 0) filter expression, 1-N) references to values(s) to filter
 # Returns: nothing, but changes values if necessary
 sub Filter($@)
 {
     local $_;
-    my $self = shift;
-    return unless defined $$self{OPTIONS}{Filter};
+    my $filter = shift;
+    return unless defined $filter;
     while (@_) {
         my $valPt = shift;
         next unless defined $$valPt;
         if (not ref $$valPt) {
             $_ = $$valPt;
             #### eval Filter ($_)
-            eval $$self{OPTIONS}{Filter};
+            eval $filter;
             $$valPt = $_ if defined $_;
         } elsif (ref $$valPt eq 'SCALAR') {
             my $val = $$$valPt; # make a copy to avoid filtering twice
-            $self->Filter(\$val);
+            Filter($filter, \$val);
             $$valPt = \$val;
         } elsif (ref $$valPt eq 'ARRAY') {
             my @val = @{$$valPt}; # make a copy to avoid filtering twice
-            $self->Filter(\$_) foreach @val;
+            Filter($filter, \$_) foreach @val;
             $$valPt = \@val;
         } elsif (ref $$valPt eq 'HASH') {
             my %val = %{$$valPt}; # make a copy to avoid filtering twice
-            $self->Filter(\$val{$_}) foreach keys %val;
+            Filter($filter, \$val{$_}) foreach keys %val;
             $$valPt = \%val;
         }
     }
@@ -5990,7 +6030,7 @@ sub ProcessJPEG($$)
                                 if ($$options{Binary}) {
                                     $val = \$buff if $raf->Seek($pos,0) and $raf->Read($buff,$len)==$len;
                                 } else {
-                                    $val = "(Binary data $len bytes)";
+                                    $val = \ "Binary data $len bytes";
                                 }
                                 if ($val) {
                                     $self->FoundTag('EmbeddedVideo', $val);

data/bin/lib/Image/ExifTool.pod

@@ -529,15 +529,19 @@ without recoding.  Default is 0.
 
 =item Compact
 
-Option to write compact XMP output.  The XMP specification recommends that
-the XMP packet be padded with 2 kB of blanks to allow in-place editing. With
-this option set to 1, the padding is not written.  Note that this effects
-only embedded XMP since padding is never written for stand-alone XMP files. 
-When set to 2, spaces to indent XMP for readability are also dropped.  A
-setting of 3 places all tags in a single rdf:Description element, and 4
-removes newlines from between XMP elements.  A setting of 5 also writes XMP
-in shorthand format (to save setting the XMPShorthand option separately). 
-Default is 0.
+Comma-delimited list of settings for writing compact XMP.  Below is a list
+of available settings.  Note that 'NoPadding' effects only embedded XMP
+since padding is never written for stand-alone XMP files.  Case is not
+significant.  Default is undef.
+
+  NoPadding - Avoid 2 kB of recommended padding at end of XMP
+  NoIndent  - Avoid spaces to indent lines for readability
+  NoNewline - Avoid unnecessary newlines
+  Shorthand - Use XMP Shorthand format
+  OneDesc   - Combine XMP properties into a single rdf:Description
+  AllSpace  - Equivalent to 'NoPadding,NoIndent,NoNewline'
+  AllFormat - Equivalent to 'Shorthand,OneDesc'
+  All       - Equivalent to 'AllSpace,AllFormat'
 
 =item Composite
 
@@ -606,10 +610,10 @@ 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)
-     2   - read extended XMP with any GUID
-  <guid> - read extended XMP with a specific GUID
+     0   - Ignore all extended XMP
+     1   - Read extended XMP with valid GUID only (default)
+     2   - Read extended XMP with any GUID
+  <guid> - Read extended XMP with a specific GUID
 
 =item ExtractEmbedded
 
@@ -643,6 +647,13 @@ variable as required.  The value is not changed if $_ is set to undef.  List
 items are filtered individually.  Applies to all returned values unless
 PrintConv option is disabled.
 
+=item FilterW
+
+Perl expression used to filter PrintConv values when writing.  The
+expression acts on the value of the Perl default variable ($_), and changes
+the value of this variable as required.  The value is not changed if $_ is
+set to undef.
+
 =item FixBase
 
 Fix maker notes base offset.  A common problem with image editing software
@@ -999,11 +1010,6 @@ and L<Image::ExifTool::TagNames/MacOS XAttr Tags> for more information).
 Flag to enable automatic conversion for unknown XMP tags with values that
 look like rational numbers or dates.  Default is 1.
 
-=item XMPShorthand
-
-Set to 1 to write xmp in shorthand format, or 2 to also combine properties
-into a single rdf:Description element.  Default is 0.
-
 =back
 
 =item Return Values:
@@ -1185,7 +1191,7 @@ The following ExifTool options are effective in the call to L</WriteInfo>:
 
 ByteOrder, Charset, CharsetEXIF, CharsetFileName, CharsetIPTC, Compact,
 Compress, FixBase, IgnoreMinorErrors, Password, PNGEarlyXMP,
-QuickTimeHandler, Verbose, WriteMode and XMPShorthand.
+QuickTimeHandler, Verbose and WriteMode.
 
 =head2 GetTagList