exiftool_vendored 9.69.0 → 9.71.0

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/Writer.pl

@@ -233,6 +233,8 @@ my %ignorePrintConv = ( OTHER => 1, BITMASK => 1, Notes => 1 );
 #           WriteGroup - group name where information is being written (correct case)
 #           WantGroup - group name as specified in call to function (case insensitive)
 #           Next - pointer to next new value hash (if more than one)
+#           NoReplace - set for List-type tag if value was created with Replace=0
+#           AddBefore - number of list items added by a subsequent Replace=0 call
 #           IsNVH - Flag indicating this is a new value hash
 #           Shift - shift value
 #           Save - counter used by SaveNewValues()/RestoreNewValues()
@@ -822,6 +824,7 @@ TAG: foreach $tagInfo (@matchingTags) {
             my $nvHash = $self->GetNewValueHash($tagInfo, $writeGroup, 'create', $options{ProtectSaved});
             # ignore new values protected with ProtectSaved
             $nvHash or ++$numSet, next; # (increment $numSet to avoid warning)
+            $$nvHash{NoReplace} = 1 if $$tagInfo{List} and not $options{Replace};
             $$nvHash{WantGroup} = $wantGroup;
             $$nvHash{EditOnly} = 1 if $editOnly;
             # save maker note information if writing maker notes
@@ -902,8 +905,12 @@ TAG: foreach $tagInfo (@matchingTags) {
                 if (not $$tagInfo{List}) {
                     # not a List tag -- overwrite existing value
                     $$nvHash{Value}[0] = $val;
+                } elsif (defined $$nvHash{AddBefore} and @{$$nvHash{Value}} >= $$nvHash{AddBefore}) {
+                    # values from a later argument have been added (ie. Replace=0)
+                    # to this list, so the new values should come before these
+                    splice @{$$nvHash{Value}}, -$$nvHash{AddBefore}, 0, ref $val eq 'ARRAY' ? @$val : $val;
                 } else {
-                    # add to existing list
+                    # add at end of existing list
                     push @{$$nvHash{Value}}, ref $val eq 'ARRAY' ? @$val : $val;
                 }
                 if ($verbose > 1) {
@@ -2409,7 +2416,7 @@ sub Sanitize($$)
 # Apply inverse conversions
 # Inputs: 0) ExifTool ref, 1) value, 2) tagInfo (or Struct item) ref,
 #         3) tag name, 4) group 1 name, 5) conversion type (or undef),
-#         6) [optional] want group
+#         6) [optional] want group ("" for structure field)
 # Returns: 0) converted value, 1) error string (or undef on success)
 # Notes:
 # - uses ExifTool "ConvType" member when conversion type is undef
@@ -2424,7 +2431,9 @@ Conv: for (;;) {
             # split value into list if necessary
             if ($$tagInfo{List}) {
                 my $listSplit = $$tagInfo{AutoSplit} || $$self{OPTIONS}{ListSplit};
-                if (defined $listSplit) {
+                if (defined $listSplit and not $$tagInfo{Struct} and
+                    ($wantGroup or not defined $wantGroup))
+                {
                     $listSplit = ',?\s+' if $listSplit eq '1' and $$tagInfo{AutoSplit};
                     my @splitVal = split /$listSplit/, $val;
                     $val = \@splitVal if @splitVal > 1;
@@ -3024,7 +3033,8 @@ sub GetNewValueHash($$;$$$)
     # remove this entry if deleting, or if creating a new entry and
     # this entry is marked with "Save" flag
     if (defined $nvHash and ($opts{'delete'} or ($opts{'create'} and $$nvHash{Save}))) {
-        if (defined $_[4] and defined $$nvHash{Save} and $$nvHash{Save} > $_[4]) {
+        my $protect = (defined $_[4] and defined $$nvHash{Save} and $$nvHash{Save} > $_[4]);
+        if ($protect and not ($$nvHash{NoReplace} and $opts{create})) {
             return undef;   # honour ProtectSaved value by not writing this tag
         } elsif ($opts{'delete'}) {
             $self->RemoveNewValueHash($nvHash, $tagInfo);
@@ -3043,6 +3053,7 @@ sub GetNewValueHash($$;$$$)
             $copy{Next} = $$saveHash{$tagInfo};
             $$saveHash{$tagInfo} = \%copy;
             delete $$nvHash{Save}; # don't save it again
+            $$nvHash{AddBefore} = scalar @{$$nvHash{Value}} if $protect and $$nvHash{Value};
         }
     }
     if (not defined $nvHash and $opts{'create'}) {

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/XMP.pm

@@ -24,7 +24,7 @@
 #               9) http://www.w3.org/TR/SVG11/
 #               10) http://www.adobe.com/devnet/xmp/pdfs/XMPSpecificationPart2.pdf (Oct 2008)
 #               11) http://www.extensis.com/en/support/kb_article.jsp?articleNumber=6102211
-#               12) http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf
+#               12) http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf
 #
 # Notes:      - Property qualifiers are handled as if they were separate
 #               properties (with no associated namespace).
@@ -47,7 +47,7 @@ use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
 require Exporter;
 
-$VERSION = '2.78';
+$VERSION = '2.79';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -1366,7 +1366,7 @@ my %sPantryItem = (
     TABLE_DESC => 'XMP TIFF',
     NOTES => q{
         EXIF namespace for TIFF tags.  See
-        L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf> for the
+        L<http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf> for the
         specification.
     },
     ImageWidth    => { Writable => 'integer' },
@@ -1457,7 +1457,7 @@ my %sPantryItem = (
     PRIORITY => 0, # not as reliable as actual EXIF tags
     NOTES => q{
         EXIF namespace for EXIF tags.  See
-        L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf> for the
+        L<http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf> for the
         specification.
     },
     ExifVersion     => { },
@@ -1912,7 +1912,7 @@ my %sPantryItem = (
     PRIORITY => 0, # not as reliable as actual EXIF tags
     NOTES => q{
         EXIF tags added by the EXIF 2.3 for XMP specification (see
-        L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf>).
+        L<http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf>).
     },
     Gamma                       => { Writable => 'rational' },
     PhotographicSensitivity     => { Writable => 'integer' },

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/XMPStruct.pl

@@ -283,7 +283,7 @@ Key:
                     $item = '' unless defined $item; # use empty string for missing items
                     $$fieldInfo{Struct} and $warn = "$tag items are not valid structures", next Key;
                     $et->Sanitize(\$item);
-                    ($copy[$i],$err) = $et->ConvInv($item,$fieldInfo,$tag,$strName,$type);
+                    ($copy[$i],$err) = $et->ConvInv($item,$fieldInfo,$tag,$strName,$type,'');
                     $err and $warn = $err, next Key;
                     $err = CheckXMP($et, $fieldInfo, \$copy[$i]);
                     $err and $warn = "$err in $strName $tag", next Key;
@@ -302,7 +302,7 @@ Key:
             $warn = "Improperly formed structure in $strName $tag";
         } else {
             $et->Sanitize(\$$struct{$key});
-            ($val,$err) = $et->ConvInv($$struct{$key},$fieldInfo,$tag,$strName,$type);
+            ($val,$err) = $et->ConvInv($$struct{$key},$fieldInfo,$tag,$strName,$type,'');
             $err and $warn = $err, next Key;
             $err = CheckXMP($et, $fieldInfo, \$val);
             $err and $warn = "$err in $strName $tag", next Key;
@@ -575,12 +575,21 @@ sub ConvertStruct($$$$;$)
         }
         return \%struct;
     } elsif (ref $value eq 'ARRAY') {
-        my (@list, $val);
-        foreach $val (@$value) {    
-            my $v = ConvertStruct($et, $tagInfo, $val, $type, $parentID);
-            push @list, $v if defined $v;
+        if (defined $$et{OPTIONS}{ListItem}) {
+            my $li = $$et{OPTIONS}{ListItem};
+            return undef unless defined $$value[$li];
+            undef $$et{OPTIONS}{ListItem};      # only do top-level list
+            my $val = ConvertStruct($et, $tagInfo, $$value[$li], $type, $parentID);
+            $$et{OPTIONS}{ListItem} = $li;
+            return $val;
+        } else {
+            my (@list, $val);
+            foreach $val (@$value) {    
+                my $v = ConvertStruct($et, $tagInfo, $val, $type, $parentID);
+                push @list, $v if defined $v;
+            }
+            return \@list;
         }
-        return \@list;
     } else {
         return $et->GetValue($tagInfo, $type, $value);
     }

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/perl-Image-ExifTool.spec

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

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/t/CanonVRD_5.out

@@ -1,3 +1,3 @@
-[File, System, Image] FileSize - File Size: 28222
+[File, System, Image] FileSize - File Size: 28389
 [CanonVRD, CanonVRD, Image] 2 - VRD Version: 200
 [CanonVRD, CanonVRD, Image] 2 - VRD Version: 200

data/bin/Image-ExifTool-9.71/t/CanonVRD_9.out

@@ -0,0 +1 @@
+[File, System, Image] FileSize - File Size: 23045

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/t/ExifTool.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/ExifTool.t".
 
-BEGIN { $| = 1; print "1..26\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..27\n"; $Image::ExifTool::noConfig = 1; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)
@@ -281,4 +281,14 @@ my $testnum = 1;
     print "ok $testnum\n";
 }
 
+# test 27: Test ListItem option
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    $exifTool->Options(ListItem => -3);
+    my $info = $exifTool->ImageInfo('t/images/ExifTool.jpg', 'Subject', 'SupplementalCategories');
+    print 'not ' unless check($exifTool, $info, $testname, $testnum);
+    print "ok $testnum\n";
+}
+
 # end

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/t/ExifTool_2.out

@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.47
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.71
 [File, System, Image] FileName - File Name: ExifTool.jpg
 [File, System, Image] Directory - Directory: t/images
 [File, System, Image] FileSize - File Size: 25 kB
-[File, System, Time] FileModifyDate - File Modification Date/Time: 2014:01:17 09:28:51-05:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2014:01:17 09:33:29-05:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2014:01:17 09:28:51-05:00
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2014:09:19 20:30:00-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2014:09:17 19:10:03-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2014:09:19 20:30:00-04:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: JPEG
 [File, File, Image] MIMEType - MIME Type: image/jpeg
@@ -126,6 +126,8 @@
 [MakerNotes, Qualcomm, Camera] asf5_exposure_index_1 - ASF5 Exposure Index 1: 180
 [MakerNotes, Qualcomm, Camera] asf5_exposure_index_2 - ASF5 Exposure Index 2: 270
 [MakerNotes, Qualcomm, Camera] asf5_max_exposure_index - ASF5 Max Exposure Index: 290
+[MakerNotes, Samsung, Other] 0x0100-name - Embedded Audio File Name: SoundShot_000
+[MakerNotes, Samsung, Other] 0x0100 - Embedded Audio File: (Binary data 16 bytes)
 [APP0, AVI1, Image] 0 - Interleaved Field: Not Interleaved
 [XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 4.73
 [XMP, XMP-rdf, Document] about - About: uuid:80056b68-1045-fa97-3401-6f4ed84cd53d

data/bin/Image-ExifTool-9.71/t/ExifTool_27.out

@@ -0,0 +1,4 @@
+[XMP, XMP-dc, Image] subject - Subject: ExifTool
+[XMP, XMP-photoshop, Image] SupplementalCategories - Supplemental Categories: amazing
+[IPTC, IPTC, Other] 20 - Supplemental Categories: amazing
+[IPTC, IPTC3, Other] 20 - Supplemental Categories: supp cat