exiftool_vendored 11.50.0 → 11.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e698f7b3e0b0d832195da16b3303c8c913fc39ff
-  data.tar.gz: 56345fda76bb7c49c0fc8d262d53d27f2aec9e55
+  metadata.gz: 14d2ae1044ed8d62a0b4efcae5b775fb16db5f4c
+  data.tar.gz: 9ff9933b519b5ad645b675891ea048cf077b0d36
 SHA512:
-  metadata.gz: '08a077f0a714a29e332430f59981c16ea00d18bbea887c940511cb7f2f4c03403c8b8b63e44328b0d7accec8e992a744eee74868832ced8c4b552e639ddd903d'
-  data.tar.gz: d96983fd20e4de4d4bd24bf8711cbf063f77c7b21665968fa3b9fb93d29464e77466683d8c7a184794dcfb3557a78c4b94f6be33a0f5478039f33701035f5958
+  metadata.gz: a246e28c731ee0349cbf2782052eba51249f4df03dc623046f65250b258bed7179c3c179cb1dd64eddb0965f2518a2631c7cb492339ee54184cf66bd6df46542
+  data.tar.gz: 923d024c05145f18099dfc1f8cf6bbd6ccb4cd839ccd7d7af2ff3497298f8aba17ee110adb9e1787ffd1c801b93e656b73d065efaa413c0a8db37b16231608a0

data/bin/Changes

@@ -7,6 +7,12 @@ 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.)
 
+June 13, 2019 - Version 11.51
+
+  - Decode Canon DistortionCorrection tags
+  - Removed a minor EXIF warning when processing EPS files with a DOS header
+  - Fixed bug which caused an error when rewriting some EPS files multiple times
+
 June 11, 2019 - Version 11.50 (production release)
 
   - Added a new Canon LensType and two new Sony LensTypes (thanks LibRaw)

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.50",
+   "version" : "11.51",
    "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.50'
+version: '11.51'
 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.50.tar.gz | tar -xf -
-  cd Image-ExifTool-11.50
+  gzip -dc Image-ExifTool-11.51.tar.gz | tar -xf -
+  cd Image-ExifTool-11.51
   ./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.50';
+my $version = '11.51';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5119,7 +5119,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.50 --
+    -- Generated by ExifTool 11.51 --
     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

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.50';
+$VERSION = '11.51';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

data/bin/lib/Image/ExifTool/BuildTagLookup.pm

@@ -34,12 +34,14 @@ use Image::ExifTool::Nikon;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.23';
+$VERSION = '3.24';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
 sub SortedTagTablekeys($);
 
+my $createDate = 'Feb 15, 2005';
+
 # global variables to control sorting order of table entries
 my $numbersFirst = 1;   # set to -1 to sort numbers last, or 2 to put negative numbers last
 my $caseInsensitive;    # flag to ignore case when sorting tag names
