exiftool_vendored 10.40.0 → 10.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3165e2b3d3c881409b580d5052ed41e7fc42247
-  data.tar.gz: 57e8572f6ee4eeb88d5181732fe930e02f85c227
+  metadata.gz: a83941cf3034f997e9f4b4f2e2bfcfacf2137ad1
+  data.tar.gz: 061d4e3711c1ac83d68987b76b1f2458cb999bc5
 SHA512:
-  metadata.gz: 405c253b0bd7051b711602517860a349f86da37e10d7c78b6b43728829e2ade08e7ed5862da65bdb9cf87f19ba9ba93ec450b2da80e46669c37b315a2718a887
-  data.tar.gz: a7997930bff8ccfc6b90ca1bf5f2da7252712d25b40bdce1be9320ece0e02b608a41e13fea851b937b0b51ea73905756d23238b123bb39dfbe1d3001720ae3a7
+  metadata.gz: 314dee850f76ab22d9ca7ef7eee8724a6e3959f4040bff3ab9e792341032a4a6354f125c0d4607260b26fb74fdeaa176b66093ecfb4f36e692a75d06e3f50edf
+  data.tar.gz: 392ab7832fff51aa4881b1d50d1523ccad6a9e11301cbba42aaa271e464feb3f6fdc605e60522e94a81babca536f0d3473bcc32df0508062b6fe02fd449f9260

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

@@ -7,6 +7,50 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 10.40. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Feb. 16, 2017 - Version 10.43
+
+  - Restrict writing of EXIF:FlashEnergy to a single value as per EXIF spec
+  - Reverted format change of Sony ImageCount tag
+  - Changed PNG new eXIF/zXIF chunk names to "exIf" and "zxIf" until the
+    proposed chunks are accepted (of course, while maintaining backward
+    compatibility for reading/updating the other chunks)
+  - Lowered priority of XMP-pdf:Keywords so it doesn't take precedence over
+    PDF:Keywords when the Duplicates option is not used
+  - Improved config_files/convert_regions.config to handle the case where the
+    RegionInfoMP is missing a Rectangle
+
+Feb. 10, 2017 - Version 10.42
+
+  - Added ability to read/write PNG eXIF and zXIF chunks, and made these the
+    place where new EXIF is created in PNG images (zXIF if the -z option is
+    used, or eXIF otherwise)
+  - Added ability to copy Photoshop OriginPathInfo with photoshop_paths.config
+  - Made FileUserID and FileGroupID writable
+  - Changed format for a Sony ImageCount tag
+  - Improvements to experimental Validate feature
+  - Fixed incorrect XMP swf namespace URI
+  - Fixed problem using new -p section feature when combined with -w or -ee
+  - Fixed formatting problem in -listx output when -lang option was used
+  - Fixed problem where UserComment wasn't removed if found in IFD0 when writing
+    it to the correct IFD
+
+Feb. 1, 2017 - Version 10.41
+
+  - Added an experimental metadata validation feature (invoked either by
+    requesting the new Extra Validate tag or by setting the API Validate option)
+  - Added support for PSDT file extension
+  - Added age.config to the distribution
+  - Added a new Sony lens (thanks Jos Roost)
+  - Added a new PentaxModelID (thanks Louis Granboulan)
+  - Enhanced -p option to allow files to be grouped in sections
+  - Made makernote offset warning minor
+  - Relaxed parsing of NMEA GGA sentence so comma after the geoid units is now
+    optional
+  - Patched problem extracting value of an unsafe binary tag with the -b option
+    when specified using -TAG# instead of -TAG with -n
+  - API Changes:
+      - Added experimental Validate option
+
 Jan. 14, 2017 - Version 10.40 (production release)
 
   - Fixed tests that were failing on some platforms

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

@@ -15,6 +15,7 @@ arg_files/xmp2exif.args
 arg_files/xmp2gps.args
 arg_files/xmp2iptc.args
 arg_files/xmp2pdf.args
+config_files/age.config
 config_files/bibble.config
 config_files/convert_regions.config
 config_files/example.config
@@ -364,6 +365,7 @@ lib/Image/ExifTool/Theora.pm
 lib/Image/ExifTool/Torrent.pm
 lib/Image/ExifTool/Unknown.pm
 lib/Image/ExifTool/VCard.pm
+lib/Image/ExifTool/Validate.pm
 lib/Image/ExifTool/Vorbis.pm
 lib/Image/ExifTool/WriteCanonRaw.pl
 lib/Image/ExifTool/WriteExif.pl
