exiftool_vendored 10.40.0 → 10.43.0

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

@@ -55,10 +55,10 @@ documentation or some other files of the full distribution.</p>
 <h3>Stand-Alone Executable</h3>
 <ol>
 <li><b>Download</b> the <b>Windows Executable</b> from the <a href="index.html">ExifTool home page</a>.
-<br><span class=lt>(The file you download will have a name like "<code>exiftool-10.40.zip</code>".)</span></li>
+<br><span class=lt>(The file you download will have a name like "<code>exiftool-10.43.zip</code>".)</span></li>
 <li><b>Extract "<code>exiftool(-k).exe</code>"</b> from the
 "<code>.zip</code>" file, and place it <b>on your Desktop</b>.
-<br><span class=lt>(Double-click on "<code>exiftool-10.40.zip</code>" to open
+<br><span class=lt>(Double-click on "<code>exiftool-10.43.zip</code>" to open
 the archive, then drag "<code>exiftool(-k).exe</code>" to your Desktop.)</span></li>
 </ol>
 <p>You can now double-click on "<code>exiftool(-k).exe</code>" to read the
@@ -106,7 +106,7 @@ can be downloaded from
 <a href="http://www.activestate.com/activeperl/">activeperl.com</a>.)</p>
 <ol>
 <li><b>Download</b> the <b>Image-ExifTool distribution</b> from the <a href="index.html">ExifTool home page</a>
-<br><span class=lt>(The file you download will have a name like "<code>Image-ExifTool-10.40.tar.gz</code>".)</span></li>
+<br><span class=lt>(The file you download will have a name like "<code>Image-ExifTool-10.43.tar.gz</code>".)</span></li>
 <li><b>Extract the ExifTool files</b> from the archive.
 <br><span class=lt>(The archive is a gzipped tar file, and can be opened with
 various Windows utilities, including WinZip.)</span></li>
@@ -148,7 +148,7 @@ in the OS X package.  Both versions run natively on PPC and Intel Macs.</p>
 <h3>OS X Package</h3>
 <ol>
 <li><b>Download</b> the <b>ExifTool OS X Package</b> from the <a href="index.html">ExifTool home page</a>.
-<br><span class=lt>(The file you download will have a name like "<code>ExifTool-10.40.dmg</code>".)</span></li>
+<br><span class=lt>(The file you download will have a name like "<code>ExifTool-10.43.dmg</code>".)</span></li>
 <li><b>Install</b> as a normal <b>OS X package</b>.
 <br><span class=lt>(Open the disk image, double-click on the install package, and follow the instructions.)
 </span></li>
@@ -163,12 +163,12 @@ in the OS X package.  Both versions run natively on PPC and Intel Macs.</p>
 <ol>
 <li><b>Download</b> the <b>Image-ExifTool distribution</b> from the <a href="index.html">ExifTool home page</a>
 to your Desktop.
-<br><span class=lt>(The file you download will have a name like "<code>Image-ExifTool-10.40.tar.gz</code>".)</span></li>
+<br><span class=lt>(The file you download will have a name like "<code>Image-ExifTool-10.43.tar.gz</code>".)</span></li>
 <li><b>Launch</b> the <b>Terminal</b> application from the Utilities folder in your Applications folder.</li>
 <li>In the Terminal window, <b>type the following</b>:
 <pre class='code'>    cd ~/Desktop
