exiftool_vendored 9.71.0 → 9.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d81f5abaacddb3866feb0b68aff4880896906c4
-  data.tar.gz: e32e63d4a70fe697c7ebbca28b263965eb54209e
+  metadata.gz: 9a97483450c7f7dc840be7d23f3910a3b3944f7f
+  data.tar.gz: d067af1260bc79e5d4a8b646df1b2884a3aaeb48
 SHA512:
-  metadata.gz: 6391c391e8799247aba38ff268ed38ed8060573963fb6b978ab45ec0625c1a956e84aff74bb3b3e740c0bca0495a5c009e47832073c03182b4e49e30f3b85800
-  data.tar.gz: b03c6c715c1cd56b5b79a80a501ee9360b56e5ba1ded7eb1097eaef2975ab9640b4aa25a8b769d907c436c5990719191e652a1b2fda697f565fb3069d598bb6d
+  metadata.gz: 745c9ea314043f78006b23aefa818724b4fabf0c42f6b486aeeaf625640cbc442f710f3b09c86809a08f6de27535d62177a822aaa362e95436f74d0a3c57fd50
+  data.tar.gz: b54aa761f7db5930637087da30cb5a96e5cb0a9099ba959bc38df2bca644238701a23bd6cc5ce0e2fe68c349c88ef671ff1b7c6072804831dd1baef6df995a8f

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/Changes

@@ -4,9 +4,114 @@ ExifTool Version History
 
 RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 
