exiftool_vendored 11.57.0 → 11.60.0

data/bin/lib/Image/ExifTool/README

@@ -360,6 +360,9 @@ numerical, and generated automatically otherwise.
                   'DataTag' - associated tag name containing data for offset or
                   byte count tags.
 
+                  'DelGroup' - set if deleting this tag is the same as deleting
+                  the group of the same name.
+
                   'Drop' - [IFD-format and PhaseOne makernote tags only] set to
                   1 for tags that should be excluded when rebuilding maker notes
                   when copying all tags.  Set to a number larger than 1 to drop

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

@@ -29,7 +29,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.52';
+$VERSION = '1.53';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -904,7 +904,7 @@ my %code2charset = (
 
 # RIFF character set chunk
 %Image::ExifTool::RIFF::CSET = (
-    PROCESS_PROC => \&Image::ExifTool::RIFF::ProcessBinaryData,
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 2 => 'Other' },
     FORMAT => 'int16u',
     0 => {

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.25';
+$VERSION = '1.26';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
@@ -88,7 +88,9 @@ $VERSION = '1.25';
     0x256 => 'Sigma 105mm F2.8 EX Macro',
     0x257 => 'Sigma 105mm F2.8 EX DG Macro',
     0x258 => 'Sigma 105mm F2.8 EX DG OS HSM Macro',
+    0x259 => 'Sigma 105mm F1.4 DG HSM | A', #IB (A018)
     0x270 => 'Sigma 70mm F2.8 EX DG Macro', #NJ (SD1)
+    0x271 => 'Sigma 70mm F2.8 DG Macro | A', #IB (A018)
     0x300 => 'Sigma 30mm F1.4 EX DC HSM',
     0x301 => 'Sigma 30mm F1.4 DC HSM | A',
     0x302 => 'Sigma 30mm F1.4 DC DN | C', #JR (DN lenses are only for Sony E or MFT mount)
@@ -175,6 +177,7 @@ $VERSION = '1.25';
     0x727 => 'Sigma 135-400mm F4.5-5.6 DG ASP APO',
     0x728 => 'Sigma 120-400mm F4.5-5.6 DG APO OS HSM',
     0x729 => 'Sigma 100-400mm F5-6.3 DG OS HSM | C', #JR (017)
+    0x730 => 'Sigma 60-600mm F4.5-6.3 DG OS HSM | S', #IB (S018)
     0x733 => 'Sigma 170-500mm F5-6.3 ASP APO',
     0x734 => 'Sigma 170-500mm F5-6.3 DG ASP APO',
     0x735 => 'Sigma 50-500mm F4-6.3 EX RF HSM APO',

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

@@ -22,6 +22,8 @@
 #               IB) Iliah Borg private communication (LibRaw)
 #               JD) Jens Duttke private communication
 #               JR) Jos Roost private communication
+#
+#               NC = Not Confirmed
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Sony;
@@ -32,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.11';
+$VERSION = '3.14';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -90,8 +92,9 @@ sub PrintInvLensSpec($;$$);
     32791 => 'Sony E 16-70mm F4 ZA OSS',        # VX9107
     32792 => 'Sony E 10-18mm F4 OSS',           # VX9108
     32793 => 'Sony E PZ 16-50mm F3.5-5.6 OSS',  # VX9109
-    32794 => 'Sony FE 35mm F2.8 ZA or Samyang AF 24mm F2.8', # VX9110
+    32794 => 'Sony FE 35mm F2.8 ZA or Samyang Lens', # VX9110
     32794.1 => 'Samyang AF 24mm F2.8', #JR
+    32794.2 => 'Samyang AF 35mm F2.8', #IB (also 51505)
     32795 => 'Sony FE 24-70mm F4 ZA OSS',       # VX9111
     32796 => 'Sony FE 85mm F1.8 or Viltrox PFU RBMH 85mm F1.8', #JR
     32796.1 => 'Viltrox PFU RBMH 85mm F1.8', #JR (MF)
@@ -149,7 +152,7 @@ sub PrintInvLensSpec($;$$);
     33078 => 'Sony FE 100-400mm F4.5-5.6 GM OSS + 2X Teleconverter', #JR
     33079 => 'Sony FE 400mm F2.8 GM OSS + 1.4X Teleconverter', #IB
     33080 => 'Sony FE 400mm F2.8 GM OSS + 2X Teleconverter', #JR
-    33081 => 'Sony FE 200-600mm F5.6-6.3 G OSS + 1.4X Teleconverter', #JR (NC)
+    33081 => 'Sony FE 200-600mm F5.6-6.3 G OSS + 1.4X Teleconverter', #JR
     33082 => 'Sony FE 200-600mm F5.6-6.3 G OSS + 2X Teleconverter', #JR
     33083 => 'Sony FE 600mm F4 GM OSS + 1.4X Teleconverter', #JR (NC)
     33084 => 'Sony FE 600mm F4 GM OSS + 2X Teleconverter', #JR
@@ -214,8 +217,9 @@ sub PrintInvLensSpec($;$$);
     # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)
     # 504xx => 'Sigma 30mm F1.4 DC HSM | A + MC-11', # (013)
 
+    51504 => 'Samyang AF 50mm F1.4', #IB
     51505 => 'Samyang AF 14mm F2.8 or Samyang AF 35mm F2.8', #forum3833
-    51505.1 => 'Samyang AF 35mm F2.8', #PH
+    51505.1 => 'Samyang AF 35mm F2.8', #PH (also 32794)
     51507 => 'Samyang AF 35mm F1.4', #IB
 );
 
@@ -1890,6 +1894,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             369 => 'DSC-RX100M5A', #JR
             371 => 'ILCE-6400', #IB
             372 => 'DSC-RX0M2', #JR
+            374 => 'DSC-RX100M7', #IB
             375 => 'ILCE-7RM4', #IB
         },
     },