-    tar -xzf Image-ExifTool-10.40.tar.gz
-    cd Image-ExifTool-10.40
+    tar -xzf Image-ExifTool-10.43.tar.gz
+    cd Image-ExifTool-10.43
     sudo cp -r exiftool lib /usr/local/bin
 </pre>
 <span class=lt>(Note: The last step above will require you to enter your
@@ -184,7 +184,7 @@ your Perl version. If both sets of libraries exist, /usr/local/bin/lib takes
 precedence for exiftool, but /Library/Perl/#.#.# is the default for any other
 Perl scripts.</li>
 <li>In OS X 10.8 or later, you may see this message when you try to open the install package:
-<blockquote class=red>"ExifTool-10.40.pkg" can't be opened because it is from an
+<blockquote class=red>"ExifTool-10.43.pkg" can't be opened because it is from an
 unidentified developer.</blockquote> The solution is to control-click on the pkg
 then select "Open" from the pop-up menu instead of just double-clicking.  An alternative
 is to lower the security settings by changing "Allow applications downloaded from" to
@@ -210,11 +210,11 @@ have the wrong "<code>lib</code>" folder.</li>
 
 <ol>
 <li><b>Download</b> the <b>Image-ExifTool distribution</b> from the <a href="index.html">ExifTool home page</a>
-<br><span class=lt>(The file you download will have a name like "<code>Image-ExifTool-10.40.tar.gz</code>".)</span></li>
+<br><span class=lt>(The file you download will have a name like "<code>Image-ExifTool-10.43.tar.gz</code>".)</span></li>
 <li><b>Unpack the distribution</b> and <b>make it your current directory</b> by typing:
 <pre class='code'>    cd <i>&lt;your download directory&gt;</i>
-    gzip -dc Image-ExifTool-10.40.tar.gz | tar -xf -
-    cd Image-ExifTool-10.40
+    gzip -dc Image-ExifTool-10.43.tar.gz | tar -xf -
+    cd Image-ExifTool-10.43
 </pre>
 <span class=lt>(At this point you may run exiftool by typing
 "<code>exiftool <i>&lt;image file name&gt;</i></code>".)</span></li>

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/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.40';
+$VERSION = '10.43';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -418,6 +418,7 @@ my %fileTypeLookup = (
     PS3  =>  'PS',
     PSB  => ['PSD',  'Photoshop Large Document'],
     PSD  => ['PSD',  'Photoshop Document'],
+    PSDT => ['PSD',  'Photoshop Document Template'],
     PSP  => ['PSP',  'Paint Shop Pro'],
     PSPFRAME => 'PSP',
     PSPIMAGE => 'PSP',
@@ -1207,8 +1208,30 @@ my %systemTagsNotes = (
     FileDeviceNumber => { Groups => { 1 => 'System' }, %systemTagsNotes },
     FileInodeNumber  => { Groups => { 1 => 'System' }, %systemTagsNotes },
     FileHardLinks    => { Groups => { 1 => 'System' }, %systemTagsNotes },
-    FileUserID       => { Groups => { 1 => 'System' }, %systemTagsNotes, PrintConv => 'eval { getpwuid($val) } || $val' },
-    FileGroupID      => { Groups => { 1 => 'System' }, %systemTagsNotes, PrintConv => 'eval { getgrgid($val) } || $val' },
+    FileUserID => {
+        Groups => { 1 => 'System' },
+        Notes => q{
+            extracted only if specifically requested or the SystemTags or RequestAll API
+            option is set.  Returns user ID number with the -n option, or name
+            otherwise.  May be written with either user name or number
+        },
+        Writable => 1,
+        Protected => 1, # all writable pseudo-tags must be protected!
+        PrintConv => 'eval { getpwuid($val) } || $val',
+        PrintConvInv => 'eval { getpwnam($val) } || ($val=~/[^0-9]/ ? undef : $val)',
+    },
+    FileGroupID => {
+        Groups => { 1 => 'System' },
+        Notes => q{
+            extracted only if specifically requested or the SystemTags or RequestAll API
+            option is set.  Returns group ID number with the -n option, or name
+            otherwise.  May be written with either group name or number
+        },
+        Writable => 1,
+        Protected => 1, # all writable pseudo-tags must be protected!
+        PrintConv => 'eval { getgrgid($val) } || $val',
+        PrintConvInv => 'eval { getgrnam($val) } || ($val=~/[^0-9]/ ? undef : $val)',
+    },
     FileBlockSize    => { Groups => { 1 => 'System' }, %systemTagsNotes },
     FileBlockCount   => { Groups => { 1 => 'System' }, %systemTagsNotes },
     HardLink => {
@@ -1911,6 +1934,7 @@ sub ClearOptions($)
         TextOut     => \*STDOUT,# file for Verbose/HtmlDump output
         Unknown     => 0,       # flag to get values of unknown tags (0-2)
         UserParam   => { },     # user parameters for InsertTagValues()
+        Validate    => undef,   # perform additional validation
         Verbose     => 0,       # print verbose messages (0-5, higher # = more verbose)
         WriteMode   => 'wcg',   # enable all write modes by default
         XMPAutoConv => 1,       # automatic conversion of unknown XMP tag values
@@ -1961,11 +1985,13 @@ sub ExtractInfo($;@)
         delete $$self{EXIF_DATA};
         delete $$self{EXIF_POS};
     } else {
-        if (defined $_[0] or $$options{HtmlDump}) {
+        if (defined $_[0] or $$options{HtmlDump} or $$req{validate}) {
             %saveOptions = %$options;       # save original options
 
             # require duplicates for html dump
             $self->Options(Duplicates => 1) if $$options{HtmlDump};
+            # enable Validate option if Validate tag is requested
+            $self->Options(Validate => 1) if $$req{validate};
 
             if (defined $_[0]) {
                 # only initialize filename if called with arguments
@@ -1994,8 +2020,10 @@ sub ExtractInfo($;@)
                 $self->WarnOnce('Install Time::HiRes to generate ProcessingTime');
             }
         }
+
         ++$$self{FILE_SEQUENCE};        # count files read
     }
+
     my $filename = $$self{FILENAME};    # image file name ('' if already open)
     my $raf = $$self{RAF};              # RandomAccess object
 
@@ -2319,6 +2347,13 @@ sub ExtractInfo($;@)
             }
         }
     }
+
+    # generate Validate tag if requested
+    if ($$options{Validate} and not $reEntry) {
+        require Image::ExifTool::Validate;
+        Image::ExifTool::Validate::FinishValidate($self, $$req{validate});
+    }
+
     @startTime and $self->FoundTag('ProcessingTime', Time::HiRes::tv_interval(\@startTime));
 
     # restore original options
@@ -2328,7 +2363,7 @@ sub ExtractInfo($;@)
         # restore necessary members when exiting re-entrant code
         $$self{$_} = $$reEntry{$_} foreach keys %$reEntry;
     }