@@ -470,6 +472,7 @@ t/ExifTool_28.out
 t/ExifTool_29.out
 t/ExifTool_3.out
 t/ExifTool_30.out
+t/ExifTool_31.out
 t/ExifTool_4.out
 t/ExifTool_5.out
 t/ExifTool_6.out
@@ -668,6 +671,7 @@ t/PNG_2.out
 t/PNG_3.out
 t/PNG_4.out
 t/PNG_5.out
+t/PNG_6.out
 t/PPM.t
 t/PPM_2.out
 t/PPM_3.out

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

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "10.40"
+   "version" : "10.43"
 }

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

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 10.40
+version: 10.43

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

@@ -101,8 +101,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-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
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -185,6 +185,7 @@ distribution package:
     xmp2iptc.args             - Arguments for converting XMP to IPTC
     xmp2pdf.args              - Arguments for converting XMP to PDF
   config_files/             - Sample ExifTool configuration files:
+    age.config                - Calculate Age of person in photo
     bibble.config             - Definitions for writing Bibble XMP tags
     convert_regions.config    - Convert between MWG and MP face regions
     example.config            - General example showing config features

data/bin/Image-ExifTool-10.43/config_files/age.config

@@ -0,0 +1,84 @@
+#------------------------------------------------------------------------------
+# File:         age.config
+#
+# Description:  Definition for a Composite "Age" tag to calculate age of person
+#               in image based on their birthday and the DateTimeOriginal or
+#               CreateDate of the image.
+#
+# Notes:        The birthday date is set via the -userParam option, and is a
+#               string containing year, month, day, hour, minute and second.
+#               Only the year is required.  By default the format of the
+#               returned Age value is exactly the same as the input birthday,
+#               with 2 digits for each parameter, however an AgeFormat user
+#               parameter may be used to define a printf-style format string
+#               for any desired output format (see fourth example below).
+#
+#               If the specified birthday comes after the image date/time
+#               then the returned result is enclosed in brackets to indicate
+#               a negative time difference (see last example below).
+#
+#               If birthday is not given, then the current date/time is assumed
+#               (in which case Age returns the age of the photo).
+#
+# Examples: (based on a DateTimeOriginal of "2005:08:27 18:21:00")
+#
+#   > exiftool -config age.config -userparam birthday=1990:09:31 -age a.jpg
+#   Age                             : 14:10:26
+#
+#   > exiftool -config age.config -userparam birthday=1990Y09M31D -age a.jpg
+#   Age                             : 14Y10M26D
+#
+#   > exiftool -config age.config -userparam birthday="2000:01:02 03:45" -age a.jpg
+#   Age                             : 05:07:25 14:36
+#
+#   > exiftool -config age.config -userparam birthday=2000:01:02 \
+#       -userparam ageformat="%d years" -age a.jpg
+#   Age                             : 5 years
+#
+#   > exiftool -config age.config -userparam birthday=2005:09:26 -age a.jpg
+#   Age                             : (00:00:30)
+#
+# Requires:     ExifTool version 9.90 or later
+#
+# Revisions:    2017/01/24 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Composite' => {
+        Age => {
+            Desire => {
+                0 => 'DateTimeOriginal',
+                1 => 'CreateDate',
+            },
+            ValueConv => q{
+                my $bday = $self->Options(UserParam => 'Birthday');
+                $bday or ($bday = TimeNow()) =~ s/[-+].*//;
+                my $date = $val[0] || $val[1] or return undef;
+                my @t0 = ($bday =~ /\d+/g);
+                my @t1 = ($date =~ /\d+/g);
+                return '<invalid birthday date>' unless $t0[0];
+                my ($i, @diff, $sign);
+                for ($i=0; $i<6; ++$i) {
+                    last unless defined $t0[$i];
+                    my $dt = $t1[$i] - $t0[$i];
+                    $sign or $sign = ($dt <=> 0);
+                    push @diff, $dt * $sign;
+                }
+                require 'Image/ExifTool/Shift.pl';
+                my $base = $sign < 0 ? \@t1 : \@t0;
+                my @wrap = (0, 12, DaysInMonth($$base[1]||1,$$base[0]), 24, 60, 60);
+                for ($i=$#diff; $i>0; --$i) {
+                    $diff[$i] < 0 and $diff[$i] += $wrap[$i], --$diff[$i-1];
+                }
+                $bday =~ s/\d+/sprintf '%.2d', shift @diff/ge;
+                return $sign < 0 ? "($bday)" : $bday;
+            },
+            PrintConv => q{
+                my $fmt = $self->Options(UserParam => 'AgeFormat') or return $val;
+                sprintf($fmt, $val =~ /\d+/g);
+            },
+        },
+    },
+);
+
+1;  #end

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/config_files/convert_regions.config

