exiftool_vendored 10.40.0 → 10.43.0

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '10.40';
+my $version = '10.43';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -165,6 +165,8 @@ my $recurse;        # recurse into subdirectories (2=also hidden directories)
 my $rtnVal;         # command return value (0=success)
 my $saveCount;      # count the number of times we will/did call SaveNewValues()
 my $scanWritable;   # flag to process only writable file types
+my $sectHeader;     # current section header for -p option
+my $sectTrailer;    # section trailer for -p option
 my $seqFileNum;     # sequential file number used for %C
 my $showGroup;      # number of group to show (may be zero or '')
 my $showTagID;      # non-zero to show tag ID's
@@ -405,7 +407,6 @@ undef $escapeHTML;
 undef $evalWarning;
 undef $executeID;
 undef $fileHeader;
-undef $fileTrailer;
 undef $filtered;
 undef $fixLen;
 undef $forcePrint;
@@ -420,6 +421,7 @@ undef $progressCount;
 undef $progressMax;
 undef $recurse;
 undef $scanWritable;
+undef $sectHeader;
 undef $showGroup;
 undef $showTagID;
 undef $structOpt;
@@ -446,6 +448,7 @@ $countLink = 0;
 $countNewDir = 0;
 $countSameWr = 0;
 $csvSaveCount = 0;
+$fileTrailer = '';
 $filterFlag = 0;
 $html = 0;
 $isWriting = 0;
@@ -456,6 +459,7 @@ $overwriteOrig = 0;
 $progStr = '';
 $quiet = 0;
 $saveCount = 0;
+$sectTrailer = '';
 $seqFileNum = 0;
 $tabFormat = 0;
 $utf8 = 1;
@@ -1380,6 +1384,7 @@ if ($xml) {
     }
     $mt->Options(List => 1) unless $joinLists;
     $mt->Options(Duplicates => 0) unless defined $showGroup;