-
+    
     # ($type may be undef without an Error when processing sub-documents)
     return 0 if not defined $type or exists $$self{VALUE}{Error};
     return 1;
@@ -5617,6 +5652,7 @@ sub ProcessJPEG($$)
                 }
                 next if $trailInfo or $wantTrailer or $verbose > 2 or $htmlDump;
             }
+            next if $$self{OPTIONS}{Validate};  # (validate to EOI)
             # nothing interesting to parse after start of scan (SOS)
             $success = 1;
             last;   # all done parsing file
@@ -5632,10 +5668,10 @@ sub ProcessJPEG($$)
             next;
         } elsif ($marker == 0xdb and length($$segDataPt) and    # DQT
             # save the DQT data only if JPEGDigest has been requested
-            # (Note: this will not work with the application -p option
-            #  because we aren't checking the RequestAll API option here.
-            #  The reason is that there is too much overhead involved in
-            #  the calculation of this tag to make this worth the CPU time.)
+            # (Note: since we aren't checking the RequestAll API option here, the application
+            #  must use the RequestTags option to generate these tags if they have not been
+            #  specifically requested.  The reason is that there is too much overhead involved
+            #  in the calculation of this tag to make this worth the CPU time.)
             ($$self{REQ_TAG_LOOKUP}{jpegdigest} or $$self{REQ_TAG_LOOKUP}{jpegqualityestimate}))
         {
             my $num = unpack('C',$$segDataPt) & 0x0f;   # get table index
@@ -6411,7 +6447,7 @@ sub DoProcessTIFF($$;$)
     }
     my $ifdName = 'IFD0';
     if (not $tagTablePtr or $$tagTablePtr{GROUPS}{0} eq 'EXIF') {
-        $self->FoundTag('ExifByteOrder', $byteOrder);
+        $self->FoundTag('ExifByteOrder', $byteOrder) unless $outfile;
     } else {
         $ifdName = $$tagTablePtr{GROUPS}{1};
     }

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

@@ -622,8 +622,8 @@ Default is undef.
 
 Perl expression used to filter values for all tags.  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 the expression returns
-undef.  Applies to all returned values unless PrintConv option is disabled.
+variable as required.  The value is not changed if $_ is set to undef. 
+Applies to all returned values unless PrintConv option is disabled.
 
 =item FixBase
 
@@ -904,6 +904,11 @@ the parameter name with a dollar sign, just like normal tags.  If called
 without no additional arguments, C<Options('UserParam')> returns a reference
 to the hash of all user parameters (with lower-case names).
 
+=item Validate
+
+[Experimental] Flag to perform extra validation checks when reading, causing
+extra warnings to be generated if problems are found.  Default is undef.
+
 =item Verbose
 
 Print verbose messages to file specified by TextOut option.  Value may be
@@ -1411,10 +1416,11 @@ this tag only.  Default is 0.
 
 =item Group
 
-Specifies group name where tag should be written.  If not specified, tag is
-written to highest priority group as specified by L</SetNewGroups>.  May be
-one or more family 0, 1 or 2 groups with optional leading family number,
-separated by colons.  Case is not significant.
+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 L</SetNewGroups>.  May be one or more
+family 0, 1 or 2 groups with optional leading family number, separated by
+colons.  Case is not significant.
 
 =item NoFlat
 

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -31,8 +31,9 @@ use Image::ExifTool::IPTC;
 use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
+use Image::ExifTool::Validate;
 
-$VERSION = '3.01';
+$VERSION = '3.03';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -519,11 +520,11 @@ in this column are write-only.
 
 Tags in the family 1 "System" group are referred to as "pseudo" tags because
 they don't represent real metadata in the file.  Instead, this information