-Note: The most recent production release is Version 9.70. (Other versions are
+Note: The most recent production release is Version 9.76. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Dec. 13, 2014 - Version 9.78
+
+  - Added a new Nikon LensID and a new Canon LensType (thanks LibRaw)
+  - Decode a new unknown atom in Canon MOV videos
+  - Decode a number of new Sony tags (thanks Jos Roost)
+  - Decode a number of new Samsung tags
+  - Improved MakerNote compatibility when writing by adding the same amount of
+    padding after the MakerNote IFD as that written by the specific camera model
+  - Changed the DNG BaselineExposureOffset to a signed rational (contrary to the
+    DNG 1.4 specification, which specifies an unsigned RATIONAL, but obviously
+    Adobe meant for it to store negative values)
+  - Changed name of new QuickTime Rating tag to RatingPercent
+  - Fixed problem introduced in 9.64 where multiple list values from some tags
+    in ZIP-based files were extracted as separate tags instead of as a list when
+    the -struct option was used, and implemented a different patch to just
+    suppress the structure warnings without changing the 9.63 behaviour
+  - Fixed problem where some EXIF information in MOV videos could be corrupted
+    when writing
+
+Nov. 28, 2014 - Version 9.77
+
+  - Added FilePath tag (generated only if specified and Cwd is available)
+  - Added a new Panasonic ShootingMode (thanks Horst Wandres)
+  - Added a new FujiFilm WhiteBalance value
+  - Added a new QuickTime vendor ID
+  - Added a new Pentax RawDevelopmentProcess value
+  - Decode a few new QuickTime tags
+  - Decode some new tags in Kodak SP360 MP4 videos
+  - Fixed bug that could cause a runtime error when parsing a Canon EOS 40D
+    image which had been edited by Nikon Capture software
+  - Fixed bug which could produce invalid XML in the -X output when -struct was
+    also used
+
+Nov. 15, 2014 - Version 9.76 (production release)
+
+  - Added support for the LFR format (same as LFP)
+  - Added support for Samsung models which write 2 values for LensType
+  - Added a new Samsung LensType (thanks Nick Livchits)
+  - Added a few new Nikon LensID's (thanks David Puschel)
+  - Added a new PentaxModelID
+  - Added some new Olympus WhiteBalance2 values (thanks LibRaw)
+  - Added a new EXIF:Compression value
+  - Decode a new FujiFilm tag
+  - Decode a few more private TIFF tags
+  - Improved warning message if "DIR" or "FILE" is used literally on the command
+    line
+  - Improved "-j -b" output to encode any non-UTF8 values as Base64
+  - Enhanced -fast option (FastScan API option) to allow file processing to be
+    bypassed entirely
+  - Changed conversions for a couple of Nikon 1 AF tags for consistency
+  - Changed reported FileType for LNK, KEY, KTH, NUMBERS, NMBTEMPLATE and PAGES
+    files to match extension
+  - Fixed problems adding new XMP and deleting old XMP from MP4 videos
+  - Fixed problem writing FileModifyDate/FileCreateDate when
+    -overwrite_original_in_place is used
+
+Nov. 2, 2014 - Version 9.75
+
+  - Added support for FLIR version 101 metadata
+  - Added a new Olympus LensType (thanks Niels Kristian Bech Jensen)
+  - Added a new Pentax LensType (thanks Louis Granboulan)
+  - Added a new Samsung LensType
+  - Decode a few more Nikon D4S tags (thanks Warren Hatch)
+  - Decode a few more Sony tags (thanks Jos Roost)
+  - Decode a new FujiFilm tag
+  - Improved formula for calculating Sony:FocusDistance2 (thanks Jos Roost)
+  - Changed XMP parsing to impose standard namespace prefixes, thus avoiding
+    (some) problems reading the ugly XMP generated by Microsoft products
+  - Fixed decoding of Nikon FileInfo tags for recent DSLR models
+
+Oct. 15, 2014 - Version 9.74
+
+  - Added a number of new QuickTime GenreID values (thanks Francois Bonzon)
+  - Added support for some newer Sony cameras (thanks Jos Roost)
+  - Decode more Nikon D4S custom settings (thanks Warren Hatch)
+  - Improved lens identification logic for XMP metadata (thanks Jos Roost)
+  - Fixed typo in Condition for a few D3 NikonCustom tags
+  - Fixed bug which could cause a "Use of uninitialized value $val" runtime
+    error when reading XML
+
+Oct. 13, 2014 - Version 9.73
+
+  - Added a new CanonModelID (thanks LibRaw and Niels Kristian Bech Jensen)
+  - Added a few new Canon and Sony lenses (thanks Jos Roost)
+  - Delete unknown PNG TextualData tags when deleting all PNG tags
+  - Decode AF points for Canon PowerShot G1X Mark II
+  - Decode a number of Pentax, Olympus, Panasonic and Sony tags (thanks LibRaw)
+  - Decode a few more Nikon NCTG tags in MOV videos (thanks Stuart Bennett)
+  - Decode Nikon D4S custom settings (thanks Warren Hatch)
+  - Decode some makernote tags in Sony Xperia Z3 images
+  - Make PhotoshopThumbnail and PhotoshopBGRThumbnail writable (but "unsafe")
+  - Changed order of operations so flattened tags always take precedence over
+    structured tags when writing a mix of both types of tags
+  - Fixed potential bug decoding some Nikon 1 AF points
+
+Sept. 26, 2014 - Version 9.72
+
+  - Added a few new Pentax ISO values
+  - Added a new CanonModelID and SonyModelID (thanks LibRaw)
+  - Added a new Canon LensType
+  - Decode AF points for some newer Nikon 1 cameras (thanks Chris Reimold for
+    his help, and Graham Woolf for the samples)
+  - Improved verbose output for recently decoded Samsung trailer
+  - Fixed Samsung trailer writer to properly update offsets in the QDIO block
+
 Sept. 20, 2014 - Version 9.71
 
   - Added a couple of mew CanonModelID's (thanks LibRaw)

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/MANIFEST

@@ -421,6 +421,7 @@ t/ExifTool_24.out
 t/ExifTool_25.out
 t/ExifTool_26.out
 t/ExifTool_27.out
+t/ExifTool_28.out
 t/ExifTool_3.out
 t/ExifTool_4.out
 t/ExifTool_5.out

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/META.yml

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

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/config_files/ExifTool_config

@@ -244,17 +244,17 @@
     GROUPS        => { 0 => 'XMP', 1 => 'XMP-xxx', 2 => 'Image' },
     NAMESPACE     => { 'xxx' => 'http://ns.myname.com/xxx/1.0/' },
     WRITABLE      => 'string',
-    # replace "NewXMPxxxTag1" with your own tag name (eg. "MyTag")
     # Example 8.  XMP-xxx:NewXMPxxxTag1
+    # - replace "NewXMPxxxTag1" with your own tag name (eg. "MyTag")
     NewXMPxxxTag1 => { Writable => 'lang-alt' },
     # Example 9.  XMP-xxx:NewXMPxxxTag2
     NewXMPxxxTag2 => { Groups => { 2 => 'Author' } },
     # Example 10.  XMP-xxx:NewXMPxxxTag3
     NewXMPxxxTag3 => { List => 'Bag' },
-    # example structured XMP tag
+    # Example 11.  XMP-xxx:NewXMPxxxStruct
+    # - example structured XMP tag
     NewXMPxxxStruct => {
         # the "Struct" entry defines the structure fields
-        # Example 11.  XMP-xxx:NewXMPxxxStruct
         Struct => {
             # optional namespace prefix and URI for structure fields
             # (required only if different than NAMESPACE above)

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '9.71';
+my $version = '9.78';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -42,6 +42,7 @@ sub FormatXML($$$);
 sub EscapeJSON($;$);
 sub FormatJSON($$$);
 sub PrintCSV();
+sub AddGroups($$$$);
 sub ConvertBinary($);
 sub IsEqual($$);
 sub Infile($;$);
@@ -50,6 +51,7 @@ sub DoSetFromFile($$$);
 sub CleanFilename($);
 sub ProcessFiles($;$);
 sub ScanDir($$;$);
+sub FileNotFound($);
 sub SetFileTime($@);
 sub PreserveTime();
 sub AbsPath($);
@@ -649,6 +651,8 @@ for (;;) {
         defined $opt or Error("Expected OPT[=VAL] argument for -api option\n"), $badCmd=1, next;
         my $val = ($opt =~ s/=(.*)//s) ? $1 : 1;
         $mt->Options($opt => (length($val) ? $val : undef));
+        # update $forcePrint in case MissingTagValue was changed
+        $forcePrint = $mt->Options('MissingTagValue') if defined $forcePrint;
         next;
     }
     /^arg(s|format)$/i and $argFormat = 1, next;
@@ -1505,7 +1509,7 @@ $progressMax = scalar @files if defined $progress;
 
 # store duplicate database information under absolute path
 my @dbKeys = keys %database;
-if (@dbKeys and require Cwd) {
+if (@dbKeys and eval { require Cwd }) {
     undef $evalWarning;
     local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
     foreach (@dbKeys) {
@@ -1642,6 +1646,7 @@ sub GetImageInfo($$)
     if (defined $condition) {
         unless ($file eq '-' or -e $file) {
             Warn "File not found: $file\n";
+            FileNotFound($file);
             ++$countBad;
             return;
         }
@@ -1731,6 +1736,7 @@ sub GetImageInfo($$)
     # extract information from this file
     unless ($file eq '-' or -e $file) {
         Warn "File not found: $file\n";
+        FileNotFound($file);
         $outfile and close($fp), undef($tmpText), unlink($outfile);
         ++$countBad;
         return;
@@ -1859,19 +1865,25 @@ sub GetImageInfo($$)
                 print $fp "\n  xmlns:et='http://ns.exiftool.ca/1.0/'";
                 print $fp " et:toolkit='Image::ExifTool $Image::ExifTool::VERSION'";
                 # define namespaces for all tag groups
-                my %groups;
+                my (%groups, @groups, $grp0, $grp1);
                 foreach $tag (@foundTags) {
-                    my ($grp, $grp1) = $et->GetGroup($tag);
+                    ($grp0, $grp1) = $et->GetGroup($tag);
                     unless ($grp1) {
                         next unless defined $forcePrint;
-                        $grp = $grp1 = 'Unknown';
+                        $grp0 = $grp1 = 'Unknown';
                     }
                     next if $groups{$grp1};
-                    $groups{$grp1} = 1;
                     # include family 0 and 1 groups in URI except for internal tags
                     # (this will put internal tags in the "XML" group on readback)
-                    $grp .= "/$grp1" unless $grp eq $grp1 and
-                                            $grp =~ /^(ExifTool|File|Composite|Unknown)$/;
+                    $groups{$grp1} = $grp0;
+                    push @groups, $grp1;
+                    AddGroups($$info{$tag}, $grp0, \%groups, \@groups) if ref $$info{$tag};
+                }
+                foreach $grp1 (@groups) {
+                    my $grp = $groups{$grp1};
+                    unless ($grp eq $grp1 and $grp =~ /^(ExifTool|File|Composite|Unknown)$/) {
+                        $grp .= "/$grp1";
+                    }
                     print $fp "\n  xmlns:$grp1='http://ns.exiftool.ca/$grp/1.0/'";
                 }
                 print $fp '>' if $outFormat < 1; # finish rdf:Description token unless short format
@@ -2494,6 +2506,7 @@ sub SetImageInfo($$$)
             } else {
                 # file doesn't exist, and we can't create it
                 Warn("Error: File not found - $file\n");
+                FileNotFound($file);
                 ++$countBadWr;
                 return 0;
             }
@@ -2543,9 +2556,9 @@ sub SetImageInfo($$$)
     # get file time if preserving it
     my ($aTime, $mTime, $cTime);
     if ($preserveTime and $success and -e $file) {
-        $aTime = $^T - (-A _) * (24 * 3600);
-        $mTime = $^T - (-M _) * (24 * 3600);
-        $cTime = $^T - (-C _) * (24 * 3600);
+        $aTime = int($^T - (-A _) * (24 * 3600) + 0.5);
+        $mTime = int($^T - (-M _) * (24 * 3600) + 0.5);
+        $cTime = int($^T - (-C _) * (24 * 3600) + 0.5);
     }
     if ($success == 1) {
         # preserve the original file times
@@ -2591,6 +2604,8 @@ sub SetImageInfo($$$)
                                     Error("Error renaming $newFile to $file\n"), return 0;
                                 }
                             } else {
+                                $et->SetFileModifyDate($file, $cTime, 'FileCreateDate', 1);
+                                $et->SetFileModifyDate($file, $mTime, 'FileModifyDate', 1);
                                 unlink $newFile;
                                 if ($preserveTime) {
                                     SetFileTime($file, $aTime, $mTime, $cTime);
@@ -2683,9 +2698,8 @@ sub DoHardLink($$$$)
         $testName = NextUnusedFilename($testName, undef, 1);
         if ($usedFileName{$testName}) {
             $et->Warn("File '$testName' would exist");
-        } else {
+        } elsif ($et->SetFileName($src, $testName, 'Test') == 1) {
             $usedFileName{$testName} = 1;
-            $et->SetFileName($src, $testName, 'Test');
         }
     }
 }
@@ -2746,7 +2760,8 @@ sub FormatXML($$$)
         $gt = " rdf:parseType='Resource'>";
         my $val2 = '';
         foreach (sort keys %$val) {
-            my $tok = $grp . ':' . $_;
+            # (some variable-namespace XML structure fields may have a different group)
+            my $tok = /:/ ? $_ : ($grp . ':' . $_);
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
         }
         $val = "$val2\n$ind";
@@ -2773,6 +2788,10 @@ sub EscapeJSON($;$)
         # (these big numbers caused problems for some JSON parsers, so be more conservative)
         return $str if $str =~ /^-?(\d|[1-9]\d{1,14})(\.\d{1,16})?(e[-+]?\d{1,3})?$/i;
     }
+    # encode JSON string as Base64 if necessary
+    if ($json < 2 and defined $binaryOutput and Image::ExifTool::XMP::IsUTF8(\$str) < 0) {
+        return '"base64:' . Image::ExifTool::XMP::EncodeBase64($str, 1) . '"';
+    }
     # escape special characters
     $str =~ s/(["\t\n\r\\])/\\$jsonChar{$1}/sg;
     if ($json < 2) { # JSON
@@ -2874,6 +2893,28 @@ sub PrintCSV()
     }
 }
 
+#------------------------------------------------------------------------------
+# Add tag groups from structure fields to a list
+# Inputs: 0) tag value, 1) parent group, 2) group hash ref, 3) group list ref
+sub AddGroups($$$$)
+{
+    my ($val, $grp, $groupHash, $groupList) = @_;
+    my ($key, $val2);
+    if (ref $val eq 'HASH') {
+        foreach $key (sort keys %$val) {
+            if ($key =~ /(.*?):/ and not $$groupHash{$1}) {
+                $$groupHash{$1} = $grp;
+                push @$groupList, $1;
+            }
+            AddGroups($$val{$key}, $grp, $groupHash, $groupList) if ref $$val{$key};
+        }
+    } elsif (ref $val eq 'ARRAY') {
+        foreach $val2 (@$val) {
+            AddGroups($val2, $grp, $groupHash, $groupList) if ref $val2;
+        }
+    }
+}
+
 #------------------------------------------------------------------------------
 # Convert binary data (SCALAR references) for printing
 # Inputs: 0) object reference
@@ -3035,6 +3076,7 @@ sub ProcessFiles($;$)
                 $verbose and print $vout "-------- $file (wrong extension)$progStr\n";
             } else {
                 Warn "File not found: $file\n";
+                FileNotFound($file);
                 $rtnVal = 1;
             }
         } else {
@@ -3092,6 +3134,18 @@ sub ScanDir($$;$)
     ++$countDir;
 }
 
+#------------------------------------------------------------------------------
+# Handle missing file on the command line
+# Inputs: 0) file name
+sub FileNotFound($)
+{
+    my $file = shift;
+    if ($file =~ /^(DIR|FILE)$/) {
+        my $type = { DIR => 'directory', FILE => 'file' }->{$file};
+        Warn qq{You were meant to enter any valid $type name, not "$file" literally.\n};
+    }
+}
+
 #------------------------------------------------------------------------------
 # Set file system times
 # Inputs: 0) file name, 1) access time, 2) modification time, 3) creation time
@@ -3127,7 +3181,7 @@ sub AbsPath($)
 {
     my $file = shift;
     my $path;
-    if (defined $file and require Cwd) {
+    if (defined $file and eval { require Cwd }) {
         $path = eval { Cwd::abs_path($file) };
         # make the delimiters and case consistent
         # (abs_path is very inconsistent about what it returns in Windows)
@@ -4335,7 +4389,11 @@ specific target file (see the B<-csv> option for details).  The imported
 JSON file must have the same format as the exported JSON files with the
 exception that the B<-g> option is not compatible with the import file
 format (use B<-G> instead).  Additionally, tag names in the input JSON file
-may be suffixed with a C<#> to disable print conversion.
+may be suffixed with a C<#> to disable print conversion.  Unlike CSV import,
+empty values are not ignored, and will cause an empty value to be written if
+supported by the specific metadata type.  Tags are deleted by using the
+B<-f> option and setting the tag value to "-" (or to the MissingTagValue
+setting if this API option was used).
 
 =item B<-l> (B<-long>)
 
@@ -4429,7 +4487,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 9.71 --
+    -- Generated by ExifTool 9.78 --
     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
@@ -4797,7 +4855,9 @@ audio/video data in WAV/AVI files to search for additional metadata.  These
 speed benefits are small when reading images directly from disk, but can be
 substantial if piping images through a network connection.  For more
 substantial speed benefits, B<-fast2> also causes exiftool to avoid
-extracting any EXIF MakerNote information.
+extracting any EXIF MakerNote information.  B<-fast3> avoids processing the
+file entirely, and returns only an initial guess at FileType and the pseudo
+System tags.
 
 =item B<-fileOrder> [-]I<TAG>
 
@@ -5232,7 +5292,9 @@ load exiftool for each invocation.
 =item B<-api> I<OPT[=VAL]>
 
 Set ExifTool API option.  I<OPT> is an API option name.  The option value is
-set to 1 if I<=VAL> is omitted.  See
+set to 1 if I<=VAL> is omitted, or undef if just I<VAL> is omitted.  An
+option may not be set to an empty string ("") via the command line, but the
+config file may be used to accomplish this if necessary.  See
 L<Image::ExifTool Options|Image::ExifTool/Options> for a list of available
 API options.  This overrides API options set via the config file.
 
@@ -5263,10 +5325,10 @@ respectively) after processing is complete.
 
 =item B<-execute>[I<NUM>]
 
-Execute command for all arguments up to this point on the command line.
-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.
+Execute command for all arguments up to this point on the command line (plus
+any arguments specified by B<-common_args>).  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>