exiftool_vendored 9.53.0 → 9.58.0

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/WriteExif.pl

@@ -343,17 +343,18 @@ my %writeTable = (
     0x8298 => {             # Copyright
         Writable => 'string',
         WriteGroup => 'IFD0',
-        RawConvInv => sub {
+        RawConvInv => '$val . "\0"',
+        PrintConvInv => sub {
             my ($val, $self) = @_;
             # encode if necessary
             my $enc = $self->Options('CharsetEXIF');
             $val = $self->Encode($val,$enc) if $enc and $val !~ /\0/;
             if ($val =~ /(.*?)\s*[\n\r]+\s*(.*)/s) {
-                return $1 . "\0" unless length $2;
+                return $1 unless length $2;
                 # photographer copyright set to ' ' if it doesn't exist, according to spec.
-                return((length($1) ? $1 : ' ') . "\0" . $2 . "\0");
+                return((length($1) ? $1 : ' ') . "\0" . $2);
             }
-            return $val . "\0";
+            return $val;
         },
     },
 #
@@ -1515,19 +1516,19 @@ sub RebuildMakerNotes($$$)
 
 #------------------------------------------------------------------------------
 # Sort IFD directory entries
-# Inputs: 0) data reference, 1) directory start, 2) number of entries
-sub SortIFD($$$)
+# Inputs: 0) data reference, 1) directory start, 2) number of entries,
+#         3) flag to treat 0 as a valid tag ID (as opposed to an empty IFD entry)
+sub SortIFD($$$;$)
 {
-    my ($dataPt, $dirStart, $numEntries) = @_;
+    my ($dataPt, $dirStart, $numEntries, $allowZero) = @_;
     my ($index, %entries);
     # split the directory into separate entries
-    my $newDir = '';
     for ($index=0; $index<$numEntries; ++$index) {
         my $entry = $dirStart + 2 + 12 * $index;
         my $tagID = Get16u($dataPt, $entry);
         my $entryData = substr($$dataPt, $entry, 12);
         # silly software can pad directories with zero entries -- put these at the end
-        $tagID = 0x10000 unless $tagID or $index == 0;
+        $tagID = 0x10000 unless $tagID or $index == 0 or $allowZero;
         # add new entry (allow for duplicate tag ID's, which shouldn't normally happen)
         if ($entries{$tagID}) {
             $entries{$tagID} .= $entryData;
@@ -1537,6 +1538,8 @@ sub SortIFD($$$)
     }
     # sort the directory entries
     my @sortedTags = sort { $a <=> $b } keys %entries;
+    # generate the sorted IFD
+    my $newDir = '';
     foreach (@sortedTags) {
         $newDir .= $entries{$_};
     }
@@ -1807,8 +1810,8 @@ sub WriteExif($$$)
                 for ($index=0; $index<$numEntries; ++$index) {
                     my $tagID = Get16u($dataPt, $dirStart + 2 + 12 * $index);
                     # check for proper sequence (but ignore null entries at end)
-                    if ($tagID < $lastID and $tagID) {
-                        SortIFD($dataPt, $dirStart, $numEntries);
+                    if ($tagID < $lastID and ($tagID or $$tagTablePtr{0})) {
+                        SortIFD($dataPt, $dirStart, $numEntries, $$tagTablePtr{0});
                         $et->Warn("Entries in $name were out of sequence. Fixed.",1);
                         last;
                     }

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Writer.pl

@@ -443,28 +443,22 @@ sub SetNewValue($;$$%)
                 push @matchingTags, $langInfo if $langInfo;
             }
             last if @matchingTags;
-        } else {
+        } elsif (not $options{NoShortcut}) {
             # look for a shortcut or alias
             require Image::ExifTool::Shortcuts;
             my ($match) = grep /^\Q$tag\E$/i, keys %Image::ExifTool::Shortcuts::Main;
             undef $err;
-            if ($match and not $options{NoShortcut}) {
-                if (@{$Image::ExifTool::Shortcuts::Main{$match}} == 1) {
-                    $tag = $Image::ExifTool::Shortcuts::Main{$match}[0];
-                    @matchingTags = FindTagInfo($tag);
-                    last if @matchingTags;
-                } else {
-                    $options{NoShortcut} = 1;
-                    foreach $tag (@{$Image::ExifTool::Shortcuts::Main{$match}}) {
-                        my ($n, $e) = $self->SetNewValue($tag, $value, %options);
-                        $numSet += $n;
-                        $e and $err = $e;
-                    }
-                    undef $err if $numSet;  # no error if any set successfully
-                    return ($numSet, $err) if wantarray;
-                    $err and warn "$err\n";
-                    return $numSet;
+            if ($match) {
+                $options{NoShortcut} = 1;
+                foreach $tag (@{$Image::ExifTool::Shortcuts::Main{$match}}) {
+                    my ($n, $e) = $self->SetNewValue($tag, $value, %options);
+                    $numSet += $n;
+                    $e and $err = $e;
                 }
+                undef $err if $numSet;  # no error if any set successfully
+                return ($numSet, $err) if wantarray;
+                $err and warn "$err\n";
+                return $numSet;
             }
         }
         unless ($listOnly) {
@@ -1489,7 +1483,7 @@ sub CountNewValues($)
     my $pseudo = 0;
     if ($newVal) {
         # (Note: all writable "pseudo" tags must be found in Extra table)
-        foreach $tag (qw{FileName Directory FileModifyDate FileCreateDate}) {
+        foreach $tag (qw{FileName Directory FileModifyDate FileCreateDate HardLink}) {
             ++$pseudo if defined $$newVal{$Image::ExifTool::Extra{$tag}};
         }
     }
@@ -1626,26 +1620,32 @@ sub SetFileModifyDate($$;$$)
 #------------------------------------------------------------------------------
 # Change file name and/or directory from FileName and Directory tags
 # Inputs: 0) ExifTool object reference, 1) current file name (including path)
-#         2) New name (or undef to build from FileName and Directory tags)
+#         2) new name (or undef to build from FileName and Directory tags)
+#         3) option: 'Link' to create link instead of renaming file
 # Returns: 1=name changed OK, 0=nothing changed, -1=error changing name
 #          (and increments CHANGED flag if filename changed)
 # Notes: Will not overwrite existing file.  Creates directories as necessary.
-sub SetFileName($$;$)
+sub SetFileName($$;$$)
 {
-    my ($self, $file, $newName) = @_;
+    my ($self, $file, $newName, $opt) = @_;
     my ($nvHash, $doName, $doDir);
     # determine the new file name
     unless (defined $newName) {
-        my $filename = $self->GetNewValues('FileName', \$nvHash);
-        $doName = 1 if defined $filename and $self->IsOverwriting($nvHash, $file);
-        my $dir = $self->GetNewValues('Directory', \$nvHash);
-        $doDir = 1 if defined $dir and $self->IsOverwriting($nvHash, $file);
-        return 0 unless $doName or $doDir;  # nothing to do
-        if ($doName) {
-            $newName = GetNewFileName($file, $filename);
-            $newName = GetNewFileName($newName, $dir) if $doDir;
+        if ($opt and $opt eq 'Link') {
+            $newName = $self->GetNewValues('HardLink');
+            return 0 unless defined $newName;
         } else {
-            $newName = GetNewFileName($file, $dir);
+            my $filename = $self->GetNewValues('FileName', \$nvHash);
+            $doName = 1 if defined $filename and $self->IsOverwriting($nvHash, $file);
+            my $dir = $self->GetNewValues('Directory', \$nvHash);
+            $doDir = 1 if defined $dir and $self->IsOverwriting($nvHash, $file);
+            return 0 unless $doName or $doDir;  # nothing to do
+            if ($doName) {
+                $newName = GetNewFileName($file, $filename);
+                $newName = GetNewFileName($newName, $dir) if $doDir;
+            } else {
+                $newName = GetNewFileName($file, $dir);
+            }
         }
     }
     $newName =~ tr/\0//d;   # make sure name doesn't contain nulls
@@ -1663,6 +1663,15 @@ sub SetFileName($$;$)
         }
         $self->VPrint(0, "Created directory for '$newName'");
     }
+    if ($opt and $opt eq 'Link') {
+        unless (link $file, $newName) {
+            $self->Warn("Error creating link '$newName'");
+            return -1;
+        }
+        ++$$self{CHANGED};
+        $self->VerboseValue('+ HardLink', $newName);
+        return 1;
+    }
     # attempt to rename the file
     unless (rename $file, $newName) {
         local (*EXIFTOOL_SFN_IN, *EXIFTOOL_SFN_OUT);
@@ -1696,6 +1705,7 @@ sub SetFileName($$;$)
         # remove the original file
         unlink $file or $self->Warn('Error removing old file');
     }
+    $$self{NewName} = $newName; # remember new file name
     ++$$self{CHANGED};
     $self->VerboseValue('+ FileName', $newName);
     return 1;
@@ -1713,7 +1723,7 @@ sub WriteInfo($$;$$)
 {
     local ($_, *EXIFTOOL_FILE2, *EXIFTOOL_OUTFILE);
     my ($self, $infile, $outfile, $outType) = @_;
-    my (@fileTypeList, $fileType, $tiffType, $hdr, $seekErr, $type, $tmpfile);
+    my (@fileTypeList, $fileType, $tiffType, $hdr, $seekErr, $type, $tmpfile, $hardLink);
     my ($inRef, $outRef, $closeIn, $closeOut, $outPos, $outBuff, $eraseIn, $raf);
     my $oldRaf = $$self{RAF};
     my $rtnVal = 0;
@@ -1741,7 +1751,15 @@ sub WriteInfo($$;$$)
 #
     my ($numNew, $numPseudo) = $self->CountNewValues();
     if (not defined $outfile and defined $infile) {
+        $hardLink = $self->GetNewValues('HardLink');
+        undef $hardLink if defined $hardLink and not length $hardLink;
         my $newFileName =  $self->GetNewValues('FileName', \$nvHash);
+        my $newDir = $self->GetNewValues('Directory');
+        if (defined $newDir and length $newDir) {
+            $newDir .= '/' unless $newDir =~ m{/$};
+        } else {
+            undef $newDir;
+        }
         if ($numNew == $numPseudo) {
             $rtnVal = 2;
             if (defined $fileModifyDate and (not ref $infile or UNIVERSAL::isa($infile,'GLOB'))) {
@@ -1750,9 +1768,14 @@ sub WriteInfo($$;$$)
             if (defined $fileCreateDate and (not ref $infile or UNIVERSAL::isa($infile,'GLOB'))) {
                 $self->SetFileModifyDate($infile, undef, 'FileCreateDate') > 0 and $rtnVal = 1;
             }
-            if (defined $newFileName and not ref $infile) {
+            if ((defined $newFileName or defined $newDir) and not ref $infile) {
                 $self->SetFileName($infile) > 0 and $rtnVal = 1;
             }
+            if (defined $hardLink) {
+                my $src = $$self{NewName};
+                $src = $infile unless defined $src;
+                $self->SetFileName($src, $hardLink, 'Link') and $rtnVal = 1;
+            }
             return $rtnVal;
         } elsif (defined $newFileName and length $newFileName) {
             # can't simply rename file, so just set the output name if new FileName
@@ -1765,6 +1788,14 @@ sub WriteInfo($$;$$)
                 $eraseIn = 1; # delete original
             }
         }
+        # set new directory if specified
+        if (defined $newDir) {
+            $outfile = $infile unless defined $outfile or ref $infile;
+            if (defined $outfile) {
+                $outfile = GetNewFileName($outfile, $newDir);
+                $eraseIn = 1 unless ref $infile;
+            }
+        }
     }
 #
 # set up input file
@@ -2120,18 +2151,19 @@ sub WriteInfo($$;$$)
         }
     }
     # set FileModifyDate if requested (and if possible!)
-    if (defined $fileModifyDate and $rtnVal > 0 and
-        ($closeOut or ($closeIn and defined $outBuff)) and
-        $self->SetFileModifyDate($closeOut ? $outfile : $infile, $originalTime) > 0)
-    {
-        ++$$self{CHANGED}; # we changed something
-    }
-    # set FileCreateDate if requested (and if possible!)
-    if (defined $fileCreateDate and $rtnVal > 0 and
-        ($closeOut or ($closeIn and defined $outBuff)) and
-        $self->SetFileModifyDate($closeOut ? $outfile : $infile, $createTime, 'FileCreateDate') > 0)
-    {
-        ++$$self{CHANGED}; # we changed something
+    if ($rtnVal > 0 and ($closeOut or ($closeIn and defined $outBuff))) {
+        my $target = $closeOut ? $outfile : $infile;
+        if (defined $fileModifyDate and $self->SetFileModifyDate($target, $originalTime) > 0) {
+            ++$$self{CHANGED}; # we changed something
+        }
+        # set FileCreateDate if requested (and if possible!)
+        if (defined $fileCreateDate and $self->SetFileModifyDate($target, $createTime, 'FileCreateDate')) {
+            ++$$self{CHANGED}; # we changed something
+        }
+        # create hard link if requested and no output filename specified (and if possible!)
+        if (defined $hardLink and $self->SetFileName($target, $hardLink, 'Link')) {
+            ++$$self{CHANGED}; # we changed something (sort of)
+        }
     }
     # check for write error and set appropriate error message and return value
     if ($rtnVal < 0) {
@@ -2212,7 +2244,7 @@ sub GetWritableTags(;$)
             my $i = $#parts - 1;
             $parts[$i] = "Write$parts[$i]";   # add 'Write' before class name
             my $module = join('::',@parts[0..$i]);
-            eval "require $module"; # (fails silently if nothing loaded)
+            eval { require $module }; # (fails silently if nothing loaded)
         }
         my $tagID;
         foreach $tagID (TagTableKeys($table)) {
@@ -3125,6 +3157,7 @@ sub GetNewTagInfoList($;$)
 # Get hash of tagInfo references keyed on tagID for a specific table
 # Inputs: 0) ExifTool object reference, 1-N) tag table pointers
 # Returns: hash reference
+# Notes: returns only one tagInfo ref for each conditional list
 sub GetNewTagInfoHash($@)
 {
     my $self = shift;
@@ -3201,6 +3234,7 @@ sub GetLangInfo($$)
             Description => Image::ExifTool::MakeDescription($$tagInfo{Name}) .
                            " ($langCode)",
             LangCode => $langCode,
+            SrcTagInfo => $tagInfo, # save reference to original tagInfo
         };
         AddTagToTable($table, $tagID, $langInfo);
     }
@@ -3511,8 +3545,9 @@ sub GetExtended($$)
 # Dump data in hex and ASCII to console
 # Inputs: 0) data reference, 1) length or undef, 2-N) Options:
 # Options: Start => offset to start of data (default=0)
-#          Addr => address to print for data start (default=DataPos+Start)
-#          DataPos => address of start of data
+#          Addr => address to print for data start (default=DataPos+Base+Start)
+#          DataPos => position of data within block (relative to Base)
+#          Base => base offset for pointers from start of file
 #          Width => width of printout (bytes, default=16)
 #          Prefix => prefix to print at start of line (default='')
 #          MaxLen => maximum length to dump
@@ -3533,7 +3568,7 @@ sub HexDump($;$%)
     my $more;
     $len = $opts{Len} if defined $opts{Len};
 
-    $addr = $start + ($opts{DataPos} || 0) unless defined $addr;
+    $addr = $start + ($opts{DataPos} || 0) + ($opts{Base} || 0) unless defined $addr;
     $len = $datLen unless defined $len;
     if ($maxLen and $len > $maxLen) {
         # print one line less to allow for $more line below
@@ -3570,6 +3605,7 @@ sub HexDump($;$%)
 #        Value => Tag value
 #        DataPt => reference to value data block
 #        DataPos => location of data block in file
+#        Base => base added to all offsets
 #        Size => length of value data within block
 #        Format => value format string
 #        Count => number of values

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/XMP.pm

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
 require Exporter;
 
-$VERSION = '2.74';
+$VERSION = '2.75';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -1835,6 +1835,7 @@ my %sPantryItem = (
     },
     GPSTrack => { Groups => { 2 => 'Location' }, Writable => 'rational' },
     GPSImgDirectionRef => {
+        Groups => { 2 => 'Location' },
         PrintConv => {
             M => 'Magnetic North',
             T => 'True North',
@@ -2641,8 +2642,6 @@ sub GetLangInfo($$)
     return undef unless $$tagInfo{Writable} and $$tagInfo{Writable} eq 'lang-alt';
     $langCode =~ tr/_/-/;   # RFC 3066 specifies '-' as a separator
     my $langInfo = Image::ExifTool::GetLangInfo($tagInfo, $langCode);
-    # save reference to source tagInfo hash in case we need to set the PropertyPath later
-    $$langInfo{SrcTagInfo} = $tagInfo;
     return $langInfo;
 }
 

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 9.53
+Version: 9.58
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl
@@ -22,38 +22,38 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | EIP   r     | LNK   r     | PAC   r     | RWL   r/w
-  3G2   r/w   | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  3GP   r/w   | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
-  ACR   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
-  AFM   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
-  AI    r/w   | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
-  AIFF  r     | F4A/V r/w   | MKA   r     | PFA   r     | SRW   r/w
-  APE   r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
-  ARW   r/w   | FLA   r     | MKV   r     | PFM   r     | SWF   r
-  ASF   r     | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
-  AVI   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
-  BMP   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
-  BTF   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r
-  CHM   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
-  COS   r     | GZ    r     | MP4   r/w   | PNG   r/w   | VRD   r/w/c
-  CR2   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
-  CRW   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
-  CS1   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
-  DCM   r     | ICC   r/w/c | MQV   r/w   | PS    r/w   | WEBP  r
-  DCP   r/w   | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
-  DCR   r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
-  DFONT r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
-  DIVX  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WV    r
-  DJVU  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
-  DLL   r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
-  DNG   r/w   | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
-  DOC   r     | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
-  DOCX  r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
-  DPX   r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
-  DV    r     | KDC   r     | OGV   r     | RSRC  r     |
-  DVB   r/w   | KEY   r     | ORF   r/w   | RTF   r     |
-  DYLIB r     | LA    r     | OTF   r     | RW2   r/w   |
+  3FR   r     | EIP   r     | LA    r     | OTF   r     | RW2   r/w
+  3G2   r/w   | EPS   r/w   | LNK   r     | PAC   r     | RWL   r/w
+  3GP   r/w   | ERF   r/w   | M2TS  r     | PAGES r     | RWZ   r
+  ACR   r     | EXE   r     | M4A/V r/w   | PBM   r/w   | RM    r
+  AFM   r     | EXIF  r/w/c | MEF   r/w   | PCD   r     | SEQ   r
+  AI    r/w   | EXR   r     | MIE   r/w/c | PDF   r/w   | SO    r
+  AIFF  r     | EXV   r/w/c | MIFF  r     | PEF   r/w   | SR2   r/w
+  APE   r     | F4A/V r/w   | MKA   r     | PFA   r     | SRF   r
+  ARW   r/w   | FFF   r/w   | MKS   r     | PFB   r     | SRW   r/w
+  ASF   r     | FLA   r     | MKV   r     | PFM   r     | SVG   r
+  AVI   r     | FLAC  r     | MNG   r/w   | PGF   r     | SWF   r
+  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | THM   r/w
+  BTF   r     | FPF   r     | MOS   r/w   | PLIST r     | TIFF  r/w
+  CHM   r     | FPX   r     | MOV   r/w   | PICT  r     | TORRENT r
+  COS   r     | GIF   r/w   | MP3   r     | PMP   r     | TTC   r
+  CR2   r/w   | GZ    r     | MP4   r/w   | PNG   r/w   | TTF   r
+  CRW   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VRD   r/w/c
+  CS1   r/w   | HDR   r     | MPG   r     | PPT   r     | VSD   r
+  DCM   r     | HTML  r     | MPO   r/w   | PPTX  r     | WAV   r
+  DCP   r/w   | ICC   r/w/c | MQV   r/w   | PS    r/w   | WDP   r/w
+  DCR   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBP  r
+  DFONT r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WEBM  r
+  DIVX  r     | IND   r/w   | NEF   r/w   | PSP   r     | WMA   r
+  DJVU  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WMV   r
+  DLL   r     | ITC   r     | NUMBERS r   | RA    r     | WV    r
+  DNG   r/w   | J2C   r     | ODP   r     | RAF   r/w   | X3F   r/w
+  DOC   r     | JNG   r/w   | ODS   r     | RAM   r     | XCF   r
+  DOCX  r     | JP2   r/w   | ODT   r     | RAR   r     | XLS   r
+  DPX   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XLSX  r
+  DV    r     | K25   r     | OGG   r     | RIFF  r     | XMP   r/w/c
+  DVB   r/w   | KDC   r     | OGV   r     | RSRC  r     | ZIP   r
+  DYLIB r     | KEY   r     | ORF   r/w   | RTF   r     |
 
   Meta Information
   ----------------------+----------------------+---------------------