-is stored in the directory structure of the filesystem.  Seven writable
+is stored in the directory structure of the filesystem.  Nine writable
 "pseudo" tags (FileName, Directory, FileModifyDate, FileCreateDate,
-FilePermissions, HardLink and TestName) may be written without modifying the
-file itself.  The TestName tag is used for dry-run testing before writing
-FileName.
+FilePermissions, FileUserID, FileGroupID, HardLink and TestName) may be
+written without modifying the file itself.  The TestName tag is used for
+dry-run testing before writing FileName.
 },
     Composite => q{
 The values of the composite tags are B<Derived From> the values of other
@@ -603,39 +604,6 @@ my %shortcutNotes = (
 );
 
 
-
-# EXIF table tag ID's which are part of the EXIF 2.3 specification
-# (used only to add underlines in HTML version of EXIF Tag Table)
-my %exifSpec = (
-    0x100 => 1,  0x214 => 1,   0x9205 => 1,  0xa210 => 1,
-    0x101 => 1,  0x8298 => 1,  0x9206 => 1,  0xa214 => 1,
-    0x102 => 1,  0x829a => 1,  0x9207 => 1,  0xa215 => 1,
-    0x103 => 1,  0x829d => 1,  0x9208 => 1,  0xa217 => 1,
-    0x106 => 1,  0x8769 => 1,  0x9209 => 1,  0xa300 => 1,
-    0x10e => 1,  0x8822 => 1,  0x920a => 1,  0xa301 => 1,
-    0x10f => 1,  0x8824 => 1,  0x9214 => 1,  0xa302 => 1,
-    0x110 => 1,  0x8825 => 1,  0x927c => 1,  0xa401 => 1,
-    0x111 => 1,  0x8827 => 1,  0x9286 => 1,  0xa402 => 1,
-    0x112 => 1,  0x8828 => 1,  0x9290 => 1,  0xa403 => 1,
-    0x115 => 1,  0x8830 => 1,  0x9291 => 1,  0xa404 => 1,
-    0x116 => 1,  0x8831 => 1,  0x9292 => 1,  0xa405 => 1,
-    0x117 => 1,  0x8832 => 1,  0x9400 => 1,  0xa406 => 1,
-    0x11a => 1,  0x8833 => 1,  0x9401 => 1,  0xa407 => 1,
-    0x11b => 1,  0x8834 => 1,  0x9402 => 1,  0xa408 => 1,
-    0x11c => 1,  0x8835 => 1,  0x9403 => 1,  0xa409 => 1,
-    0x128 => 1,  0x9000 => 1,  0x9404 => 1,  0xa40a => 1,
-    0x12d => 1,  0x9003 => 1,  0x9405 => 1,  0xa40b => 1,
-    0x131 => 1,  0x9004 => 1,  0xa000 => 1,  0xa40c => 1,
-    0x132 => 1,  0x9010 => 1,  0xa001 => 1,  0xa420 => 1,
-    0x13b => 1,  0x9011 => 1,  0xa002 => 1,  0xa430 => 1,
-    0x13e => 1,  0x9012 => 1,  0xa003 => 1,  0xa431 => 1,
-    0x13f => 1,  0x9101 => 1,  0xa004 => 1,  0xa432 => 1,
-    0x201 => 1,  0x9102 => 1,  0xa005 => 1,  0xa433 => 1,
-    0x202 => 1,  0x9201 => 1,  0xa20b => 1,  0xa434 => 1,
-    0x211 => 1,  0x9202 => 1,  0xa20c => 1,  0xa435 => 1,
-    0x212 => 1,  0x9203 => 1,  0xa20e => 1,
-    0x213 => 1,  0x9204 => 1,  0xa20f => 1,
-);
 # same thing for RIFF INFO tags found in the EXIF spec
 my %riffSpec = (
     IARL => 1,  ICRD => 1,  IGNR => 1,  IPLT => 1,  ISRC => 1,
@@ -1926,7 +1894,7 @@ sub WriteTagNames($$)
     # open the file and write the header
     open(PODFILE, ">$podFile") or return 0;
     print PODFILE Doc2Pod($docs{PodHeader}, $docs{ExifTool}, $docs{ExifTool2});
-    mkdir "$htmldir/TagNames";
+    mkdir "$htmldir/TagNames", 0777;
     OpenHtmlFile($htmldir) or return 0;
     print HTMLFILE "<blockquote>\n";
     print HTMLFILE "<table width='100%' class=frame><tr><td>\n";
@@ -2340,7 +2308,7 @@ sub WriteTagNames($$)
             foreach (@$tagNames) {
                 push @htmlTags, EscapeHTML($_);
             }
-            if (($isExif and $exifSpec{hex $tagIDstr}) or
+            if (($isExif and $Image::ExifTool::Validate::exifSpec{hex $tagIDstr}) or
                 ($isRiff and $tagIDstr=~/(\w+)/ and $riffSpec{$1}) or
                 ($isXmpMain and $tagIDstr=~/([-\w]+)/ and $xmpSpec{$1}))
             {