exiftool_vendored 9.50.0 → 9.53.0

data/bin/{Image-ExifTool-9.50 → Image-ExifTool-9.53}/lib/Image/ExifTool/TagNames.pod

@@ -210,7 +210,9 @@ Tags found in the XML metadata of the "Media Jukebox" APP9 segment.
   Tag Name                                      Writable
   --------                                      --------
   Album                                         N
+  Caption                                       N
   Date                                          N
+  Keywords                                      N
   Name                                          N
   People                                        N
   Places                                        N
@@ -1973,11 +1975,15 @@ L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf>).
 
 =head3 XMP ExpressionMedia Tags
 
-Microsoft Expression Media namespace tags.
+Microsoft Expression Media namespace tags.  These tags are avoided when
+writing due to name conflicts with tags in other schemas.
 
   Tag Name                                      Writable
   --------                                      --------
   CatalogSets                                   string/+
+  Event                                         string/
+  People                                        string/+
+  Status                                        string/
 
 =head3 XMP extensis Tags
 
@@ -4722,14 +4728,7 @@ Unknown CameraInfo tags are divided into 3 tables based on format size.
      91    CameraTemperature                    int32s
      92    CameraTemperature                    int32s
     100    CameraTemperature                    int32s
-    466    CameraTemperature                    int32s
-    503    CameraTemperature                    int32s
-    506    CameraTemperature                    int32s
-    520    CameraTemperature                    int32s
-    524    CameraTemperature                    int32s
-    532    CameraTemperature                    int32s
-    547    CameraTemperature                    int32s
-    549    CameraTemperature                    int32s
+     -3    CameraTemperature                    int32s
 
 =head3 Canon CameraInfoUnknown16 Tags
 
@@ -5254,7 +5253,7 @@ These tags are used by the PowerShot G10.
 
 =head3 Canon ColorData6 Tags
 
-These tags are used by the EOS 600D.
+These tags are used by the EOS 600D and 1200D.
 
   Index2   Tag Name                             Writable
   ------   --------                             --------
@@ -11947,6 +11946,7 @@ MakerNotes.
   0x201c   AFAreaModeSetting                    int8u
   0x201d   FlexibleSpotPosition                 int16u[2]
   0x201e   AFPointSelected                      int8u
+  0x2020   AFInfo2                              Sony AFInfo2
   0x3000   ShotInfo                             Sony ShotInfo
   0x900b   Tag900b                              Sony Tag900b
   0x9050   Tag9050                              Sony Tag9050
@@ -12348,7 +12348,8 @@ A580 and NEX-3/5/C3/VG10.
      20    BatteryState                         int8u
            ExposureProgram                      int8u
            ModeDialPosition                     int8u
-     22    MemoryCardConfiguration              int8u
+     22    MemoryCardConfiguration              int8u & 0xc0
+           CameraOrientation                    int8u
      24    CameraOrientation                    int8u & 0x30
 
 =head3 Sony Panorama Tags
@@ -12513,7 +12514,7 @@ Valid for DSC-RX100M2, DSC-QX10/QX100.
 
 =head3 Sony Tag2010g Tags
 
-Valid for DSC-RX10, ILCE-7/7R/5000.
+Valid for DSC-RX10/HX60V/HX400V, ILCE-7/7R/5000/6000.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -12534,6 +12535,12 @@ Valid for DSC-RX10, ILCE-7/7R/5000.
   0x032e   MinFocalLength                       int16u
   0x0330   MaxFocalLength                       int16u
 
+=head3 Sony AFInfo2 Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    AFPointsUsed                         int32u
+
 =head3 Sony ShotInfo Tags
 
   Index1   Tag Name                             Writable
@@ -12638,7 +12645,7 @@ DSC-HX50V, DSC-QX10/QX100.
 
 =head3 Sony Tag9400c Tags
 
-Valid for DSC-RX10, ILCE-7/7R/5000.
+Valid for DSC-RX10/HX60V/HX400V, ILCE-7/7R/5000/6000.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -12668,6 +12675,8 @@ Valid for DSC-RX10, ILCE-7/7R/5000.
 
 =head3 Sony Tag9405a Tags
 
+Valid for SLT, NEX, ILCE-3000 and several DSC models.
+
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0603   LensFormat                           int8u
@@ -12677,7 +12686,7 @@ Valid for DSC-RX10, ILCE-7/7R/5000.
 
 =head3 Sony Tag9405b Tags
 
