exiftool_vendored 12.64.1 → 12.67.0

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.56';
+$VERSION = '1.57';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -112,10 +112,13 @@ my %supportedFilter = (
     Keywords    => {
         List => 'string',  # this is a string list
         Notes => q{
-            stored as a string but treated as a comma-separated list of items when
-            reading if the string contains a comma, otherwise a space-separated list of
-            items.  Written as a comma-separated list.  The list behaviour may be
-            defeated by setting the API NoPDFList option
+            stored as a string but treated as a comma- or semicolon-separated list of
+            items when reading if the string contains commas or semicolons, whichever is
+            more numerous, otherwise it is treated a space-separated list of items.
+            Written as a comma-separated list.  The list behaviour may be defeated by
+            setting the API NoPDFList option.  Note that the corresponding
+            XMP-pdf:Keywords tag is not treated as a list, so the NoPDFList option
+            should be used when copying between these two.
         },
     },
     Creator     => { },
@@ -1762,6 +1765,7 @@ sub ExpandArray($)
 #         4) nesting depth, 5) dictionary capture type
 sub ProcessDict($$$$;$$)
 {
+    local $_;
     my ($et, $tagTablePtr, $dict, $xref, $nesting, $type) = @_;
     my $verbose = $et->Options('Verbose');
     my $unknown = $$tagTablePtr{EXTRACT_UNKNOWN};
@@ -2025,10 +2029,16 @@ sub ProcessDict($$$$;$$)
                 }
                 if ($$tagInfo{List} and not $$et{OPTIONS}{NoPDFList}) {
                     # separate tokens in comma or whitespace delimited lists
-                    my @values = ($val =~ /,/) ? split /,+\s*/, $val : split ' ', $val;
-                    foreach $val (@values) {
-                        $et->FoundTag($tagInfo, $val);
+                    my $comma = $val =~ tr/,/,/;
+                    my $semi = $val =~ tr/;/;/;
+                    my $split;
+                    if ($comma or $semi) {
+                        $split = $comma > $semi ? ',+\\s*' : ';+\\s*';
+                    } else {
+                        $split = ' ';
                     }
+                    my @values = split $split, $val;
+                    $et->FoundTag($tagInfo, $_) foreach @values;
                 } else {
                     # a simple tag value
                     $et->FoundTag($tagInfo, $val);

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.00';
+$VERSION = '1.02';
 
 sub ValidateMediaSummary($);
 
@@ -2311,12 +2311,13 @@ my %mediaMatrix = (
     GROUPS => { 0 => 'XMP', 1 => 'XMP-plus', 2 => 'Author' },
     NAMESPACE => 'plus',
     NOTES => q{
-        PLUS (Picture Licensing Universal System) License Data Format 1.2.1 XMP
+        PLUS (Picture Licensing Universal System) License Data Format 2.0.1 XMP
         tags.  Note that all controlled-vocabulary tags in this table (ie. tags with
         a fixed set of values) have raw values which begin with
         "http://ns.useplus.org/ldf/vocab/", but to reduce clutter this prefix has
-        been removed from the values shown below.  See L<http://ns.useplus.org/> for
-        the complete specification.
+        been removed from the values shown below, and from the values read and
+        written with the -n option.  See L<http://ns.useplus.org/> for the complete
+        specification.
     },
     Version  => { Name => 'PLUSVersion' },
     Licensee => {
@@ -2529,6 +2530,20 @@ my %mediaMatrix = (
     Custom8     => { List => 'Bag', Writable => 'lang-alt' },
     Custom9     => { List => 'Bag', Writable => 'lang-alt' },
     Custom10    => { List => 'Bag', Writable => 'lang-alt' },
+    DataMining => {
+        %plusVocab,
+        PrintConv => {
+            'DMI-UNSPECIFIED' => 'Unspecified - no prohibition defined',
+            'DMI-ALLOWED'     => 'Allowed',
+            'DMI-PROHIBITED-AIMLTRAINING' => 'Prohibited for AI/ML training',
+            'DMI-PROHIBITED-GENAIMLTRAINING' => 'Prohibited for Generative AI/ML training',
+            'DMI-PROHIBITED-EXCEPTSEARCHENGINEINDEXING' => 'Prohibited except for search engine indexing',
+            'DMI-PROHIBITED' => 'Prohibited',
+            'DMI-PROHIBITED-SEECONSTRAINT' => 'Prohibited, see plus:OtherConstraints',
+            'DMI-PROHIBITED-SEEEMBEDDEDRIGHTSEXPR' => 'Prohibited, see iptcExt:EmbdEncRightsExpr',
+            'DMI-PROHIBITED-SEELINKEDRIGHTSEXPR' => 'Prohibited, see iptcExt:LinkedEncRightsExpr',
+        },
+    },
 );
 
 #------------------------------------------------------------------------------

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.42';
+$VERSION = '3.43';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -175,6 +175,7 @@ sub DecodeAFPoints($$$$;$);
     '4 2' => 'smc PENTAX-FA 80-320mm F4.5-5.6',
     '4 3' => 'smc PENTAX-FA 43mm F1.9 Limited',
     '4 6' => 'smc PENTAX-FA 35-80mm F4-5.6',
+    '4 7' => 'Irix 45mm F1.4', #27
     '4 8' => 'Irix 150mm F2.8 Macro', #exiv2 issue 1084
     '4 9' => 'Irix 11mm F4 Firefly', #27
     '4 10' => 'Irix 15mm F2.4', #27
@@ -265,6 +266,7 @@ sub DecodeAFPoints($$$$;$);
     '6 14' => 'smc PENTAX-FA* Macro 200mm F4 ED[IF]',
     '7 0' => 'smc PENTAX-DA 21mm F3.2 AL Limited', #13
     '7 58' => 'smc PENTAX-D FA Macro 100mm F2.8 WR', #PH - this bit of information cost me $600 ;)
+  # '7 58' also 'HD PENTAX-D FA MACRO 100mm F2.8 ED AW' (ref 27)
     '7 75' => 'Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)', #(Anton Bondar)
     '7 201' => 'smc Pentax-DA L 50-200mm F4-5.6 ED WR', #(Bruce Rusk)
     '7 202' => 'smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR', #29

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

@@ -37,6 +37,7 @@
 #   25) https://cconcolato.github.io/mp4ra/atoms.html
 #   26) https://github.com/SamsungVR/android_upload_sdk/blob/master/SDKLib/src/main/java/com/samsung/msca/samsungvr/sdk/UserVideo.java
 #   27) https://exiftool.org/forum/index.php?topic=11517.0
+#   28) https://docs.mp3tag.de/mapping/
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::QuickTime;
@@ -47,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.86';
+$VERSION = '2.87';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -3396,8 +3397,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
     albm => { Name => 'Album', Avoid => 1 }, #(ffmpeg source)
     apID => 'AppleStoreAccount',
-    atID => { #10 (or TV series)
-        Name => 'AlbumTitleID',
+    atID => {
+        # (ref 10 called this AlbumTitleID or TVSeries)
+        Name => 'ArtistID', #28 (or Track ID ref https://gist.github.com/maf654321/2b44c7b15d798f0c52ee)
         Format => 'int32u',
         Writable => 'int32s', #27
     },
@@ -3408,6 +3410,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Format => 'int32u',
         Writable => 'int32s', #27
     },
+    cmID => 'ComposerID', #28 (need sample to get format)
     cprt => { Name => 'Copyright', Groups => { 2 => 'Author' } },
     dscp => { Name => 'Description', Avoid => 1 },
     desc => { Name => 'Description', Avoid => 1 }, #7
@@ -6100,10 +6103,10 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         PrintConv => { 0 => 'No', 1 => 'Yes' },
     },
     perf => 'Performer',
-    plID => { #10 (or TV season)
-        Name => 'PlayListID',
-        Format => 'int8u',  # actually int64u, but split it up
-        Count => 8,
+    plID => {
+        # (ref 10 called this PlayListID or TVSeason)
+        Name => 'AlbumID', #28
+        Format => 'int64u',
         Writable => 'int32s', #27
     },
     purd => 'PurchaseDate', #7
@@ -6565,6 +6568,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     'rating.user'  => 'UserRating', # (Canon ELPH 510 HS)
     'collection.user' => 'UserCollection', #22
     'Encoded_With' => 'EncodedWith',
+    'content.identifier' => 'ContentIdentifier', #forum14874
 #
 # the following tags aren't in the com.apple.quicktime namespace:
 #
@@ -9519,13 +9523,17 @@ sub ProcessMOV($$;$)
                 my $items = $$et{ItemInfo};
                 my ($id, $prop, $docNum, $lowest);
                 my $primary = $$et{PrimaryItem} || 0;
-ItemID:         foreach $id (keys %$items) {
+ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
                     next unless $$items{$id}{Association};
                     my $item = $$items{$id};
                     foreach $prop (@{$$item{Association}}) {
                         next unless $prop == $index;
                         if ($id == $primary or (not $dontInherit{$tag} and
-                            (not $$item{RefersTo} or $$item{RefersTo}{$primary})))
+                            (($$item{RefersTo} and $$item{RefersTo}{$primary}) or
+                            # hack: assume Item 1 is from the main image (eg. hvc1 data)
+                            # to hack the case where the primary item (ie. main image)
+                            # doesn't directly reference this property
+                            (not $$item{RefersTo} and $id == 1))))
                         {
                             # this is associated with the primary item or an item describing
                             # the primary item, so consider this part of the main document
@@ -9536,7 +9544,7 @@ ItemID:         foreach $id (keys %$items) {
                             # this property is already associated with an item that has
                             # an ExifTool document number, so use the lowest associated DocNum
                             $docNum = $$item{DocNum} if not defined $docNum or $docNum > $$item{DocNum};
-                        } elsif (not defined $lowest or $lowest > $id) {
+                        } else {
                             # keep track of the lowest associated item ID
                             $lowest = $id;
                         }