@@ -5,11 +5,11 @@
 #               face regions between Microsoft Windows Live Photo Gallery (WLPG)
 #               and Metadata Working Group (MWG) formats
 #
-# Usage:        1) Convert from MP WLPG regions to MWG regions:
+# Usage:     1) Convert from MP WLPG regions to MWG regions:
 #
 #               exiftool -config convert_regions.config "-regioninfo<myregion" FILE
 #
-#               2) Convert from MWG to WLPG regions:
+#            2) Convert from MWG to WLPG regions:
 #
 #               exiftool -config convert_regions.config "-regioninfomp<myregionmp" FILE
 #
@@ -17,6 +17,7 @@
 #
 # Revisions:    2012/12/27 - P. Harvey Created
 #               2013/02/20 - PH Don't add ignored MP faces
+#               2017/02/13 - PH Handle MP regions without Rectangle or Name entries
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #------------------------------------------------------------------------------
@@ -35,20 +36,24 @@
             ValueConv => q{
                 my ($rgn, @newRgns);
                 foreach $rgn (@{$val[0]{Regions}}) {
-                    # don't add ignored faces
-                    next if $$rgn{PersonDisplayName} eq 'ffffffffffffffff';
-                    my @rect = split /\s*,\s*/, $$rgn{Rectangle};
-                    my %newRgn = (
-                        Area => {
+                    my $name = $$rgn{PersonDisplayName};
+                    next unless $$rgn{Rectangle} or defined $name;
+                    my %newRgn = ( Type => 'Face' );
+                    if ($name) {
+                        # don't add ignored faces
+                        next if $name eq 'ffffffffffffffff';
+                        $newRgn{Name} = $name;
+                    }
+                    if ($$rgn{Rectangle}) {
+                        my @rect = split /\s*,\s*/, $$rgn{Rectangle};
+                        $newRgn{Area} = {
                             X => $rect[0] + $rect[2]/2,
                             Y => $rect[1] + $rect[3]/2,
                             W => $rect[2],
                             H => $rect[3],
                             Unit => 'normalized',
-                        },
-                        Name => $$rgn{PersonDisplayName},
-                        Type => 'Face',
-                    );
+                        } if @rect == 4;
+                    }
                     push @newRgns, \%newRgn;
                 }
                 return {
@@ -64,13 +69,16 @@
             ValueConv => q{
                 my ($rgn, @newRgns);
                 foreach $rgn (@{$val[0]{RegionList}}) {
-                    my @rect = @{$$rgn{Area}}{'X','Y','W','H'};
-                    $rect[0] -= $rect[2]/2;
-                    $rect[1] -= $rect[3]/2;
-                    push @newRgns, {
-                        PersonDisplayName => $$rgn{Name},
-                        Rectangle => join(', ', @rect),
-                    };
+                    next unless $$rgn{Area} or defined $$rgn{Name};
+                    my %newRgn;
+                    if ($$rgn{Area}) {
+                        my @rect = @{$$rgn{Area}}{'X','Y','W','H'};
+                        $rect[0] -= $rect[2]/2;
+                        $rect[1] -= $rect[3]/2;
+                        $newRgn{Rectangle} = join(', ', @rect);
+                    }
+                    $newRgn{PersonDisplayName} = $$rgn{Name} if defined $$rgn{Name};
+                    push @newRgns, \%newRgn;
                 }
                 return { Regions => \@newRgns };
             },

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/config_files/photoshop_paths.config

@@ -15,10 +15,21 @@
 #               because these tags are marked as "Protected" so they won't be
 #               copied by default.
 #
-# Note:         Print conversion must be disabled to be able to copy these tags
+#               Path anchor points are converted to pixel coordinates by the
+#               Composite PathPixXXX tags, and an "AllPathPix" shortcut is
+#               provided to represent these tags.
+#
+#               Finally, a Composite PathCount tag is provided to return the
+#               number of paths in an image.
+#
+# Notes:     1) Print conversion must be disabled to be able to copy the paths
 #               (via either the -n option, or by adding a "#" to the tag name,
 #               eg. "-tagsfromfile SRC -allpaths#").
 #
+#            2) When copying the paths, OriginPathInfo must also be copied
+#               (otherwise Photoshop may give a "program error" and refuse to
+#               load the image).
+#
 # Usage:
 #
 #   1) Extract Photoshop path names:
@@ -34,13 +45,20 @@
 #      exiftool -config photoshop_paths.config -userparam anchoronly -allpaths FILE
 #
 #   4) Copy all Photoshop paths from one file (SRC) to another (DST):
+#      (note that OriginPathInfo must also be copied when copying all paths)
+#
+#      exiftool -config photoshop_paths.config -tagsfromfile SRC -allpaths# -originpathinfo DST
 #
-#      exiftool -config photoshop_paths.config -tagsfromfile SRC -allpaths# DST
+#   5) Extract path names and anchor points in pixel coordinates:
+#
+#      exiftool -config photoshop_paths.config -allpathpix FILE
 #
 # Requires:     ExifTool version 9.95 or later
 #
 # Revisions:    2015/05/07 - P. Harvey Created
 #               2016/09/14 - PH Added feature to allow extracting anchor points
+#               2017/01/24 - PH Added PathCount and PathPix Composite tags
+#               2017/02/02 - PH Added support for copying OriginPathInfo
 #
 # References:   http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,1621.0.html
 #               http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3910.0.html
@@ -49,10 +67,11 @@
 
 # Print Photoshop path name and/or anchor points
 # Inputs: 0) reference to Photoshop path data, 1) ExifTool object reference
+#         2-3) optional image width/height to convert anchor points to pixels
 # Returns: String with name and/or Bezier knot anchor points
-sub PrintPath($)
+sub PrintPath($$;$$)
 {
-    my ($val, $et) = @_;
+    my ($val, $et, $w, $h) = @_;
     my ($pos, $name, @rtn);
     my $len = length($$val) - 26;
 
@@ -67,7 +86,7 @@ sub PrintPath($)
     push @rtn, $name unless $anchorOnly;
 
     # loop through path points and extract anchor points if specified
-    if ($anchorOnly or $et->Options(UserParam => 'Anchor')) {
+    if ($anchorOnly or $et->Options(UserParam => 'Anchor') or defined $w) {
         SetByteOrder('MM');
         for ($pos=0; $pos<=$len; $pos+=26) {
             my $type = Get16u($val, $pos);
@@ -77,7 +96,11 @@ sub PrintPath($)
             # (fixed-point values with 24-bits after the decimal point)
             my $y = Get32s($val, $pos+10) / 0x1000000;  # (vertical component first)
             my $x = Get32s($val, $pos+14) / 0x1000000;
-            push @rtn, sprintf('(%g,%g)', $x, $y);
+            if (defined $w and defined $h) {
+                push @rtn, sprintf('(%g,%g)', $x * $w, $y * $h);
+            } else {
+                push @rtn, sprintf('(%g,%g)', $x, $y);
+            }
         }
     }
     return join ' ', @rtn;
@@ -88,10 +111,17 @@ sub PrintPath($)
     AllPaths => [
         map { sprintf "Path%x", $_ } (0x7d0 .. 0xbb5),
     ],
+    AllPathPix => [
+        map { sprintf "PathPix%x", $_ } (0x7d0 .. 0xbb5),
+    ],
 );
 
 %Image::ExifTool::UserDefined = (
     'Image::ExifTool::Photoshop::Main' => {
+        0xbb8 => {
+            Name => 'OriginPathInfo',
+            Flags => [ qw(Writable Protected Binary SetResourceName) ],
+        },
         # generate tags for each of the 998 possible Photoshop paths
         map { $_ => {
             Name => sprintf('Path%x', $_),
@@ -100,6 +130,31 @@ sub PrintPath($)
             PrintConv => \&PrintPath,
         } } (0x7d0 .. 0xbb5),
     },
+    'Image::ExifTool::Composite' => {
+        PathCount => {
+            Desire => {
+                map { $_-0x7d0 => sprintf('Path%x', $_) } (0x7d0 .. 0xbb5),
+            },
+            ValueConv => sub {
+                my $val = shift;
+                my $count = 0;
+                defined $_ and ++$count foreach @$val;
+                return $count;
+            },
+        },
+        map { sprintf('PathPix%x', $_) => {
+            Require => {
+                0 => 'ImageWidth',
+                1 => 'ImageHeight',
+                2 => sprintf('Path%x', $_),
+            },
+            Description => sprintf('Path Pix %x', $_),
+            ValueConv => sub {
+                my ($val, $et) = @_;
+                PrintPath($$val[2], $et, $$val[0], $$val[1]);
+            },
+        } } (0x7d0 .. 0xbb5),
+    },
 );
 
 1;  #end