@@ -67,7 +69,8 @@ my %tweakOrder = (
     Composite => 'Extra',
     GeoTiff => 'GPS',
     CanonVRD=> 'CanonCustom',
-    FLIR    => 'Casio',
+    DJI     => 'Casio',
+    FLIR    => 'DJI',
     FujiFilm => 'FLIR',
     Kodak   => 'JVC',
     Leaf    => 'Kodak',
@@ -184,11 +187,11 @@ instead of the descriptions, use C<exiftool -s>.
 The B<Writable> column indicates whether the tag is writable by ExifTool.
 Anything but a C<no> in this column means the tag is writable.  A C<yes>
 indicates writable information that is either unformatted or written using
-the existing format.  Other expressions give details about the information
-format, and vary depending on the general type of information.  The format
-name may be followed by a number in square brackets to indicate the number
-of values written, or the number of characters in a fixed-length string
-(including a null terminator which is added if required).
+the existing format.  Other expressions give details about the format of the
+stored value, and vary depending on the general type of information.  The
+format name may be followed by a number in square brackets to indicate the
+number of values written, or the number of characters in a fixed-length
+string (including a null terminator which is added if required).
 
 A plus sign (C<+>) after an entry in the B<Writable> column indicates a
 I<List> tag which supports multiple values and allows individual values to
@@ -1953,6 +1956,7 @@ sub CloseHtmlFiles($)
         # write the trailers
         print HTMLFILE "<hr>\n";
         print HTMLFILE "(This document generated automatically by Image::ExifTool::BuildTagLookup)\n";
+        print HTMLFILE "<br><i>Created $createDate</i>\n" if $htmlFile eq 'html/TagNames/index.html';
         print HTMLFILE "<br><i>Last revised $fileDate</i>\n";
         print HTMLFILE "<p class=lf><a href=";
         if ($htmlFile =~ /index\.html$/) {

data/bin/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.15';
+$VERSION = '4.16';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -8005,6 +8005,10 @@ my %ciMaxFocal = (
         Name => 'PeripheralLighting',
         PrintConv => \%offOn,
     },
+    3 => {
+        Name => 'DistortionCorrection',
+        PrintConv => \%offOn,
+    },
     4 => {
         Name => 'ChromaticAberrationCorr',
         PrintConv => \%offOn,
@@ -8014,6 +8018,7 @@ my %ciMaxFocal = (
         PrintConv => \%offOn,
     },
     6 => 'PeripheralLightingValue',
+    9 => 'DistortionCorrectionValue',
     # 10 - flags?
     11 => {
         Name => 'OriginalImageWidth',
@@ -8049,6 +8054,10 @@ my %ciMaxFocal = (
         Name => 'ChromaticAberrationSetting',
         PrintConv => \%offOn,
     },
+    7 => {
+        Name => 'DistortionCorrectionSetting',
+        PrintConv => \%offOn,
+    },
 );
 
 # Auto Lighting Optimizater information (MakerNotes tag 0x4018) (ref PH)
@@ -8093,7 +8102,7 @@ my %ciMaxFocal = (
         },
     },
     # 6 - related to ChromaticAberrationCorr
-    # 7 - related to DistortionCorrection
+    # 7 - related to DistortionCorrection (0=off, 1=On in a 5DmkIV sample)
     # 8 - related to PeripheralIlluminationCorr and ChromaticAberrationCorr
 );
 

data/bin/lib/Image/ExifTool/PostScript.pm

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.43';
+$VERSION = '1.44';
 
 sub WritePS($$);
 sub ProcessPS($$;$);
@@ -221,6 +221,97 @@ sub GetInputRecordSeparator($)
     return $sep;
 }
 
