exiftool_vendored 10.40.0 → 10.43.0

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

@@ -1094,7 +1094,7 @@ NoWrite:            next if $isNew > 0;
                         # value undefined if deleting this tag
                         # (also delete tag if cross-deleting and this isn't a date/time shift)
                         if (not defined $newVal or ($xDelete{$newID} and not defined $$nvHash{Shift})) {
-                            if ($$newInfo{RawConvInv} and defined $$nvHash{Value}) {
+                            if (not defined $newVal and $$newInfo{RawConvInv} and defined $$nvHash{Value}) {
                                 # error in RawConvInv, so rewrite existing tag
                                 goto NoOverwrite; # GOTO!
                             }

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

@@ -60,7 +60,7 @@ sub HexEncode($)
 }
 
 #------------------------------------------------------------------------------
-# Write profile to tEXt or zTXt chunk (zTXt if Zlib is available)
+# Write profile chunk (possibly compressed if Zlib is available)
 # Inputs: 0) outfile, 1) Raw profile type, 2) data ref
 #         3) profile header type (undef if not a text profile)
 # Returns: 1 on success
@@ -68,19 +68,29 @@ sub WriteProfile($$$;$)
 {
     my ($outfile, $rawType, $dataPt, $profile) = @_;
     my ($buff, $prefix, $chunk, $deflate);
-    if (eval { require Compress::Zlib }) {
+    if ($rawType ne $stdCase{exif} and eval { require Compress::Zlib }) {
         $deflate = Compress::Zlib::deflateInit();
     }
     if (not defined $profile) {
         # write ICC profile as compressed iCCP chunk if possible
-        return 0 unless $deflate;
-        $buff = $deflate->deflate($$dataPt);
-        return 0 unless defined $buff;
-        $buff .= $deflate->flush();
-        my %rawTypeChunk = ( icm => 'iCCP' );
-        $chunk = $rawTypeChunk{$rawType} or return 0;
-        $prefix = "$rawType\0\0";
-        $dataPt = \$buff;
+        if ($rawType eq 'icm') {
+            return 0 unless $deflate;
+            $chunk = 'iCCP';
+            $prefix = "$rawType\0\0";
+        } else {
+            $chunk = $rawType;
+            if ($rawType eq $stdCase{zxif}) {
+                $prefix = "\0" . pack('N', length $$dataPt);
+            } else {
+                $prefix = '';
+            }
+        }
+        if ($deflate) {
+            $buff = $deflate->deflate($$dataPt);
+            return 0 unless defined $buff;
+            $buff .= $deflate->flush();
+            $dataPt = \$buff;
+        }
     } else {
         # write as ASCII-hex encoded profile in tEXt or zTXt chunk
         my $txtHdr = sprintf("\n$profile profile\n%8d\n", length($$dataPt));
@@ -134,6 +144,7 @@ sub Add_iCCP($$)
 sub DoneDir($$$;$)
 {
     my ($et, $dir, $outBuff, $nonStandard) = @_;
+    $dir = 'IFD0' if $dir eq 'EXIF';
     # don't add this directory again unless this is in a non-standard location
     delete $$et{ADD_DIRS}{$dir} unless $nonStandard;
     # handle problem with duplicate XMP when using PNGEarlyXMP option
@@ -276,14 +287,20 @@ sub AddChunks($$;@)
             DirName => $dir,
         );
         if ($dir eq 'IFD0') {
-            $et->Warn('Creating non-standard EXIF in PNG', 1);
-            $et->VPrint(0, "Creating EXIF profile:\n");
+            my $chunk = $stdCase{exif};
+            if ($et->Options('Compress')) {
+                if (eval { require Compress::Zlib }) {
+                    $chunk = $stdCase{zxif};
+                } else {
+                    $et->Warn("Creating uncompressed $stdCase{exif} chunk (Compress::Zlib not available)");
+                }
+            }
+            $et->VPrint(0, "Creating $chunk chunk:\n");
             $$et{TIFF_TYPE} = 'APP1';
             $tagTablePtr = Image::ExifTool::GetTagTable('Image::ExifTool::Exif::Main');
             $buff = $et->WriteDirectory(\%dirInfo, $tagTablePtr, \&Image::ExifTool::WriteTIFF);
             if (defined $buff and length $buff) {
-                $buff = $Image::ExifTool::exifAPP1hdr . $buff;
-                WriteProfile($outfile, 'APP1', \$buff, 'generic') or $err = 1;
+                WriteProfile($outfile, $chunk, \$buff) or $err = 1;
             }
         } elsif ($dir eq 'XMP') {
             $et->VPrint(0, "Creating XMP iTXt chunk:\n");

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

@@ -119,7 +119,8 @@ my %writableType = (
 
 # (Note: all writable "pseudo" tags must be found in Extra table)
 my @writablePseudoTags =  qw(
-    FileName FilePermissions Directory FileModifyDate FileCreateDate HardLink TestName
+    FileName FilePermissions FileUserID FileGroupID Directory FileModifyDate
+    FileCreateDate HardLink TestName
 );
 
 # groups we are allowed to delete
@@ -1162,7 +1163,7 @@ sub SetNewValuesFromFile($$;@)
         DateFormat      => $$options{DateFormat},
         Duplicates      => 1,
         Escape          => $$options{Escape},
-      # Exclude set below
+      # Exclude (set below)
         ExtendedXMP     => $$options{ExtendedXMP},
         ExtractEmbedded => $$options{ExtractEmbedded},
         FastScan        => $$options{FastScan},
@@ -1190,6 +1191,7 @@ sub SetNewValuesFromFile($$;@)
         SystemTags      => $$options{SystemTags},
         Unknown         => $$options{Unknown},
         UserParam       => $$options{UserParam},
+        Validate        => $$options{Validate},
         XMPAutoConv     => $$options{XMPAutoConv},
     );
     $$srcExifTool{GLOBAL_TIME_OFFSET} = $$self{GLOBAL_TIME_OFFSET};
@@ -1857,17 +1859,39 @@ sub SetFileName($$;$$)
 }
 
 #------------------------------------------------------------------------------
-# Set file permissions
+# Set file permissions and group/user id from new tag values
 # Inputs: 0) Exiftool ref, 1) file name or glob
-# Returns: 1=permissions were set, 0=didn't try, -1=error (and warning set)
+# Returns: 1=permissions and/or id was set, 0=didn't try, -1=error (and warning set)
+# Notes: There may be errors even if 1 is returned
 sub SetFilePermissions($$)
 {
     my ($self, $file) = @_;
-    my $perms = $self->GetNewValue('FilePermissions');
-    return 0 unless defined $perms;
-    return 1 if eval { chmod($perms, $file) };
-    $self->WarnOnce('Error setting FilePermissions');
-    return -1;
+    my $perm = $self->GetNewValue('FilePermissions');
+    my $uid = $self->GetNewValue('FileUserID');
+    my $gid = $self->GetNewValue('FileGroupID');
+    my $result = 0;
+    if (defined $perm) {
+        if (eval { chmod($perm & 07777, $file) }) {
+            $self->VerboseValue('+ FilePermissions', $perm);
+            $result = 1;
+        } else {
+            $self->WarnOnce('Error setting FilePermissions');
+            $result = -1;
+        }
+    }
+    if (defined $uid or defined $gid) {
+        defined $uid or $uid = -1;
+        defined $gid or $gid = -1;
+        if (eval { chown($uid, $gid, $file) }) {
+            $self->VerboseValue('+ FileUserID', $uid) if $uid >= 0;
+            $self->VerboseValue('+ FileGroupID', $gid) if $gid >= 0;
+            $result = 1;
+        } else {
+            $self->WarnOnce('Error setting FileGroup/UserID');
+            $result = -1 unless $result;
+        }
+    }
+    return $result;
 }
 
 #------------------------------------------------------------------------------
@@ -2971,7 +2995,13 @@ sub CopyFileAttrs($$$)
     if (defined $mode and not defined $self->GetNewValue('FilePermissions')) {
         eval { chmod($mode & 07777, $dst) };
     }
-    eval { chown($uid, $gid, $dst) } if defined $uid and defined $gid;
+    my $newUid = $self->GetNewValue('FileUserID');
+    my $newGid = $self->GetNewValue('FileGroupID');
+    if (defined $uid and defined $gid and (not defined $newUid or not defined $newGid)) {
+        defined $newGid and $gid = $newGid;
+        defined $newUid and $uid = $newUid;
+        eval { chown($uid, $gid, $dst) };
+    }
 }
 
 #------------------------------------------------------------------------------

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

@@ -48,7 +48,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '2.99';
+$VERSION = '3.02';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -155,7 +155,7 @@ my %xmpNS = (
     prm       => 'http://prismstandard.org/namespaces/prm/3.0/',
     acdsee    => 'http://ns.acdsee.com/iptc/1.0/',
     digiKam   => 'http://www.digikam.org/ns/1.0/',
-    swf       => 'http://ns.adobe.com/swf/1.0',
+    swf       => 'http://ns.adobe.com/swf/1.0/',
     cell      => 'http://developer.sonyericsson.com/cell/1.0/',
     aas       => 'http://ns.apple.com/adjustment-settings/1.0/',
    'mwg-rs'   => 'http://www.metadataworkinggroup.com/schemas/regions/',
@@ -1011,7 +1011,7 @@ my %sPantryItem = (
         ValueConvInv => '"/$val"',
         PrintConv => { True => 'True', False => 'False', Unknown => 'Unknown' },
     },
-    Keywords    => { Priority => 0 },
+    Keywords    => { Priority => -1 }, # (-1 to get below Priority 0 PDF:Keywords)
     PDFVersion  => { },
     Producer    => { Groups => { 2 => 'Author' } },
 );
@@ -3520,13 +3520,17 @@ sub ProcessXMP($$;$)
     $$et{xlatNS} = { };
 
     # ignore non-standard XMP while in strict MWG compatibility mode
-    if ($Image::ExifTool::MWG::strict and not $$et{XMP_CAPTURE} and
+    if (($Image::ExifTool::MWG::strict or $et->Options('Validate')) and not $$et{XMP_CAPTURE} and
         $$et{FILE_TYPE} =~ /^(JPEG|TIFF|PSD)$/)
     {
         my $path = $et->MetadataPath();
         unless ($path =~ /^(JPEG-APP1-XMP|TIFF-IFD0-XMP|PSD-XMP)$/) {
-            $et->Warn("Ignored non-standard XMP at $path");
-            return 1;
+            if ($Image::ExifTool::MWG::strict) {
+                $et->Warn("Ignored non-standard XMP at $path");
+                return 1;
+            } else {
+                $et->Warn("Non-standard XMP at $path", 1);
+            }
         }
     }
     if ($dataPt) {

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

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

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/AFCP.t".
 
-BEGIN { $| = 1; print "1..3\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..3\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/AIFF.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/APE.t".
 
-BEGIN { $| = 1; print "1..3\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..3\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/ASF.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/Apple.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/Audible.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/BMP.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/BPG.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/BigTIFF.t".
 
-BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..2\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

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

@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/Canon.t".
 
-BEGIN { $| = 1; print "1..3\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..3\n"; $Image::ExifTool::configFile = ''; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)

data/bin/Image-ExifTool-10.43/t/CanonRaw.t

@@ -0,0 +1,138 @@
+# Before "make install", this script should be runnable with "make test".
+# After "make install" it should work as "perl t/CanonRaw.t".
+
+BEGIN { $| = 1; print "1..7\n"; $Image::ExifTool::configFile = ''; }
+END {print "not ok 1\n" unless $loaded;}
+
+# test 1: Load the module(s)
+use Image::ExifTool 'ImageInfo';
+use Image::ExifTool::CanonRaw;
+$loaded = 1;
+print "ok 1\n";
+
+use t::TestLib;
+
+my $testname = 'CanonRaw';
+my $testnum = 1;
+
+# test 2: Extract information from CRW
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    my $info = $exifTool->ImageInfo('t/images/CanonRaw.crw');
+    print 'not ' unless check($exifTool, $info, $testname, $testnum);
+    print "ok $testnum\n";
+}
+
+# test 3: Extract JpgFromRaw from CRW
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    $exifTool->Options(PrintConv => 0, IgnoreMinorErrors => 1);
+    my $info = $exifTool->ImageInfo('t/images/CanonRaw.crw','JpgFromRaw');
+    print 'not ' unless ${$info->{JpgFromRaw}} eq '<Dummy JpgFromRaw image data>';
+    print "ok $testnum\n";
+}
+
+# test 4: Write a whole pile of tags to a CRW
+{
+    ++$testnum;
+    if (eval { require Time::Local }) {
+        my $exifTool = new Image::ExifTool;
+        # set IgnoreMinorErrors option to allow invalid JpgFromRaw to be written
+        $exifTool->Options(IgnoreMinorErrors => 1);
+        $exifTool->SetNewValuesFromFile('t/images/Canon.jpg');
+        $exifTool->SetNewValue(SerialNumber => 1234);
+        $exifTool->SetNewValue(OwnerName => 'Phil Harvey');
+        $exifTool->SetNewValue(JpgFromRaw => 'not a real image');
+        $exifTool->SetNewValue(ROMOperationMode => 'CDN');
+        $exifTool->SetNewValue(FocalPlaneXSize => '35 mm');
+        $exifTool->SetNewValue(FocalPlaneYSize => '24 mm');
+        my $testfile = "t/${testname}_${testnum}_failed.crw";
+        unlink $testfile;
+        $exifTool->WriteInfo('t/images/CanonRaw.crw', $testfile);
+        my $info = $exifTool->ImageInfo($testfile);
+        if (check($exifTool, $info, $testname, $testnum)) {
+            unlink $testfile;
+        } else {
+            print 'not ';
+        }
+        print "ok $testnum\n";
+    } else {
+        print "ok $testnum # skip Requires Time::Local\n";
+    }
+}
+
+# test 5: Test verbose output
+{
+    ++$testnum;
+    print 'not ' unless testVerbose($testname, $testnum, 't/images/CanonRaw.crw', 1);
+    print "ok $testnum\n";
+}
+
+# test 6: Write to CR2 file
+{
+    ++$testnum;
+    if (eval { require Time::Local }) {
+        my $exifTool = new Image::ExifTool;
+        # set IgnoreMinorErrors option to allow invalid JpgFromRaw to be written
+        $exifTool->SetNewValue(Keywords => 'CR2 test');
+        $exifTool->SetNewValue(OwnerName => 'Phil Harvey');
+        $exifTool->SetNewValue(FocalPlaneXSize => '35mm');
+        my $testfile = "t/${testname}_${testnum}_failed.cr2";
+        unlink $testfile;
+        $exifTool->WriteInfo('t/images/CanonRaw.cr2', $testfile);
+        my $info = $exifTool->ImageInfo($testfile);
+        my $success = check($exifTool, $info, $testname, $testnum);
+        # make sure file suffix was copied properly
+        while ($success) {
+            open(TESTFILE, $testfile) or last;
+            binmode(TESTFILE);
+            my $endStr = '<Dummy preview image data>Non-TIFF data test';
+            my $len = length $endStr;
+            seek(TESTFILE, -$len, 2) or last;
+            my $buff;
+            read(TESTFILE, $buff, $len) == $len or last;
+            close(TESTFILE);
+            if ($buff eq $endStr) {
+                unlink $testfile;
+                $success = 2;
+            } else {
+                warn "\n  Test $testnum failed to copy file suffix:\n";
+                warn "    Test gave: '$buff'\n";
+                warn "    Should be: '$endStr'\n";
+                $success = 0;
+            }
+            last;
+        }
+        warn "\n  Test $testnum: Error reading file suffix\n" if $success == 1;
+        print 'not ' unless $success == 2;
+        print "ok $testnum\n";
+    } else {
+        print "ok $testnum # skip Requires Time::Local\n";
+    }
+}
+
+# test 7: Test copying all information from a CR2 image to a JPEG
+{
+    ++$testnum;
+    if (eval { require Time::Local }) {
+        my $exifTool = new Image::ExifTool;
+        $exifTool->SetNewValuesFromFile('t/images/CanonRaw.cr2');
+        $testfile = "t/${testname}_${testnum}_failed.jpg";
+        unlink $testfile;
+        $exifTool->WriteInfo('t/images/Writer.jpg', $testfile);
+        $exifTool->Options(Unknown => 1);
+        my $info = $exifTool->ImageInfo($testfile);
+        if (check($exifTool, $info, $testname, $testnum)) {
+            unlink $testfile;
+        } else {
+            print 'not ';
+        }
+        print "ok $testnum\n";
+    } else {
+        print "ok $testnum # skip Requires Time::Local\n";
+    }
+}
+
+# end