+    $showTagID = 'D' if $tabFormat and not $showTagID;
 } elsif ($structOpt) {
     $mt->Options(List => 1);
 } else {
@@ -1671,7 +1676,8 @@ if ($filtered and not $validFile) {
 # print CSV information if necessary
 PrintCSV() if $csv and not $isWriting;
 
-# print file trailer if necessary
+# print folder/file trailer if necessary
+print $sectTrailer if $sectTrailer and not $textOut;
 print $fileTrailer if $fileTrailer and not $textOut and not $fileHeader;
 
 if (defined $deleteOrig) {
@@ -1955,7 +1961,7 @@ sub GetImageInfo($$)
     if ($binaryOutput or not %$info) {
         my $errs = $et->GetInfo('Warning', 'Error');
         PrintErrors($et, $errs, $file) and $rtnVal = 1;
-    } elsif ($et->GetValue('Error')) {
+    } elsif ($et->GetValue('Error') or ($$et{Validate} and $et->GetValue('Warning'))) {
         $rtnVal = 1;
     }
 
@@ -1970,22 +1976,22 @@ sub GetImageInfo($$)
     if (%printFmt) {
         # output using print format file (-p) option
         my ($type, $doc, $grp);
-        undef $fileTrailer;
+        $fileTrailer = '';
         # repeat for each embedded document if necessary
         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) {
+        for ($doc=0; $doc<=$lastDoc; ++$doc) {
+            foreach $type (qw(HEAD SECT BODY ENDS TAIL)) {
+                my $prf = $printFmt{$type} or next;
                 if ($lastDoc) {
                     if ($doc) {
-                        last unless $type eq 'BODY'; # only repeat BODY lines
+                        next if $type eq 'HEAD' or $type eq 'TAIL'; # only repeat SECT/BODY/ENDS
                         $grp = "Doc$doc:";
                     } else {
                         $grp = 'Main:';
                     }
                     # change tag groups to print next document by adding "Main:" or "Doc#:"
                     # to all tags which don't already start with a family 3 group name
-                    $prf = [ @{$printFmt{$type}} ];
+                    $prf = [ @$prf ];
                     s/((^|[^\$])(\$\$)*\$\{?)((?!(Main|Doc\d+):)[\w])/$1$grp$4/ig foreach @$prf;
                 }
                 my @lines;
@@ -1994,8 +2000,17 @@ sub GetImageInfo($$)
                     push @lines, $line if defined $line;
                 }
                 $lineCount += scalar @lines;
-                if ($type eq 'TAIL') {
-                    $fileTrailer = '' unless defined $fileTrailer;
+                if ($type eq 'SECT') {
+                    my $thisHeader = join '', @lines;
+                    if ($sectHeader and $sectHeader ne $thisHeader) {
+                        print $fp $sectTrailer if $sectTrailer;
+                        undef $sectHeader;
+                    }
+                    $sectTrailer = '';
+                    print $fp $sectHeader = $thisHeader unless $sectHeader;
+                } elsif ($type eq 'ENDS') {
+                    $sectTrailer .= join '', @lines if defined $sectHeader;
+                } elsif ($type eq 'TAIL') {
                     $fileTrailer .= join '', @lines;
                 } elsif (@lines) {
                     print $fp @lines;
@@ -2068,9 +2083,12 @@ TAG:    foreach $tag (@foundTags) {
             # make sure this tag has a value
             my $val = $$info{$tag};
             if (ref $val) {
-                if (defined $binaryOutput and not $binaryOutput) { # happens with -X -b or -php -b
+                # happens with -X, -j or -php when combined with -b:
+                if (defined $binaryOutput and not $binaryOutput and $$et{TAG_INFO}{$tag}{Protected}) {
                     # avoid extracting Protected binary tags (eg. data blocks) [insider information]
-                    next if $$et{TAG_INFO}{$tag}{Protected} and not $$et{REQ_TAG_LOOKUP}{lc $tag};
+                    my $lcTag = lc $tag;
+                    $lcTag =~ s/ .*//;
+                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
                 if ($structOpt) {
@@ -2297,6 +2315,11 @@ TAG:    foreach $tag (@foundTags) {
                         $id = sprintf('0x%.4x', $id) if $showTagID eq 'H' and $id =~ /^\d+$/;
                         $$val{id} = $id;
                     }
+                    if ($tabFormat) {
+                        $$val{table} = $et->GetTableName($tag);
+                        my $index = $et->GetTagIndex($tag);
+                        $$val{index} = $index if defined $index;
+                    }
                     if ($outFormat < 0) {
                         $$val{desc} = $desc;
                         if ($printConv) {
@@ -2425,7 +2448,9 @@ TAG:    foreach $tag (@foundTags) {
         }
     }
     if ($outfile) {
-        print $fp $fileTrailer if $fileTrailer; # write file trailer
+        # write section and file trailers before closing the file
+        print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
+        print $fp $fileTrailer if $fileTrailer;
         close($fp);
         undef $tmpText;
         if ($lineCount) {
@@ -3522,7 +3547,7 @@ sub AddPrintFormat($)
     my $expr = shift;
     my $type;
     if ($expr =~ /^#/) {
-        $expr =~ s/^#\[(HEAD|BODY|TAIL)\]// or return; # ignore comments
+        $expr =~ s/^#\[(HEAD|SECT|BODY|ENDS|TAIL)\]// or return; # ignore comments
         $type = $1;
     } else {
         $type = 'BODY';
@@ -4747,8 +4772,9 @@ the B<-D> or B<-H> option changes tag values to JSON objects with "val" and
 "id" fields, and adding B<-l> adds a "desc" field, and a "num" field if the
 numerical value is different from the converted "val".  The B<-b> option may
 be added to output binary data, encoded in base64 if necessary (indicated by
-"base64:" as the first 7 bytes of the value).  The JSON output is UTF-8
-regardless of any B<-L> or B<-charset> option setting, but the UTF-8
+"base64:" as the first 7 bytes of the value), and B<-t> may be added to
+include tag table information (see B<-t> for details).  The JSON output is
+UTF-8 regardless of any B<-L> or B<-charset> option setting, but the UTF-8
 validation is disabled if a character set other than UTF-8 is specified.
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
@@ -4840,17 +4866,20 @@ when writing.  For example, the following commands all have the same effect:
 
 =item B<-p> I<FMTFILE> or I<STR> (B<-printFormat>)
 
-Print output in the format specified by the given file or string (and ignore
-other format options).  Tag names in the format file or string begin with a
-C<$> symbol and may contain a leading group names and/or a trailing C<#>. 
-Case is not significant.  Braces C<{}> may be used around the tag name to
-separate it from subsequent text.  Use C<$$> to represent a C<$> symbol, and
-C<$/> for a newline.  Multiple B<-p> options may be used, each contributing
-a line of text to the output.  Lines beginning with C<#[HEAD]> and
-C<#[TAIL]> are output only for the first and last processed files
-respectively.  Lines beginning with C<#[BODY]> and lines not beginning with
-C<#> are output for each processed file.  Other lines beginning with C<#>
-are ignored.  For example, this format file:
+Print output in the format specified by the given file or string.  Tag names
+in the format file or string begin with a C<$> symbol and may contain a
+leading group names and/or a trailing C<#>.  Case is not significant. 
+Braces C<{}> may be used around the tag name to separate it from subsequent
+text.  Use C<$$> to represent a C<$> symbol, and C<$/> for a newline. 
+Multiple B<-p> options may be used, each contributing a line of text to the
+output.  Lines beginning with C<#[HEAD]> and C<#[TAIL]> are output before
+the first processed file and after the last processed file respectively. 
+Lines beginning with C<#[SECT]> and C<#[ENDS]> are output around each
+section of files.  A section is defined as a group of consecutive files with
+the same section header (eg. files are grouped by directory if C<#[SECT]>
+contains C<$directory>).  Lines beginning with C<#[BODY]> and lines not
+beginning with C<#> are output for each processed file.  Other lines
+beginning with C<#> are ignored.  For example, this format file:
 
     # this is a comment line
     #[HEAD]-- Generated by ExifTool $exifToolVersion --
@@ -4864,7 +4893,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 10.40 --
+    -- Generated by ExifTool 10.43 --
     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
@@ -4880,31 +4909,33 @@ to set the value of missing tags to '-' (but this may be configured via the
 MissingTagValue API option), or the B<-m> option may be used to ignore minor
 warnings and leave the missing values empty.
 
-An advanced formatting feature allows an arbitrary Perl expression to be
+An B<advanced formatting feature> allows an arbitrary Perl expression to be
 applied to the value of any tag by placing it inside the braces after the
 tag name, separated by a semicolon.  The expression acts on the value of the
 tag through the default input variable (C<$_>), and has access to the full
 ExifTool API through the current ExifTool object (C<$self>).  It may contain
 any valid Perl code, including translation (C<tr///>) and substitution
 (C<s///>) operations, but note that braces within the expression must be
-balanced. The example below prints the camera Make with spaces translated to
-underlines, and multiple consecutive underlines replaced by a single
+balanced.  The example below prints the camera Make with spaces translated
+to underlines, and multiple consecutive underlines replaced by a single
 underline:
 
     exiftool -p '${make;tr/ /_/;s/__+/_/g}' image.jpg
 
 A default expression of C<tr(/\\?*:|"E<lt>E<gt>\0)()d> is assumed if the
-expression is empty.  This removes the characters / \ ? * : | E<lt> E<gt>
-and null from the printed value.  (These characters are illegal in Windows
-file names, so this feature is useful if tag values are used in file names.)
+expression is empty (ie. C<${TAG;}>).  This removes the characters / \ ? * :
+| E<lt> E<gt> and null from the printed value.  (These characters are
+illegal in Windows file names, so this feature is useful if tag values are
+used in file names.)
 
 =item B<-php>
 
 Format output as a PHP Array.  The B<-g>, B<-G>, B<-D>, B<-H>, B<-l>,
 B<-sep> and B<-struct> options combine with B<-php>, and duplicate tags are
 handled in the same way as with the B<-json> option.  As well, the B<-b>
-option may be added to output binary data.  Here is a simple example showing
-how this could be used in a PHP script:
+option may be added to output binary data, and B<-t> may be added to include
+tag table information (see B<-t> for details).  Here is a simple example
+showing how this could be used in a PHP script:
 
     <?php
     eval('$array=' . `exiftool -php -q image.jpg`);
@@ -4968,8 +4999,9 @@ may always be used when writing.
 Output a tab-delimited list of description/values (useful for database
 import).  May be combined with B<-s> to print tag names instead of
 descriptions, or B<-S> to print tag values only, tab-delimited on a single
-line.  The B<-t> option may also be used to add tag table information to the
-B<-X> option output.
+line.  The B<-t> option may be combined with B<-j>, B<-php> or B<-X> to add
+tag table information (table C<name>, decimal tag C<id>, and C<index> for
+cases where multiple conditional tags exist with the same ID).
 
 =item B<-T> (B<-table>)
 
@@ -5163,9 +5195,8 @@ B<-s> or B<-sep> is used.  Using B<-L> changes the XML encoding from "UTF-8"
 to "windows-1252".  Other B<-charset> settings change the encoding only if
 there is a corresponding standard XML character set.  The B<-b> option
 causes binary data values to be written, encoded in base64 if necessary. 
-The B<-t> option adds tag table information to the output (table C<name>,
-decimal tag C<id>, and C<index> for cases where multiple conditional tags
-exist with the same ID).
+The B<-t> option adds tag table information to the output (see B<-t> for
+details).
 
 Note:  This output is NOT the same as XMP because it uses
 dynamically-generated property names corresponding to the ExifTool tag
@@ -5721,11 +5752,12 @@ options on the command line.
 
 Load specified configuration file instead of the default ".ExifTool_config".
 If used, this option must come before all other arguments on the command
-line.  The I<CFGFILE> name may contain a directory specification (otherwise
-the file must exist in the current directory), or may be set to an empty
-string ("") to disable loading of the config file.  See the sample
-configuration file and "config.html" in the full ExifTool distribution for
-more information about the ExifTool configuration file.
+line and applies to all B<-execute>'d commands.  The I<CFGFILE> name may
+contain a directory specification (otherwise the file must exist in the
+current directory), or may be set to an empty string ("") to disable loading
+of the config file.  See the sample configuration file and "config.html" in
+the full ExifTool distribution for more information about the ExifTool
+configuration file.
 
 =item B<-echo>[I<NUM>] I<TEXT>
 
@@ -5739,10 +5771,10 @@ respectively) after processing is complete.
 Execute command for all arguments up to this point on the command line (plus
 any arguments specified by B<-common_args>).  The result is as if the
 commands were executed as separate command lines (with the exception of the
-B<-use> option which remains in effect for subsequent commands).  Allows
-multiple commands to be executed from a single command line.  I<NUM> is an
-optional number that is echoed in the "{ready}" message when using the
-B<-stay_open> feature.
+B<-config> and B<-use> options which remain in effect for subsequent
+commands).  Allows multiple commands to be executed from a single command
+line.  I<NUM> is an optional number that is echoed in the "{ready}" message
+when using the B<-stay_open> feature.
 
 =item B<-srcfile> I<FMT>
 

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/fmt_files/kml.fmt

@@ -4,12 +4,13 @@
 # Description:  Example ExifTool print format file for generating a
 #               Google Earth KML file from a collection of geotagged images
 #
-# Usage:        exiftool -p kml.fmt FILE [...] > out.kml
+# Usage:        exiftool -p kml.fmt -r DIR [...] > out.kml
 #
-# Requires:     ExifTool version 8.10 or later
+# Requires:     ExifTool version 10.41 or later
 #
 # Revisions:    2010/02/05 - P. Harvey created
 #               2013/02/05 - PH Fixed camera icon to work with new Google Earth
+#               2017/02/02 - PH Organize into folders based on file directory
 #
 # Notes:     1) All input files must contain GPSLatitude and GPSLongitude.
 #            2) For Google Earth to be able to find the images, the input
@@ -34,9 +35,9 @@
 #[HEAD]        </Icon>
 #[HEAD]      </IconStyle>
 #[HEAD]    </Style>
-#[HEAD]    <Folder>
-#[HEAD]      <name>Waypoints</name>
-#[HEAD]      <open>0</open>
+#[SECT]    <Folder>
+#[SECT]      <name>$directory</name>
+#[SECT]      <open>0</open>
 #[BODY]      <Placemark>
 #[BODY]        <description><![CDATA[<br/><table><tr><td>
 #[BODY]        <img src='$directory/$filename'
@@ -50,6 +51,6 @@
 #[BODY]          <coordinates>$gpslongitude#,$gpslatitude#,0</coordinates>
 #[BODY]        </Point>
 #[BODY]      </Placemark>
-#[TAIL]    </Folder>
+#[ENDS]    </Folder>
 #[TAIL]  </Document>
 #[TAIL]</kml>

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/html/ExifTool.html

@@ -570,7 +570,7 @@ distribution for examples.</p>
     <td>Perl expression used to filter all returned tag values.  Applies to
     PrintConv values only.</td><td><a name="Filter"></a>Expression to act on the
     value of the Perl default variable ($_), changing the value of this variable
-    as required.  The value is not changed if the expression returns undef</td>
+    as required.  The value is not changed if $_ is set to undef.</td>
     <td align=center>undef</td></tr>
 <tr><td>FixBase</td>
     <td>Fix maker notes base offset.  Allows values to be extracted from maker notes
@@ -797,6 +797,9 @@ distribution for examples.</p>
     <tr><td valign=top><b>undef</b></td><td valign=top>-</td><td>Clear UserParam hash</td></tr>
     </table>
     </td><td align=center>{ }</td></tr>
+<tr><td>Validate</td><td><a name="Validate"></a>[Experimental] Flag to perform extra validation
+    checks when reading, causing extra warnings to be generated if problems are found.</td>
+    <td align=center>0 or 1</td><td align=center>undef</td></tr>
 <tr><td>Verbose</td><td>Print verbose messages to file specified by TextOut option.
     <a href="verbose.html">Click here</a> for example outputs.</td>
     <td><a name="Verbose"></a><table class=clear>
@@ -1219,9 +1222,10 @@ errors are printed to STDERR.
 <tr><td>EditOnly</td><td>Edit tag only if it already exists. Don't create new tag.
     Effectively removes the 'c' from the ExifTool WriteMode option for this tag only.</td>
     <td align=center>0 or 1</td><td align=center>0</td></tr>
-<tr><td>Group</td><td>Specifies group name where tag should be written.
-    If not specified, tag is written to highest priority group as specified
-    by <a href="#SetNewGroups">SetNewGroups</a>.  Case is not significant</td>
+<tr><td>Group</td><td>Specifies group name where tag should be written.  This
+    option is superseded by any group specified in the tag name. If not
+    specified, tag is written to highest priority group as specified by
+    <a href="#SetNewGroups">SetNewGroups</a>.  Case is not significant</td>
     <td align=center>One or more family 0, 1 or 2 groups with optional leading
     family number, separated by colons</td><td align=center>undef</td></tr>
 <tr><td>NoFlat</td><td>Treat flattened tags as 'unsafe'</td><td align=center>0 or 1</td><td align=center>0</td></tr>