@@ -5840,6 +5845,7 @@ my %releaseMode2010 = (
         4 => 'Continuous - Burst', # seen for DSC-WX500 with burst of 10 shots
         5 => 'Continuous - Speed/Advance Priority',
         6 => 'Normal - Self-timer', # seen for ILCE-6300/6500/9, ILCA-99M2
+        9 => 'Single Burst Shooting', # first seen for DSC-RX100M7
     },
 );
 my %selfTimer2010 = (
@@ -7847,6 +7853,7 @@ my %isoSetting2010 = (
             4 => '4 shots',
             5 => '5 shots',
             6 => '6 shots',
+            7 => '7 shots', # DSC-RX100M7 Single Burst Shooting
             9 => '9 shots', # ILCE-7RM2 9-shot bracketing
             10 => '10 shots',
             12 => '12 shots', # ILCA-77M2 12-shot MFNR-mode
@@ -7863,6 +7870,7 @@ my %isoSetting2010 = (
             2 => '2 files',
             3 => '3 files',
             5 => '5 files',
+            7 => '7 files', # DSC-RX100M7 Single Burst Shooting
             9 => '9 files', # ILCE-7RM2 9-shot bracketing
             10 => '10 files', # seen for DSC-WX500 with burst of 10 shots
         },
@@ -7910,7 +7918,7 @@ my %isoSetting2010 = (
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 152',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(152|154)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x059d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(144|146)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0634 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 68',           Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0636 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(73|74)/',   Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },

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

@@ -1819,7 +1819,6 @@ my %tagLookup = (
 	'd-rangeoptimizermode' => { 433 => 0x8022 },
 	'd-rangeoptimizershadow' => { 433 => 0x802d },
 	'd-rangeoptimizervalue' => { 433 => 0x8023 },
-	'd810meteringmode' => { 242 => 0x175e },
 	'darkblacksegrows' => { 132 => 0x18d8 },
 	'darkfocusenvironment' => { 302 => 0x8003 },
 	'darkframecountfactor' => { 132 => 0xc85 },
@@ -3305,7 +3304,7 @@ my %tagLookup = (
 	'lensfocusfunctionbuttons' => { 263 => '55.1', 265 => '52.1', 266 => '52.1', 275 => '52.1', 276 => '52.1' },
 	'lensformat' => { 412 => 0x1891, 414 => 0x18bd, 415 => 0x18ed, 416 => 0x17f1, 418 => 0x106, 419 => 0x106, 428 => 0x603, 429 => 0x5d },
 	'lensfstops' => { 207 => 0x7, 208 => 0xc, 209 => 0xd, 213 => 0xe, 215 => 0x8b, 328 => '0.3' },
-	'lensid' => { 452 => 'LensID' },
+	'lensid' => { 213 => 0x30, 452 => 'LensID' },
 	'lensidnumber' => { 207 => 0x6, 208 => 0xb, 209 => 0xc, 213 => 0xd },
 	'lensinfo' => { 114 => 0xa432, 334 => 0x2a, 452 => 'LensInfo', 462 => 'LensSpecification' },
 	'lenskind' => { 328 => 0x1 },
@@ -3941,6 +3940,7 @@ my %tagLookup = (
 	'nikoncaptureversion' => { 215 => 0xe09 },
 	'nikoniccprofile' => { 215 => 0xe1d },
 	'nikonimagesize' => { 230 => '723.1', 231 => '732.1', 240 => 0x2c4 },
+	'nikonmeteringmode' => { 234 => 0x2ea4, 242 => 0x175e },
 	'noisefilter' => { 279 => 0x527 },
 	'noiseprofile' => { 114 => 0xc761 },
 	'noisereduction' => { 122 => [0x100b,0x100e], 173 => 0xb0, 174 => 0x60, 175 => 0x3f, 215 => 0x95, 255 => 0x753dcbc0, 256 => 0x17, 279 => 0x50a, 284 => 0x103a, 302 => 0x2d, 337 => 0x49, 369 => 0x100f, 371 => 0x2a },

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 22992 tags, with 15044 unique tag names.
+They contain a total of 22995 tags, with 15044 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -105,6 +105,7 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                XMP                              XMP
                QVCI                             Casio QVCI
                FLIR                             FLIR FFF
+               RawThermalImage                  no
   'APP2'       ICC_Profile                      ICC_Profile
                FPXR                             FlashPix
                MPF                              MPF
@@ -11772,7 +11773,7 @@ different for other firmware versions.
     464    SecondarySlotFunction                int8u & 0x03
    5974    AEBracketingSteps                    int8u & 0xff
    5975    WBBracketingSteps                    int8u & 0xff
-   5982    D810MeteringMode                     int8u & 0x03
+   5982    NikonMeteringMode                    int8u & 0x03
    6236    ISOAutoShutterTime                   int8u & 0x3f
    6237    ISOAutoHiLimit                       int8u & 0xff
    6315    CustomSettingsD810                   NikonCustom SettingsD810
@@ -11894,6 +11895,7 @@ These tags are extracted from encrypted data in images from the D5 and D500.
   11300    RollAngle                            fixed32u
   11304    PitchAngle                           fixed32u
   11308    YawAngle                             fixed32u
+  11940    NikonMeteringMode                    int8u & 0x03
 
 =head3 Nikon ShotInfoD610 Tags
 
@@ -12064,6 +12066,7 @@ Tags found in the encrypted LensData from cameras such as the Z6 and Z7.
      18    MaxApertureAtMaxFocal                int8u
      19    MCUVersion                           int8u
      20    EffectiveMaxAperture                 int8u
+     48    LensID                               int16u
      54    MaxAperture                          int16u
      56    FNumber                              int16u
      60    FocalLength                          int16u
@@ -25497,8 +25500,8 @@ Note when creating new tags,
 L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> tags are
 preferred over these, so to create the tag when a same-named ItemList tag
 exists, either "UserData" must be specified (eg. C<-UserData:Artist=Monet>
-on the command line), or the PREFERRED level must be changed via the config
-file.
+on the command line), or the PREFERRED level must be changed via
+the config file.
 
   Tag ID       Tag Name                         Writable
   ------       --------                         --------
@@ -28291,12 +28294,12 @@ WebP animation frame chunk.
 
 =head3 RIFF CSET Tags
 
-  Tag ID   Tag Name                             Writable
+  Index2   Tag Name                             Writable
   ------   --------                             --------
-  0x0000   CodePage                             no
-  0x0001   CountryCode                          no
-  0x0002   LanguageCode                         no
-  0x0003   Dialect                              no
+      0    CodePage                             no
+      1    CountryCode                          no
+      2    LanguageCode                         no
+      3    Dialect                              no
 
 =head3 RIFF Info Tags
 

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

@@ -147,26 +147,11 @@ sub DoneDir($$$;$)
     $dir = 'IFD0' if $dir eq 'EXIF';
     # don't add this directory again unless this is in a non-standard location
     delete $$et{ADD_DIRS}{$dir} unless $nonStandard;
-    # handle problem with duplicate XMP when using PNGEarlyXMP option
-    return unless $dir eq 'XMP' and defined $$outBuff and length $$outBuff;
     if ($nonStandard and $$et{DEL_GROUP}{$dir}) {
         $et->VPrint(0,"  Deleting non-standard $dir\n");
         $$outBuff = '';
     } elsif (not $$et{PNGDoneDir}{$dir}) {
         $$et{PNGDoneDir}{$dir} = 1;   # set flag indicating the directory exists
-    } elsif ($$et{OPTIONS}{PNGEarlyXMP}) {
-        if ($$et{PNGDoneDir}{$dir} == 2) {
-            if ($$et{OPTIONS}{IgnoreMinorErrors}) {
-                $et->Warn("Deleted existing $dir");
-            } else {
-                $et->Error("Duplicate $dir created. Ignore to delete existing $dir", 1);
-                return;
-            }
-        } elsif ($et->Warn("Duplicate $dir. Ignore to delete", 2)) {
-            return; # warning not ignored: don't delete the duplicate
-        }
-        $et->VPrint(0,"  Deleting duplicate $dir\n");
-        $$outBuff = '';
     }
 }
 

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

@@ -1034,7 +1034,7 @@ sub WriteXMP($$;$)
             # take attributes from old values if they exist
             %attrs = %{$$cap[1]};
             if ($overwrite) {
-               my ($oldLang, $delLang, $addLang, @matchingPaths);
+                my ($oldLang, $delLang, $addLang, @matchingPaths, $langPathPat);
                 # check to see if this is an indexed list item
                 if ($path =~ / /) {
                     my $pp;
@@ -1043,9 +1043,15 @@ sub WriteXMP($$;$)
                 } else {
                     push @matchingPaths, $path;
                 }
+                my $oldOverwrite = $overwrite;
                 foreach $path (@matchingPaths) {
                     my ($val, $attrs) = @{$capture{$path}};
                     if ($writable eq 'lang-alt') {
+                        # revert to original overwrite flag if this is in a different structure
+                        if (not $langPathPat or $path !~ /^$langPathPat$/) {
+                            $overwrite = $oldOverwrite;
+                            ($langPathPat = $path) =~ s/\d+$/\\d+/;
+                        }
                         unless (defined $addLang) {
                             # add to lang-alt list by default if creating this tag from scratch
                             $addLang = $$nvHash{IsCreating} ? 1 : 0;

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

@@ -916,6 +916,20 @@ TAG: foreach $tagInfo (@matchingTags) {
                     next;
                 }
             }
+            # set group delete flag if this tag represents an entire group
+            if ($$tagInfo{DelGroup} and not $options{DelValue}) {
+                my @del = ( $tag );
+                $$self{DEL_GROUP}{$tag} = 1;
+                # delete extra groups if necessary
+                if ($delMore{$tag}) {
+                    $$self{DEL_GROUP}{$_} = 1, push(@del,$_) foreach @{$delMore{$tag}};
+                }
+                # remove all of this group from previous new values
+                $self->RemoveNewValuesForGroup($tag);
+                $verbose and print $out "  Deleting tags in: @del\n";
+                ++$numSet;
+                next;
+            }
             $noConv = 1;    # value is not defined, so don't do conversion
         }
         # apply inverse PrintConv and ValueConv conversions
@@ -3875,6 +3889,9 @@ sub InitWriteDirs($$;$$)
                     }
                 }
                 $dirName = shift @dirNames;
+            } elsif ($dirName eq 'QuickTime') {
+                # write to specific QuickTime group
+                $dirName = $self->GetGroup($tagInfo, 1);
             }
             while ($dirName) {
                 my $parent = $$fileDirs{$dirName};

data/bin/perl-Image-ExifTool.spec

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

data/lib/exiftool_vendored/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.57.0
+  version: 11.60.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool