exiftool_vendored 13.36.0 → 13.38.0

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

@@ -19,7 +19,7 @@ $VERSION = '1.05';
 
 # Text tags
 %Image::ExifTool::Text::Main = (
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Document' },
     NOTES => q{
         Although basic text files contain no metadata, the following tags are

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

@@ -16,7 +16,7 @@ $VERSION = '1.01';
 
 %Image::ExifTool::Trailer::Vivo = (
     GROUPS => { 0 => 'Trailer', 1 => 'Vivo', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'Information written in JPEG trailer by some Vivo phones.',
     # (don't know for sure what type of image this is, but it is in JPEG format)
     HDRImage => {

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

@@ -23,7 +23,7 @@ sub PrintRecord($$$);
 # WPG metadata
 %Image::ExifTool::WPG::Main = (
     GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'Tags extracted from WordPerfect Graphics (WPG) images.',
     WPGVersion => { },
     ImageWidthInches  => { PrintConv => 'sprintf("%.2f",$val)' },

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

@@ -52,7 +52,7 @@ my %bool = ( PrintConv => { 0 => 'No', 1 => 'Yes' }, PrintConvColumns => 2 );
     GROUPS => { 0 => 'WTV', 1 => 'WTV', 2 => 'Video' },
     PROCESS_PROC => \&ProcessMetadata,
     NOTES => 'ExifTool will extract any tag found, even if not in this table.',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     'Duration'  => {
         Name => 'Duration',
         ValueConv => '$val/1e7',

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

@@ -0,0 +1,144 @@
+#------------------------------------------------------------------------------
+# File:         WavPack.pm
+#
+# Description:  Read metadata from WavPack audio files
+#
+# Revisions:    2025-09-24 - P. Harvey Created
+#
+# References:   1) https://www.wavpack.com/WavPack5FileFormat.pdf
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::WavPack;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::RIFF;
+use Image::ExifTool::APE;
+
+$VERSION = '1.00';
+
+%Image::ExifTool::WavPack::Main = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Audio' },
+    FORMAT => 'int32u',
+    NOTES => q{
+        Tags extracted from the header of WavPack (WV and WVP) audio files.  These
+        files may also contain RIFF, ID3 and/or APE metadata which is also extracted
+        by ExifTool.  See L<https://www.wavpack.com/WavPack5FileFormat.pdf> for the
+        WavPack specification.
+    },
+    6.1 => {
+        Name => 'BytesPerSample',
+        Mask => 0x03,
+        ValueConv => '$val + 1',
+    },
+    6.2 => {
+        Name => 'AudioType',
+        Mask => 0x04,
+        PrintConv => { 0 => 'Stereo', 1 => 'Mono' },
+    },
+    6.3 => {
+        Name => 'Compression',
+        Mask => 0x08,
+        PrintConv => { 0 => 'Lossless', 1 => 'Hybrid' },
+    },
+    6.4 => {
+        Name => 'DataFormat',
+        Mask => 0x80,
+        PrintConv => { 0 => 'Integer', 1 => 'Floating Point' },
+    },
+    6.5 => {
+        Name => 'SampleRate',
+        Mask => 0x07800000,
+        Priority => 0, # ("Custom" is not very useful)
+        PrintConv => { # (NC)
+            0 => 6000,
+            1 => 8000,
+            2 => 9600,
+            3 => 11025,
+            4 => 12000,
+            5 => 16000,
+            6 => 22050,
+            7 => 24000,
+            8 => 32000,
+            9 => 44100,
+            10 => 48000,
+            11 => 64000,
+            12 => 88200,
+            13 => 96000,
+            14 => 192000,
+            15 => 'Custom',
+        },
+    },
+);
+
+#------------------------------------------------------------------------------
+# Extract metadata from a WavPack file
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid WavPack file
+sub ProcessWV($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+
+    # verify this is a valid WavPack file
+    return 0 unless $raf->Read($buff, 32) == 32;
+    return 0 unless $buff =~ /^wvpk.{4}[\x02\x10]\x04/s;
+    $et->SetFileType();
+    my %dirInfo = (
+        DataPt => \$buff,
+        DirStart => 0,
+        DirLen => length($buff),
+    );
+    $et->ProcessBinaryData(\%dirInfo, GetTagTable('Image::ExifTool::WavPack::Main'));
+    # historically, the RIFF module has handled RIFF-type WavPack files
+    $raf->Seek(0,0);
+    push @{$$et{PATH}}, 'RIFF'; # update metadata path
+    Image::ExifTool::RIFF::ProcessRIFF($et, $dirInfo);
+    # also look for ID3 and APE trailers (ProcessAPE also checks for ID3)
+    $$et{PATH}[-1] = 'APE';
+    Image::ExifTool::APE::ProcessAPE($et, $dirInfo);
+    pop @{$$et{PATH}};
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::WavPack - Read metadata from WavPack audio files
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read metadata
+from WavPack audio files.
+
+=head1 AUTHOR
+
+Copyright 2003-2025, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://www.wavpack.com/WavPack5FileFormat.pdf>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/WavPack Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.74';
+$VERSION = '3.75';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -862,35 +862,43 @@ my %sRangeMask = (
     },
     GAudio => {
         Name => 'GAudio',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GAudio' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GAudio' },
     },
     GImage => {
         Name => 'GImage',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GImage' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GImage' },
     },
     GPano => {
         Name => 'GPano',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GPano' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GPano' },
+    },
+    GContainer => {
+        Name => 'GContainer',
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GContainer' },
     },
     GSpherical => {
         Name => 'GSpherical',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GSpherical' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GSpherical' },
     },
     GDepth => {
         Name => 'GDepth',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GDepth' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GDepth' },
     },
     GFocus => {
         Name => 'GFocus',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GFocus' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GFocus' },
     },
     GCamera => {
         Name => 'GCamera',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GCamera' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GCamera' },
     },
     GCreations => {
         Name => 'GCreations',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GCreations' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::GCreations' },