-Valid for the DSC-RX10 and ILCE-7/7R/5000.
+Valid for the DSC-RX10/HX60V/HX400V and ILCE-7/7R/5000/6000.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -13289,9 +13298,21 @@ These tags are found in IFD0 of Panasonic/Leica RAW, RW2 and RWL images.
   0x0005   SensorLeftBorder                     N
   0x0006   SensorBottomBorder                   N
   0x0007   SensorRightBorder                    N
+  0x0008   BlackLevel1                          int16u
+  0x0009   BlackLevel2                          int16u
+  0x000a   BlackLevel3                          int16u
+  0x000e   LinearityLimitRed                    int16u
+  0x000f   LinearityLimitGreen                  int16u
+  0x0010   LinearityLimitBlue                   int16u
   0x0011   RedBalance                           int16u
   0x0012   BlueBalance                          int16u
   0x0017   ISO                                  int16u
+  0x0018   HighISOMultiplierRed                 int16u
+  0x0019   HighISOMultiplierGreen               int16u
+  0x001a   HighISOMultiplierBlue                int16u
+  0x001c   BlackLevelRed                        int16u
+  0x001d   BlackLevelGreen                      int16u
+  0x001e   BlackLevelBlue                       int16u
   0x0024   WBRedLevel                           int16u
   0x0025   WBGreenLevel                         int16u
   0x0026   WBBlueLevel                          int16u
@@ -26567,6 +26588,10 @@ for more details.
                        DriveMode
                        OwnerName
                        SerialNumber
+  ColorSpaceTags       ExifIFD:ColorSpace       Y
+                       ExifIFD:Gamma
+                       InteropIFD:InteropIndex
+                       ICC_Profile
   Common               FileName                 Y
                        FileSize
                        Model

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

@@ -1484,9 +1484,9 @@ sub RebuildMakerNotes($$$)
                     # (Note: this expression also appears in Exif.pm)
                     if ($$et{Model} =~ /\b(K(-[57mrx]|(10|20|100|110|200)D|2000)|GX(10|20))\b/) {
                         $hdr =~ s/^(PENTAX |SAMSUNG)\0/AOC\0/;
+                        # save fixup because AOC maker notes have absolute offsets
+                        $$et{MAKER_NOTE_FIXUP} = $makerFixup;
                     }
-                    # save fixup so we will adjust to absolute offsets when writing
-                    $$et{MAKER_NOTE_FIXUP} = $makerFixup;
                 }
                 $rtnValue = $hdr . $rtnValue;
                 # adjust fixup for shift in start position

data/bin/{Image-ExifTool-9.50 → Image-ExifTool-9.53}/lib/Image/ExifTool/WriteIPTC.pl

@@ -603,9 +603,9 @@ sub DoWriteIPTC($$$)
     }
     # make sure the rest of the data is zero
     if ($tail < $dirEnd) {
-        my $trailer = substr($$dataPt, $tail, $dirEnd-$tail);
-        if ($trailer =~ /[^\0]/) {
-            return undef if $et->Warn('Unrecognized data in IPTC trailer', 2);
+        my $pad = substr($$dataPt, $tail, $dirEnd-$tail);
+        if ($pad =~ /[^\0]/) {
+            return undef if $et->Warn('Unrecognized data in IPTC padding', 2);
         }
     }
     return $newData;

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

@@ -3413,14 +3413,13 @@ sub WriteDirectory($$$;$)
                 $self->Warn("Can't write EXIF as a block to $$self{FILE_TYPE} file");
                 last;
             }
-            unless ($writeProc eq \&Image::ExifTool::WriteTIFF) {
-                # this could happen if we called WriteDirectory for an EXIF directory
-                # without going through WriteTIFF as the WriteProc, which would be bad
-                # because the EXIF block could end up with two TIFF headers
-                $self->Warn('Internal error writing EXIF -- please report');
-                last;
-            }
+            # this can happen if we call WriteDirectory for an EXIF directory without  going
+            # through WriteTIFF as the WriteProc (which happens if conditionally replacing
+            # the EXIF block and the condition fails), but we never want to do a block write
+            # in this case because the EXIF block would end up with two TIFF headers
+            last unless $writeProc eq \&Image::ExifTool::WriteTIFF;
         }