+#------------------------------------------------------------------------------
+# Split into lines ending in any CR, LF or CR+LF combination
+# (this is annoying, and could be avoided if EPS files didn't mix linefeeds!)
+# Inputs: 0) data pointer, 1) reference to lines array
+# Notes: Fills @$lines with lines from splitting $$dataPt
+sub SplitLine($$)
+{
+    my ($dataPt, $lines) = @_;
+    for (;;) {
+        my $endl;
+        # find the position of the first LF (\x0a)
+        $endl = pos($$dataPt), pos($$dataPt) = 0 if $$dataPt =~ /\x0a/g;
+        if ($$dataPt =~ /\x0d/g) { # find the first CR (\x0d)
+            if (defined $endl) {
+                # (remember, CR+LF is a DOS newline...)
+                $endl = pos($$dataPt) if pos($$dataPt) < $endl - 1;
+            } else {
+                $endl = pos($$dataPt);
+            }
+        } elsif (not defined $endl) {
+            push @$lines, $$dataPt;
+            last;
+        }
+        if (length $$dataPt == $endl) {
+            push @$lines, $$dataPt;
+            last;
+        } else {
+            # continue to split into separate lines
+            push @$lines, substr($$dataPt, 0, $endl);
+            $$dataPt = substr($$dataPt, $endl);
+        }
+    }
+}
+
+#------------------------------------------------------------------------------
+# check to be sure we haven't read past end of PS data in DOS-style file
+# Inputs: 0) RAF ref (with PSEnd member), 1) data ref
+# - modifies data and sets RAF to EOF if end of PS is reached
+sub CheckPSEnd($$)
+{
+    my ($raf, $dataPt) = @_;
+    my $pos = $raf->Tell();
+    if ($pos >= $$raf{PSEnd}) {
+        $raf->Seek(0, 2);   # seek to end of file so we can't read any more
+        $$dataPt = substr($$dataPt, 0, length($$dataPt) - $pos + $$raf{PSEnd}) if $pos > $$raf{PSEnd};
+    }
+}
+
+#------------------------------------------------------------------------------
+# Read next line from EPS file
+# Inputs: 0) RAF ref (with PSEnd member if Postscript ends before end of file)
+#         1) array of lines from file
+# Returns: true on success
+sub GetNextLine($$)
+{
+    my ($raf, $lines) = @_;
+    my ($data, $changedNL);
+    my $altnl = ($/ eq "\x0d") ? "\x0a" : "\x0d";
+    for (;;) {
+        $raf->ReadLine($data) or last;
+        $$raf{PSEnd} and CheckPSEnd($raf, \$data);
+        # split line if it contains other newline sequences
+        if ($data =~ /$altnl/) {
+            if (length($data) > 500000 and IsPC()) {
+                # patch for Windows memory problem
+                unless ($changedNL) {
+                    $changedNL = $/;
+                    $/ = $altnl;
+                    $altnl = $changedNL;
+                    $raf->Seek(-length($data), 1);
+                    next;
+                }
+            } else {
+                    # split into separate lines
+                #    push @$lines, split /$altnl/, $data, -1;
+                #    if (@$lines == 2 and $$lines[1] eq $/) {
+                #        # handle case of DOS newline data inside file using Unix newlines
+                #        $$lines[0] .= pop @$lines;
+                #    }
+                # split into separate lines if necessary
+               SplitLine(\$data, $lines);
+            }
+        } else {
+            push @$lines, $data;
+        }
+        $/ = $changedNL if $changedNL;
+        return 1;
+    }
+    return 0;
+}
+
 #------------------------------------------------------------------------------
 # Decode comment from PostScript file
 # Inputs: 0) comment string, 1) RAF ref, 2) reference to lines array