+    },
+    Device => {
+        Name => 'Device',
+        SubDirectory => { TagTable => 'Image::ExifTool::Google::Device' },
     },
     dwc => {
         Name => 'dwc',
@@ -908,10 +916,6 @@ my %sRangeMask = (
         Name => 'LImage',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::LImage' },
     },
-    Device => {
-        Name => 'Device',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::Device' },
-    },
     sdc => {
         Name => 'sdc',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::sdc' },
@@ -948,10 +952,6 @@ my %sRangeMask = (
         Name => 'seal',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::seal' },
     },
-    GContainer => {
-        Name => 'GContainer',
-        SubDirectory => { TagTable => 'Image::ExifTool::XMP::GContainer' },
-    },
 );
 
 # hack to allow XML containing Dublin Core metadata to be handled like XMP (eg. EPUB - see ZIP.pm)
@@ -3665,6 +3665,10 @@ NoLoop:
         # protect against large binary data in unknown tags
         $$tagInfo{Binary} = 1 if $new and length($val) > 65536;
     }
+    if ($$et{OPTIONS}{Verbose}) {
+        my $tagID = join('/',@$props);
+        $et->VerboseInfo($tagID, $tagInfo, Value => $rawVal || $val);
+    }
     # store the value for this tag
     my $key = $et->FoundTag($tagInfo, $val) or return 0;
     # save original components of rational numbers (used when copying)
@@ -3683,21 +3687,17 @@ NoLoop:
         # set group1 dynamically according to the namespace
         $et->SetGroup($key, "$$tagTablePtr{GROUPS}{0}-$ns");
     }