+        last unless $self->IsOverwriting($nvHash, $dataPt ? $$dataPt : '');
         my $verb = 'Writing';
         my $newVal = $self->GetNewValues($nvHash);
         unless (defined $newVal and length $newVal) {
@@ -4202,7 +4201,7 @@ my %writeValueProc = (
 #         2) number of values:
 #               undef = 1 for numerical types, or data length for string/undef types
 #                  -1 = number of space-delimited values in the input string
-#         3) optional data reference, 4) value offset
+#         3) optional data reference, 4) value offset (may be negative for bytes from end)
 # Returns: packed value (and sets value in data) or undef on error
 # Notes: May modify input value to round for integer formats
 sub WriteValue($$;$$$$)
@@ -4490,7 +4489,6 @@ sub WriteJPEG($$)
         if (defined $s and length $s) {
             return 0 unless $s eq "\xff\x01" and $raf->Read($s,5) == 5 and $s eq 'Exiv2';
         } else {
-            # (Note: FILE_TYPE is 'EXV' when creating EXV files, but 'JPEG' when editing)
             return 0 unless $$self{FILE_TYPE} eq 'EXV';
             $s = 'Exiv2';
             $creatingEXV = 1;

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
 require Exporter;
 
-$VERSION = '2.72';
+$VERSION = '2.74';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -2719,9 +2719,10 @@ sub PrintLensID(@)
     local $_;
     my ($et, $id, $make, $info, $focalLength, $lensModel) = @_;
     my ($mk, $printConv);
+    my %alt = ( Pentax => 'Ricoh' );    # Pentax changed its name to Ricoh
     # missing: Olympus (no XMP:LensID written by Adobe)
     foreach $mk (qw(Canon Nikon Pentax Sony Sigma Samsung Leica)) {
-        next unless $make =~ /$mk/i;
+        next unless $make =~ /$mk/i or ($alt{$mk} and $make =~ /$alt{$mk}/i);
         # get name of module containing the lens lookup (default "Make.pm")
         my $mod = { Sigma => 'SigmaRaw', Leica => 'Panasonic' }->{$mk} || $mk;
         require "Image/ExifTool/$mod.pm";
@@ -3145,13 +3146,12 @@ sub ParseXMPElement($$$;$$$$)
         my $parseResource;
         if ($prop eq 'rdf:li') {
             # impose a reasonable maximum on the number of items in a list
-            if ($nItems > 999) {
-                my ($tg,$ns);
-                ($tg, $ns) = GetXMPTagID($propListPt) if $nItems == 1000;
+            if ($nItems == 1000) {
+                my ($tg,$ns) = GetXMPTagID($propListPt);
                 if ($isWriting) {
-                    $et->Warn("Excessive number of items for $ns:$tg. Processing may be slow.", 1) if $tg;
+                    $et->Warn("Excessive number of items for $ns:$tg. Processing may be slow.", 1);
                 } elsif (not $$et{OPTIONS}{IgnoreMinorErrors}) {
-                    $et->Warn("Excessive number of items for $ns:$tg. Extracted only the first 1000.", 2) if $tg;
+                    $et->Warn("Excessive number of items for $ns:$tg. Extracted only the first 1000.", 2);
                     last;
                 }
             }

data/bin/{Image-ExifTool-9.50 → Image-ExifTool-9.53}/lib/Image/ExifTool/XMP2.pl

@@ -1049,12 +1049,14 @@ my %sSubVersion = (
     %xmpTableDefaults,
     GROUPS => { 1 => 'XMP-expressionmedia', 2 => 'Image' },
     NAMESPACE => 'expressionmedia',
-    NOTES => 'Microsoft Expression Media namespace tags.',
-    CatalogSets => {
-        List => 'Bag',
-        Avoid => 1,
-        Notes => 'avoided due to conflict with XMP-mediapro:CatalogSets',
+    NOTES => q{
+        Microsoft Expression Media namespace tags.  These tags are avoided when
+        writing due to name conflicts with tags in other schemas.
     },
+    Event       => { Avoid => 1 },
+    Status      => { Avoid => 1 },
+    People      => { Avoid => 1, List => 'Bag' },
+    CatalogSets => { Avoid => 1, List => 'Bag' },
 );
 
 # DigiKam namespace tags (ref PH)

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

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