exiftool_vendored 12.22.0 → 12.25.0

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

@@ -59,6 +59,7 @@ my %psMap = (
     Photoshop    => 'PostScript',
     IPTC         => 'Photoshop',
     EXIFInfo     => 'Photoshop',
+    EXIF         => 'EXIFInfo',
     IFD0         => 'EXIFInfo',
     IFD1         => 'IFD0',
     ICC_Profile  => 'PostScript',

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

@@ -1232,10 +1232,14 @@ sub WriteQuickTime($$$)
                     } elsif ($format) {
                         $val = ReadValue(\$buff, 0, $format, undef, $size);
                     } elsif (($tag =~ /^\xa9/ or $$tagInfo{IText}) and $size >= ($$tagInfo{IText} || 4)) {
-                        if ($$tagInfo{IText} and $$tagInfo{IText} == 6) {
-                            $lang = unpack('x4n', $buff);
-                            $len = $size - 6;
-                            $val = substr($buff, 6, $len);
+                        my $hdr;
+                        if ($$tagInfo{IText} and $$tagInfo{IText} >= 6) {
+                            my $iText = $$tagInfo{IText};
+                            my $pos = $iText - 2;
+                            $lang = unpack("x${pos}n", $buff);
+                            $hdr = substr($buff,4,$iText-6);
+                            $len = $size - $iText;
+                            $val = substr($buff, $iText, $len);
                         } else {
                             ($len, $lang) = unpack('nn', $buff);
                             $len -= 4 if 4 + $len > $size; # (see QuickTime.pm for explanation)
@@ -1243,14 +1247,18 @@ sub WriteQuickTime($$$)
                             $val = substr($buff, 4, $len);
                         }
                         $lang or $lang = $undLang;  # treat both 0 and 'und' as 'und'
+                        my $enc;
                         if ($lang < 0x400 and $val !~ /^\xfe\xff/) {
                             $charsetQuickTime = $et->Options('CharsetQuickTime');
-                            $val = $et->Decode($val, $charsetQuickTime);
+                            $enc = $charsetQuickTime;
                         } else {
-                            my $enc = $val=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                            $enc = $val=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                        }
+                        unless ($$tagInfo{NoDecode}) {
                             $val = $et->Decode($val, $enc);
+                            $val =~ s/\0+$//;   # remove trailing nulls if they exist
                         }
-                        $val =~ s/\0+$//;   # remove trailing nulls if they exist
+                        $val = $hdr . $val if defined $hdr;
                         my $langCode = UnpackLang($lang, 1);
                         $langInfo = GetLangInfo($tagInfo, $langCode);
                         $nvHash = $et->GetNewValueHash($langInfo);
@@ -1267,6 +1275,9 @@ sub WriteQuickTime($$$)
                         }
                     } else {
                         $val = $buff;
+                        if ($tag =~ /^\xa9/ or $$tagInfo{IText}) {
+                            $et->Warn("Corrupted $$tagInfo{Name} value");
+                        }
                     }
                     if ($nvHash and defined $val) {
                         if ($et->IsOverwriting($nvHash, $val)) {
@@ -1279,12 +1290,23 @@ sub WriteQuickTime($$$)
                             $et->VerboseValue("+ $grp:$$langInfo{Name}", $newData);
                             # add back necessary header and encode as necessary
                             if (defined $lang) {
-                                $newData = $et->Encode($newData, $lang < 0x400 ? $charsetQuickTime : 'UTF8');
+                                my $iText = $$tagInfo{IText} || 0;
+                                my $hdr;
+                                if ($iText > 6) {
+                                    $newData .= ' 'x($iText-6) if length($newData) < $iText-6;
+                                    $hdr = substr($newData, 0, $iText-6);
+                                    $newData = substr($newData, $iText-6);
+                                }
+                                unless ($$tagInfo{NoDecode}) {
+                                    $newData = $et->Encode($newData, $lang < 0x400 ? $charsetQuickTime : 'UTF8');
+                                }
                                 my $wLang = $lang eq $undLang ? 0 : $lang;
-                                if ($$tagInfo{IText} and $$tagInfo{IText} == 6) {
+                                if ($iText < 6) {
+                                    $newData = pack('nn', length($newData), $wLang) . $newData;
+                                } elsif ($iText == 6) {
                                     $newData = pack('Nn', 0, $wLang) . $newData . "\0";
                                 } else {
-                                    $newData = pack('nn', length($newData), $wLang) . $newData;
+                                    $newData = "\0\0\0\0" . $hdr . pack('n', $wLang) . $newData . "\0";
                                 }
                             } elsif (not $format or $format =~ /^string/ and
                                      not $$tagInfo{Binary} and not $$tagInfo{ValueConv})
@@ -1443,9 +1465,12 @@ sub WriteQuickTime($$$)
                         my $grp = $et->GetGroup($tagInfo,1);
                         $et->Warn("Can't use country code for $grp:$$tagInfo{Name}");
                         next;
-                    } elsif ($$tagInfo{IText} and $$tagInfo{IText} == 6) {
+                    } elsif ($$tagInfo{IText} and $$tagInfo{IText} >= 6) {
                         # add 6-byte langText header and trailing null
-                        $newVal = pack('Nn',0,$lang) . $newVal . "\0";
+                        # (with extra junk before language code if IText > 6)
+                        my $n = $$tagInfo{IText} - 6;
+                        $newVal .= ' ' x $n if length($newVal) < $n;
+                        $newVal = "\0\0\0\0" . substr($newVal,0,$n) . pack('n',0,$lang) . substr($newVal,$n) . "\0";
                     } else {
                         # add IText header
                         $newVal = pack('nn',length($newVal),$lang) . $newVal;

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

@@ -506,7 +506,7 @@ sub ConformPathToNamespace($$)
     my $prop;
     foreach $prop (@propList) {
         my ($ns, $tag) = $prop =~ /(.+?):(.*)/;
-        next if $$nsUsed{$ns};
+        next if not defined $ns or $$nsUsed{$ns};
         my $uri = $nsURI{$ns};
         unless ($uri) {
             warn "No URI for namespace prefix $ns!\n";
@@ -1417,7 +1417,11 @@ sub WriteXMP($$;$)
             my $uri = $nsUsed{$1};
             unless ($uri) {
                 $uri = $nsURI{$1};      # we must have added a namespace
-                $uri or $xmpErr = "Undefined XMP namespace: $1", next;
+                unless ($uri) {
+                    # (namespace may be empty if trying to write empty XMP structure, forum12384)
+                    $xmpErr = "Undefined XMP namespace: $1" if length $uri;
+                    next;
+                }
             }
             $nsNew{$1} = $uri;
             # need a new description if any new namespaces

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

@@ -105,6 +105,7 @@ my %writableType = (
     ICC => [ 'ICC_Profile', 'WriteICC' ],
     IND =>   'InDesign',
     JP2 =>   'Jpeg2000',
+    JXL =>   'Jpeg2000',
     MIE =>   undef,
     MOV => [ 'QuickTime',   'WriteMOV' ],
     MRW =>   'MinoltaRaw',

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.39';
+$VERSION = '3.41';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -71,6 +71,13 @@ sub ConvertRational($);
 sub ConvertRationalList($);
 sub WriteGSpherical($$$);
 
+# standard path locations for XMP in major file types
+my %stdPath = (
+    JPEG => 'JPEG-APP1-XMP',
+    TIFF => 'TIFF-IFD0-XMP',
+    PSD => 'PSD-XMP',
+);
+
 # lookup for translating to ExifTool namespaces (and family 1 group names)
 %stdXlatNS = (
     # shorten ugly namespace prefixes
@@ -3844,6 +3851,7 @@ sub ProcessXMP($$;$)
     my ($buff, $fmt, $hasXMP, $isXML, $isRDF, $isSVG);
     my $rtnVal = 0;
     my $bom = 0;
+    my $path = $et->MetadataPath();
 
     # namespaces and prefixes currently in effect while parsing the file,
     # and lookup to translate brain-dead-Microsoft-Photo-software prefixes
@@ -3861,11 +3869,7 @@ sub ProcessXMP($$;$)
         (($$dirInfo{DirName} || '') eq 'XMP' or $$et{FILE_TYPE} eq 'XMP'))
     {
         $$et{XmpValidate} = { } if $$et{OPTIONS}{Validate};
-        my $path = $et->MetadataPath();
-        my $nonStd;
-        if ($$et{FILE_TYPE} =~ /^(JPEG|TIFF|PSD)$/ and $path !~ /^(JPEG-APP1-XMP|TIFF-IFD0-XMP|PSD-XMP)$/) {
-            $nonStd = 1;
-        }
+        my $nonStd = ($stdPath{$$et{FILE_TYPE}} and $path ne $stdPath{$$et{FILE_TYPE}});
         if ($nonStd and $Image::ExifTool::MWG::strict) {
             $et->Warn("Ignored non-standard XMP at $path");
             return 1;
@@ -4063,12 +4067,14 @@ sub ProcessXMP($$;$)
 
     # extract XMP/XML as a block if specified
     my $blockName = $$dirInfo{BlockInfo} ? $$dirInfo{BlockInfo}{Name} : 'XMP';
+    my $blockExtract = $et->Options('BlockExtract');
     if (($$et{REQ_TAG_LOOKUP}{lc $blockName} or ($$et{TAGS_FROM_FILE} and
-        not $$et{EXCL_TAG_LOOKUP}{lc $blockName})) and
+        not $$et{EXCL_TAG_LOOKUP}{lc $blockName}) or $blockExtract) and
         (($$et{FileType} eq 'XMP' and $blockName eq 'XMP') or
         ($$dirInfo{DirName} and $$dirInfo{DirName} eq $blockName)))
     {
         $et->FoundTag($$dirInfo{BlockInfo} || 'XMP', substr($$dataPt, $dirStart, $dirLen));
+        return 1 if $blockExtract and $blockExtract > 1;
     }
 
     $tagTablePtr or $tagTablePtr = GetTagTable('Image::ExifTool::XMP::Main');
@@ -4123,6 +4129,13 @@ sub ProcessXMP($$;$)
         }
         defined $fmt or $et->Warn('XMP character encoding error');
     }
+    # warn if standard XMP is missing xpacket wrapper
+    if ($$et{XMP_NO_XPACKET} and $$et{OPTIONS}{Validate} and
+        $stdPath{$$et{FILE_TYPE}} and $path eq $stdPath{$$et{FILE_TYPE}} and
+        not $$dirInfo{IsExtended} and not $$et{DOC_NUM})
+    {
+        $et->Warn('XMP is missing xpacket wrapper', 1);
+    }
     if ($fmt) {
         # trim if necessary to avoid converting non-UTF data
         if ($dirStart or $dirEnd != length($$dataPt)) {

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.22
+Version: 12.25
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl
@@ -22,47 +22,47 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DPX   r     | ITC   r     | ODP   r     | RIFF  r
-  3FR   r     | DR4   r/w/c | J2C   r     | ODS   r     | RSRC  r
-  3G2   r/w   | DSS   r     | JNG   r/w   | ODT   r     | RTF   r
-  3GP   r/w   | DV    r     | JP2   r/w   | OFR   r     | RW2   r/w
-  A     r     | DVB   r/w   | JPEG  r/w   | OGG   r     | RWL   r/w
-  AA    r     | DVR-MS r    | JSON  r     | OGV   r     | RWZ   r
-  AAE   r     | DYLIB r     | K25   r     | ONP   r     | RM    r
-  AAX   r/w   | EIP   r     | KDC   r     | OPUS  r     | SEQ   r
-  ACR   r     | EPS   r/w   | KEY   r     | ORF   r/w   | SKETCH r
-  AFM   r     | EPUB  r     | LA    r     | OTF   r     | SO    r
-  AI    r/w   | ERF   r/w   | LFP   r     | PAC   r     | SR2   r/w
-  AIFF  r     | EXE   r     | LNK   r     | PAGES r     | SRF   r
-  APE   r     | EXIF  r/w/c | LRV   r/w   | PBM   r/w   | SRW   r/w
-  ARQ   r/w   | EXR   r     | M2TS  r     | PCD   r     | SVG   r
-  ARW   r/w   | EXV   r/w/c | M4A/V r/w   | PCX   r     | SWF   r
-  ASF   r     | F4A/V r/w   | MACOS r     | PDB   r     | THM   r/w
-  AVI   r     | FFF   r/w   | MAX   r     | PDF   r/w   | TIFF  r/w
-  AVIF  r/w   | FITS  r     | MEF   r/w   | PEF   r/w   | TORRENT r
-  AZW   r     | FLA   r     | MIE   r/w/c | PFA   r     | TTC   r
-  BMP   r     | FLAC  r     | MIFF  r     | PFB   r     | TTF   r
-  BPG   r     | FLIF  r/w   | MKA   r     | PFM   r     | TXT   r
-  BTF   r     | FLV   r     | MKS   r     | PGF   r     | VCF   r
-  CHM   r     | FPF   r     | MKV   r     | PGM   r/w   | VRD   r/w/c
-  COS   r     | FPX   r     | MNG   r/w   | PLIST r     | VSD   r
-  CR2   r/w   | GIF   r/w   | MOBI  r     | PICT  r     | WAV   r
-  CR3   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WDP   r/w
-  CRM   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WEBP  r
-  CRW   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WEBM  r
-  CS1   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WMA   r
-  CSV   r     | HEIC  r/w   | MP3   r     | PPTX  r     | WMV   r
-  CZI   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WTV   r
-  DCM   r     | HTML  r     | MPC   r     | PSB   r/w   | WV    r
-  DCP   r/w   | ICC   r/w/c | MPG   r     | PSD   r/w   | X3F   r/w
-  DCR   r     | ICS   r     | MPO   r/w   | PSP   r     | XCF   r
-  DFONT r     | IDML  r     | MQV   r/w   | QTIF  r/w   | XLS   r
-  DIVX  r     | IIQ   r/w   | MRW   r/w   | R3D   r     | XLSX  r
-  DJVU  r     | IND   r/w   | MXF   r     | RA    r     | XMP   r/w/c
-  DLL   r     | INSP  r/w   | NEF   r/w   | RAF   r/w   | ZIP   r
-  DNG   r/w   | INSV  r     | NRW   r/w   | RAM   r     |
-  DOC   r     | INX   r     | NUMBERS r   | RAR   r     |
-  DOCX  r     | ISO   r     | O     r     | RAW   r/w   |
+  360   r/w   | DPX   r     | ITC   r     | NUMBERS r   | RAM   r
+  3FR   r     | DR4   r/w/c | J2C   r     | O     r     | RAR   r
+  3G2   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RAW   r/w
+  3GP   r/w   | DV    r     | JP2   r/w   | ODS   r     | RIFF  r
+  A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RSRC  r
+  AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RTF   r
+  AAE   r     | DYLIB r     | JXL   r     | OGG   r     | RW2   r/w
+  AAX   r/w   | EIP   r     | K25   r     | OGV   r     | RWL   r/w
+  ACR   r     | EPS   r/w   | KDC   r     | ONP   r     | RWZ   r
+  AFM   r     | EPUB  r     | KEY   r     | OPUS  r     | RM    r
+  AI    r/w   | ERF   r/w   | LA    r     | ORF   r/w   | SEQ   r
+  AIFF  r     | EXE   r     | LFP   r     | ORI   r/w   | SKETCH r
+  APE   r     | EXIF  r/w/c | LNK   r     | OTF   r     | SO    r
+  ARQ   r/w   | EXR   r     | LRV   r/w   | PAC   r     | SR2   r/w
+  ARW   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRF   r
+  ASF   r     | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SRW   r/w
+  AVI   r     | FFF   r/w   | MACOS r     | PCD   r     | SVG   r
+  AVIF  r/w   | FITS  r     | MAX   r     | PCX   r     | SWF   r
+  AZW   r     | FLA   r     | MEF   r/w   | PDB   r     | THM   r/w
+  BMP   r     | FLAC  r     | MIE   r/w/c | PDF   r/w   | TIFF  r/w
+  BPG   r     | FLIF  r/w   | MIFF  r     | PEF   r/w   | TORRENT r
+  BTF   r     | FLV   r     | MKA   r     | PFA   r     | TTC   r
+  CHM   r     | FPF   r     | MKS   r     | PFB   r     | TTF   r
+  COS   r     | FPX   r     | MKV   r     | PFM   r     | TXT   r
+  CR2   r/w   | GIF   r/w   | MNG   r/w   | PGF   r     | VCF   r
+  CR3   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VRD   r/w/c
+  CRM   r/w   | GZ    r     | MODD  r     | PLIST r     | VSD   r
+  CRW   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WAV   r
+  CS1   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WDP   r/w
+  CSV   r     | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r
+  CZI   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WEBM  r
+  DCM   r     | HTML  r     | MP4   r/w   | PPT   r     | WMA   r
+  DCP   r/w   | ICC   r/w/c | MPC   r     | PPTX  r     | WMV   r
+  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
+  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
+  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
+  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
+  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
+  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
+  DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
+  DOCX  r     | ISO   r     | NRW   r/w   | RAF   r/w   | ZIP   r
 
   Meta Information
   ----------------------+----------------------+---------------------

data/lib/exiftool_vendored/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.22.0
+  version: 12.25.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool
@@ -236,6 +236,7 @@ files:
 - bin/config_files/age.config
 - bin/config_files/bibble.config
 - bin/config_files/convert_regions.config
+- bin/config_files/cuepointlist.config
 - bin/config_files/depthmap.config
 - bin/config_files/example.config
 - bin/config_files/fotoware.config
@@ -382,6 +383,7 @@ files:
 - bin/lib/Image/ExifTool/MPC.pm
 - bin/lib/Image/ExifTool/MPEG.pm
 - bin/lib/Image/ExifTool/MPF.pm
+- bin/lib/Image/ExifTool/MRC.pm
 - bin/lib/Image/ExifTool/MWG.pm
 - bin/lib/Image/ExifTool/MXF.pm
 - bin/lib/Image/ExifTool/MacOS.pm
@@ -479,11 +481,7 @@ homepage: https://github.com/exiftool-rb/exiftool_vendored.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n    ***********************\n    * Ruby Support Notice *\n
-  \   ***********************\n\n    Starting March 31, 2021 releases of `exiftool_vendored`
-  Gem will no longer support following\n    Ruby Versions due to their End Of Life
-  (https://www.ruby-lang.org/en/downloads/branches/)\n    - Ruby 2.4 (EOL 2020-03-31)\n
-  \   - Ruby 2.5 (EOL 2021-03-31)\n  "
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -491,7 +489,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="