-    if ($$et{OPTIONS}{Verbose}) {
-        if ($added) {
-            my $props;
-            if (@$added > 1) {
-                $$tagInfo{Flat} = 0;    # this is a flattened tag
-                my @props = map { $$_[0] } @$added;
-                $props = ' (' . join('/',@props) . ')';
-            } else {
-                $props = '';
-            }
-            my $g1 = $et->GetGroup($key, 1);
-            $et->VPrint(0, $$et{INDENT}, "[adding $g1:$tag]$props\n");
+    if ($added and $$et{OPTIONS}{Verbose}) {
+        my $props;
+        if (@$added > 1) {
+            $$tagInfo{Flat} = 0;    # this is a flattened tag
+            my @props = map { $$_[0] } @$added;
+            $props = ' (' . join('/',@props) . ')';
+        } else {
+            $props = '';
         }
-        my $tagID = join('/',@$props);
-        $et->VerboseInfo($tagID, $tagInfo, Value => $rawVal || $val);
+        my $g1 = $et->GetGroup($key, 1);
+        $et->VPrint(0, $$et{INDENT}, "[adding $g1:$tag]$props\n");
     }
     # allow read-only subdirectories (eg. embedded base64 XMP/IPTC in NKSC files)
     if ($$tagInfo{SubDirectory} and not $$et{IsWriting}) {
@@ -3710,6 +3710,7 @@ NoLoop:
             DirName  => $$subdir{DirName} || $$tagInfo{Name},
             DataPt   => $dataPt,
             DirLen   => length $$dataPt,
+            TagInfo  => $tagInfo,
             IgnoreProp => $$subdir{IgnoreProp}, # (allow XML to ignore specified properties)
             IsExtended => 1, # (hack to avoid Duplicate warning for embedded XMP)
             NoStruct => 1,   # (don't try to build structures since this isn't true XMP)
@@ -4435,7 +4436,7 @@ sub ProcessXMP($$;$)
             $buf2 = pack('C*', unpack("$fmt*",$buff));
         }
         if (Image::ExifTool::GetWarning()) {
-            $et->Warn('Superfluous BOM at start of XMP');
+            $et->Warn('Superfluous BOM at start of XMP') unless $$dirInfo{RAF};
             $dataPt = \$buff;   # use XMP with the BOM removed
         } else {
             $et->Warn('XMP is double UTF-encoded');
@@ -4486,13 +4487,16 @@ sub ProcessXMP($$;$)
         $begin = join "\0", split //, $begin;
         # must reset pos because it was killed by previous unsuccessful //g match
         pos($$dataPt) = $dirStart;
+        my $badEnc;
         if ($$dataPt =~ /\G(\0)?\Q$begin\E\0./sg) {
             # validate byte ordering by checking for U+FEFF character
             if ($1) {
                 # should be big-endian since we had a leading \0
-                $fmt = 'n' if $$dataPt =~ /\G\xfe\xff/g;
+                $fmt = 'n';
+                $badEnc = 1 unless $$dataPt =~ /\G\xfe\xff/g;
             } else {
-                $fmt = 'v' if $$dataPt =~ /\G\0\xff\xfe/g;
+                $fmt = 'v';
+                $badEnc = 1 unless $$dataPt =~ /\G\0\xff\xfe/g;
             }
         } else {
             # check for UTF-32 encoding (with three \0's between characters)
@@ -4502,12 +4506,14 @@ sub ProcessXMP($$;$)
                 $fmt = 0;   # set format to zero as indication we didn't find encoded XMP
             } elsif ($1) {
                 # should be big-endian
-                $fmt = 'N' if $$dataPt =~ /\G\0\0\xfe\xff/g;
+                $fmt = 'N';
+                $badEnc = 1 unless $$dataPt =~ /\G\0\0\xfe\xff/g;
             } else {
-                $fmt = 'V' if $$dataPt =~ /\G\0\0\0\xff\xfe\0\0/g;
+                $fmt = 'V';
+                $badEnc = 1 unless $$dataPt =~ /\G\0\0\0\xff\xfe\0\0/g;
             }
         }
-        defined $fmt or $et->Warn('XMP character encoding error');
+        $badEnc and $et->Warn('Invalid XMP encoding marker');
     }
     # warn if standard XMP is missing xpacket wrapper
     if ($$et{XMP_NO_XPACKET} and $$et{OPTIONS}{Validate} and