@@ -233,22 +324,7 @@ sub DecodeComment($$$;$)
     $val =~ s/\x0d*\x0a*$//;        # remove trailing CR, LF or CR/LF
     # check for continuation comments
     for (;;) {
-        unless (@$lines) {
-            my $buff;
-            $raf->ReadLine($buff) or last;
-            my $altnl = $/ eq "\x0d" ? "\x0a" : "\x0d";
-            if ($buff =~ /$altnl/) {
-                chomp $buff if $/ eq "\x0d\x0a";        # remove DOS newline before splitting
-                # split into separate lines
-                @$lines = split /$altnl/, $buff, -1;
-                # handle case of DOS newline data inside file using Unix newlines
-                @$lines = ( $$lines[0] . $$lines[1] ) if @$lines == 2 and $$lines[1] eq $/;
-                # add back trailing DOS newline if necessary
-                @$lines ? @$lines[-1] .= $/ : push @$lines, $/ if $/ eq "\x0d\x0a";
-            } else {
-                push @$lines, $buff;
-            }
-        }
+        @$lines or GetNextLine($raf, $lines) or last;
         last unless $$lines[0] =~ /^%%\+/;  # is the next line a continuation?
         $$dataPt .= $$lines[0] if $dataPt;  # add to data if necessary
         $$lines[0] =~ s/\x0d*\x0a*$//;      # remove trailing CR, LF or CR/LF
@@ -371,11 +447,13 @@ sub ProcessPS($$;$)
         # - save DOS header then seek ahead and check PS header
         $raf->Read($dos, 26) == 26 or return 0;
         SetByteOrder('II');
-        unless ($raf->Seek(Get32u(\$dos, 0), 0) and
+        my $psStart = Get32u(\$dos, 0);
+        unless ($raf->Seek($psStart, 0) and
                 $raf->Read($data, 4) == 4 and $data eq '%!PS')
         {
             return PSErr($et, 'invalid header');
         }
+        $$raf{PSEnd} = $psStart + Get32u(\$dos, 4); # set end of PostScript data in RAF
     } else {
         # check for PostScript font file (PFA or PFB)
         my $d2;
@@ -487,7 +565,7 @@ sub ProcessPS($$;$)
         if ($mode) {
             if (not $endToken) {
                 $buff .= $data;
-                next unless $data =~ m{<\?xpacket end=.(w|r).\?>($/|$)};
+                next unless $data =~ m{<\?xpacket end=.(w|r).\?>(\n|\r|$)};
             } elsif ($data !~ /^$endToken/i) {
                 if ($mode eq 'XMP') {
                     $buff .= $data;
@@ -565,7 +643,7 @@ sub ProcessPS($$;$)
             $buff = $data;
             undef $endToken;    # no end token (just look for xpacket end)
             # XMP could be contained in a single line (if newlines are different)
-            next unless $data =~ m{<\?xpacket end=.(w|r).\?>($/|$)};
+            next unless $data =~ m{<\?xpacket end=.(w|r).\?>(\n|\r|$)};
         } elsif ($data =~ /^%%?(\w+): ?(.*)/s and $$tagTablePtr{$1}) {
             my ($tag, $val) = ($1, $2);
             # only allow 'ImageData' and AI tags to have single leading '%'

data/bin/lib/Image/ExifTool/TagLookup.pm

@@ -2029,11 +2029,12 @@ my %tagLookup = (
 	'distortion' => { 376 => 0xa050 },
 	'distortioncompensation' => { 433 => 0x8040 },
 	'distortioncontrol' => { 224 => 0x10 },
-	'distortioncorrection' => { 98 => 0x20705, 104 => 0x67, 114 => 0x7036, 279 => 0x50b, 306 => '7.1', 327 => 0x0, 428 => 0x601, 429 => 0x5b },
+	'distortioncorrection' => { 75 => 0x3, 98 => 0x20705, 104 => 0x67, 114 => 0x7036, 279 => 0x50b, 306 => '7.1', 327 => 0x0, 428 => 0x601, 429 => 0x5b },
 	'distortioncorrection2' => { 283 => 0x1011 },
 	'distortioncorrectionalreadyapplied' => { 452 => 'DistortionCorrectionAlreadyApplied' },
 	'distortioncorrectionon' => { 98 => '0x20705.0', 104 => 0x63 },
-	'distortioncorrectionsetting' => { 400 => 0x2013 },
+	'distortioncorrectionsetting' => { 76 => 0x7, 400 => 0x2013 },
+	'distortioncorrectionvalue' => { 75 => 0x9 },
 	'distortioncorrparams' => { 114 => 0x7037, 409 => 0x1a23, 412 => 0x1870, 414 => 0x189c, 415 => 0x18cc, 416 => 0x17d0, 428 => 0x6ca, 429 => 0x64 },
 	'distortioncorrparamsnumber' => { 412 => 0x1899, 414 => 0x18c5, 415 => 0x18f5, 416 => 0x17f9 },
 	'distortioncorrparamspresent' => { 412 => 0x1898, 414 => 0x18c4, 415 => 0x18f4, 416 => 0x17f8, 418 => 0x10b, 419 => 0x10b, 428 => 0x600, 429 => 0x5a },

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 22568 tags, with 15014 unique tag names.
+They contain a total of 22571 tags, with 15015 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -37,11 +37,11 @@ instead of the descriptions, use C<exiftool -s>.
 The B<Writable> column indicates whether the tag is writable by ExifTool.
 Anything but a C<no> in this column means the tag is writable.  A C<yes>
 indicates writable information that is either unformatted or written using
-the existing format.  Other expressions give details about the information
-format, and vary depending on the general type of information.  The format
-name may be followed by a number in square brackets to indicate the number
-of values written, or the number of characters in a fixed-length string
-(including a null terminator which is added if required).
+the existing format.  Other expressions give details about the format of the
+stored value, and vary depending on the general type of information.  The
+format name may be followed by a number in square brackets to indicate the
+number of values written, or the number of characters in a fixed-length
+string (including a null terminator which is added if required).
 
 A plus sign (C<+>) after an entry in the B<Writable> column indicates a
 I<List> tag which supports multiple values and allows individual values to
@@ -1114,61 +1114,6 @@ IPTC group only in the standard location.
   ------   --------                             --------
   [no tags known]
 
-=head2 DJI Tags
-
-This table lists tags found in the maker notes of images from some DJI
-Phantom drones.
-
-  Tag ID   Tag Name                             Writable
-  ------   --------                             --------
-  0x0001   Make                                 string
-  0x0003   SpeedX                               float
-  0x0004   SpeedY                               float
-  0x0005   SpeedZ                               float
-  0x0006   Pitch                                float
-  0x0007   Yaw                                  float
-  0x0008   Roll                                 float
-  0x0009   CameraPitch                          float
-  0x000a   CameraYaw                            float
-  0x000b   CameraRoll                           float
-
-=head3 DJI XMP Tags
-
-XMP tags used by DJI for images from drones.
-
-These tags belong to the ExifTool XMP-drone-dji family 1 group.
-
-  Tag Name                                      Writable
-  --------                                      --------
-  AbsoluteAltitude                              real
-  CalibratedFocalLength                         real
-  CalibratedOpticalCenterX                      real
-  CalibratedOpticalCenterY                      real
-  CamReverse                                    string
-  DewarpData                                    string
-  DewarpFlag                                    string
-  FlightPitchDegree                             real
-  FlightRollDegree                              real
-  FlightXSpeed                                  real
-  FlightYSpeed                                  real
-  FlightYawDegree                               real
-  FlightZSpeed                                  real
-  GPSLatitude                                   real/
-  GPSLongitude                                  real/
-  GPSLongtitude                                 real
-  GimbalPitchDegree                             real
-  GimbalReverse                                 string
-  GimbalRollDegree                              real
-  GimbalYawDegree                               real
-  Latitude                                      real
-  Longitude                                     real
-  RelativeAltitude                              real
-  RtkFlag                                       string
-  RtkStdHgt                                     real
-  RtkStdLat                                     real
-  RtkStdLon                                     real
-  SelfData                                      string
-
 =head2 XMP Tags
 
 XMP stands for "Extensible Metadata Platform", an XML/RDF-based metadata
@@ -6928,9 +6873,11 @@ This information is found in images from newer EOS models.
   ------   --------                             --------
       0    VignettingCorrVersion                no
       2    PeripheralLighting                   int16s
+      3    DistortionCorrection                 int16s
       4    ChromaticAberrationCorr              int16s
       5    ChromaticAberrationCorr              int16s
       6    PeripheralLightingValue              int16s
+      9    DistortionCorrectionValue            int16s
      11    OriginalImageWidth                   int16s
      12    OriginalImageHeight                  int16s
 
@@ -6948,6 +6895,7 @@ Vignetting correction from PowerShot models.
   ------   --------                             --------
       5    PeripheralLightingSetting            int32s
       6    ChromaticAberrationSetting           int32s
+      7    DistortionCorrectionSetting          int32s
 
 =head3 Canon LightingOpt Tags
 
@@ -8058,6 +8006,61 @@ This information is found in Casio GV-10 AVI videos.
   ------   --------                             --------
       0    Software                             no
 
+=head2 DJI Tags
+
+This table lists tags found in the maker notes of images from some DJI
+Phantom drones.
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0001   Make                                 string
+  0x0003   SpeedX                               float
+  0x0004   SpeedY                               float
+  0x0005   SpeedZ                               float
+  0x0006   Pitch                                float
+  0x0007   Yaw                                  float
+  0x0008   Roll                                 float
+  0x0009   CameraPitch                          float
+  0x000a   CameraYaw                            float
+  0x000b   CameraRoll                           float
+
+=head3 DJI XMP Tags
+
+XMP tags used by DJI for images from drones.
+
+These tags belong to the ExifTool XMP-drone-dji family 1 group.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  AbsoluteAltitude                              real
+  CalibratedFocalLength                         real
+  CalibratedOpticalCenterX                      real
+  CalibratedOpticalCenterY                      real
+  CamReverse                                    string
+  DewarpData                                    string
+  DewarpFlag                                    string
+  FlightPitchDegree                             real
+  FlightRollDegree                              real
+  FlightXSpeed                                  real
+  FlightYSpeed                                  real
+  FlightYawDegree                               real
+  FlightZSpeed                                  real
+  GPSLatitude                                   real/
+  GPSLongitude                                  real/
+  GPSLongtitude                                 real
+  GimbalPitchDegree                             real
+  GimbalReverse                                 string
+  GimbalRollDegree                              real
+  GimbalYawDegree                               real
+  Latitude                                      real
+  Longitude                                     real
+  RelativeAltitude                              real
+  RtkFlag                                       string
+  RtkStdHgt                                     real
+  RtkStdLat                                     real
+  RtkStdLon                                     real
+  SelfData                                      string
+
 =head2 FLIR Tags
 
 Information extracted from the maker notes of JPEG images from thermal

data/bin/lib/Image/ExifTool/WriteExif.pl

@@ -367,9 +367,11 @@ sub ValidateImageData($$$;$)
         my $minor;
         $minor = 1 if $$et{DOC_NUM} or $$et{FILE_TYPE} ne 'TIFF';
         unless (@bitsPerSample == $samplesPerPix) {
-            # (just a warning for this problem)
-            my $s = $samplesPerPix eq '1' ? '' : 's';
-            $et->Warn("$dirName BitsPerSample should have $samplesPerPix value$s", $minor);
+            unless ($$et{FILE_TYPE} eq 'EPS' and @bitsPerSample == 1) {
+                # (just a warning for this problem)
+                my $s = $samplesPerPix eq '1' ? '' : 's';
+                $et->Warn("$dirName BitsPerSample should have $samplesPerPix value$s", $minor);
+            }
             push @bitsPerSample, $bitsPerSample[0] while @bitsPerSample < $samplesPerPix;
             foreach (@bitsPerSample) {
                 $et->WarnOnce("$dirName BitsPerSample values are different", $minor) if $_ ne $bitsPerSample[0];

data/bin/lib/Image/ExifTool/WritePostScript.pl

@@ -302,54 +302,6 @@ sub WriteNewTags($$$)
     return $success;
 }
 
-#------------------------------------------------------------------------------
-# check to be sure we haven't read past end of PS data in DOS-style file
-# Inputs: 0) RAF ref, 1) pointer to end of PS, 2) data
-# - modifies data and sets RAF to EOF if end of PS is reached
-sub CheckPSEnd($$$)
-{
-    my $pos = $_[0]->Tell();
-    if ($pos >= $_[1]) {
-        $_[0]->Seek(0, 2);   # seek to end of file so we can't read any more
-        $_[2] = substr($_[2], 0, length($_[2]) - $pos + $_[1]) if $pos > $_[1];
-    }
-}
-
-#------------------------------------------------------------------------------
-# Split into lines ending in any CR, LF or CR+LF combination
-# (this is annoying, and could be avoided if EPS files didn't mix linefeeds!)
-# Inputs: 0) data pointer, 1) reference to lines array
-# Notes: Updates data to contain next line and fills list with remaining lines
-sub SplitLine($$)
-{
-    my ($dataPt, $lines) = @_;
-    for (;;) {
-        my $endl;
-        # find the position of the first LF (\x0a)
-        $endl = pos($$dataPt), pos($$dataPt) = 0 if $$dataPt =~ /\x0a/g;
-        if ($$dataPt =~ /\x0d/g) { # find the first CR (\x0d)
-            if (defined $endl) {
-                # (remember, CR+LF is a DOS newline...)
-                $endl = pos($$dataPt) if pos($$dataPt) < $endl - 1;
-            } else {
-                $endl = pos($$dataPt);
-            }
-        } elsif (not defined $endl) {
-            push @$lines, $$dataPt;
-            last;
-        }
-        # split into separate lines
-        if (length $$dataPt == $endl) {
-            push @$lines, $$dataPt;
-            last;
-        } else {
-            push @$lines, substr($$dataPt, 0, $endl);
-            $$dataPt = substr($$dataPt, $endl);
-        }
-    }
-    $$dataPt = shift @$lines;   # set $$dataPt to first line
-}
-
 #------------------------------------------------------------------------------
 # Write PS file
 # Inputs: 0) ExifTool object reference, 1) source dirInfo reference
@@ -365,7 +317,7 @@ sub WritePS($$)
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
     my ($data, $buff, %flags, $err, $mode, $endToken);
-    my ($dos, $psStart, $psEnd, $psNewStart, $xmpHint);
+    my ($dos, $psStart, $psNewStart, $xmpHint, @lines);
 
     $raf->Read($data, 4) == 4 or return 0;
     return 0 unless $data =~ /^(%!PS|%!Ad|\xc5\xd0\xd3\xc6)/;
@@ -390,7 +342,7 @@ sub WritePS($$)
             $et->Error('Invalid PS header');
             return 1;
         }
-        $psEnd = $psStart + Get32u(\$dos, 8);
+        $$raf{PSEnd} = $psStart + Get32u(\$dos, 8);
         my $base = Get32u(\$dos, 20);
         Set16u(0xffff, \$dos, 28);  # ignore checksum
         if ($base) {
@@ -465,34 +417,9 @@ sub WritePS($$)
     $xmpHint = 0 if $$et{DEL_GROUP}{XMP};
     $$newTags{XMP_HINT} = $xmpHint if $xmpHint;  # add special tag to newTags list
 
-    my (@lines, $changedNL);
-    my $altnl = ($/ eq "\x0d") ? "\x0a" : "\x0d";
-
     for (;;) {
-        if (@lines) {
-            $data = shift @lines;
-        } else {
-            $raf->ReadLine($data) or last;
-            $dos and CheckPSEnd($raf, $psEnd, $data);
-            # split line if it contains other newline sequences
-            if ($data =~ /$altnl/) {
-                if (length($data) > 500000 and IsPC()) {
-                    # patch for Windows memory problem
-                    unless ($changedNL) {
-                        $changedNL = 1;
-                        my $t = $/;
-                        $/ = $altnl;
-                        $altnl = $t;
-                        $raf->Seek(-length($data), 1);
-                        next;
-                    }
-                } else {
-                    # split into separate lines
-                    SplitLine(\$data, \@lines);
-                }
-            }
-        }
-        undef $changedNL;
+        @lines or GetNextLine($raf, \@lines) or last;
+        $data = shift @lines;
         if ($endToken) {
             # look for end token
             if ($data =~ m/^$endToken\s*$/is) {
@@ -641,7 +568,7 @@ sub WritePS($$)
                             $data = shift @lines;
                         } else {
                             $raf->ReadLine($data) or undef($data), last;
-                            $dos and CheckPSEnd($raf, $psEnd, $data);
+                            $dos and CheckPSEnd($raf, \$data);
                             if ($data =~ /[\x0d\x0a]%%EOF\b/g) {
                                 # split data before "%%EOF"
                                 # (necessary if data contains other newline sequences)
@@ -659,7 +586,7 @@ sub WritePS($$)
                     Write($outfile, $data) or $err = 1;
                     Write($outfile, @lines) or $err = 1 if @lines;
                     while ($raf->Read($data, 65536)) {
-                        $dos and CheckPSEnd($raf, $psEnd, $data);
+                        $dos and CheckPSEnd($raf, \$data);
                         Write($outfile, $data) or $err = 1;
                     }
                 }

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 11.50
+Version: 11.51
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('11.50.0')
+  VERSION = Gem::Version.new('11.51.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.50.0
+  version: 11.51.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool