exiftool-vendored.pl 12.84.0 → 12.85.0

package/bin/lib/Image/ExifTool/Geolocation.pm

@@ -55,7 +55,7 @@
 #       1. Time zone name, terminated by newline
 #   "\0\0\0\0\x05" (feature codes added in v1.03)
 #   Feature codes:
-#       1. Feature code, terminated by newline
+#       1. Feature code, optional space-followed-by-feature-name, then newline
 #   "\0\0\0\0\0"
 #
 # Feature Codes v1.02: (see http://www.geonames.org/export/codes.html#P for descriptions)
@@ -70,7 +70,7 @@ package Image::ExifTool::Geolocation;
 use strict;
 use vars qw($VERSION $geoDir $altDir $dbInfo);
 
-$VERSION = '1.07';  # (this is the module version number, not the database version)
+$VERSION = '1.08';  # (this is the module version number, not the database version)
 
 my $debug; # set to output processing time for testing
 
@@ -82,7 +82,7 @@ sub Geolocate($;$);
 
 my (@cityList, @countryList, @regionList, @subregionList, @timezoneList);
 my (%countryNum, %regionNum, %subregionNum, %timezoneNum); # reverse lookups
-my (@sortOrder, @altNames, %langLookup, $nCity, %featureCodes);
+my (@sortOrder, @altNames, %langLookup, $nCity, %featureCodes, %featureTypes);
 my ($lastArgs, %lastFound, @lastByPop, @lastByLat); # cached city matches
 my $dbVer = '1.03';
 my $sortedBy = 'Latitude';
@@ -200,7 +200,7 @@ sub ReadDatabase($)
             $line = <DATFILE>;
             last if length($line) == 6 and $line =~ /\0\0\0\0/;
             chomp $line;
-            $line =~ s/ .*//;  # (hook to be able to add feature descriptions later)
+            $featureTypes{$line} = $1 if $line =~ s/ (.*)//;
             push @featureCodes, $line;
         }
     }
@@ -288,7 +288,7 @@ sub AddEntry(@)
     my ($city, $region, $subregion, $cc, $country, $timezone, $fc, $pop, $lat, $lon, $altNames) = @_;
     @_ < 10 and warn("Too few arguments in $city definition (check for updated format)\n"), return 0;
     length($cc) != 2 and warn("Country code '${cc}' is not 2 characters\n"), return 0;
-    $fc =~ s/ .*//; # (allow for descriptions to be added after a space -- future feature?)
+    $featureTypes{$fc} = $1 if $fc =~ s/ (.*)//;
     my $fn = $featureCodes{lc $fc};
     unless (defined $fn) {
         if ($dbVer eq '1.02' or @featureCodes > 0x3f or not length $fc) {
@@ -372,7 +372,7 @@ sub AddEntry(@)
 # Inputs: 0) entry number or index into sorted database,
 #         1) optional language code, 2) flag to use index into sorted database
 # Returns: 0-10) city,region,subregion,country_code,country,timezone,
-#                feature_code,pop,lat,lon,altNames
+#                feature_code,pop,lat,lon,feature_type
 sub GetEntry($;$$)
 {
     my ($entryNum, $lang, $sort) = @_;
@@ -395,7 +395,8 @@ sub GetEntry($;$$)
     my $fc = $featureCodes[$fn & 0x3f] || 'Other';
     my $cc = substr($ctry, 0, 2);
     my $country = substr($ctry, 2);
-    if ($lang) {
+    my $ft = $featureTypes{$fc};
+    if ($lang and $lang ne 'en') {
         my $xlat = $langLookup{$lang};
         # load language lookups if  not done already
         if (not defined $xlat) {
@@ -429,9 +430,10 @@ sub GetEntry($;$$)
             $sub = $$xlat{"$cc$rgn,$sub,"} || $$xlat{$sub} || $sub;
             $rgn = $$xlat{"$cc$rgn,"} || $$xlat{$rgn} || $rgn;
             $country = $$xlat{"$cc,"} || $$xlat{$country} || $country;
+            $ft = $$xlat{$fc} if $$xlat{$fc};
         }
     }
-    return($city,$rgn,$sub,$cc,$country,$timezoneList[$tn],$fc,$pop,$lt,$ln);
+    return($city,$rgn,$sub,$cc,$country,$timezoneList[$tn],$fc,$pop,$lt,$ln,$ft);
 }
 
 #------------------------------------------------------------------------------
@@ -863,6 +865,8 @@ item Return Values:
 
 9) GPS longitude
 
+10) Feature type, or undef
+
 =back
 
 =head2 GetAltNames

package/bin/lib/Image/ExifTool/ID3.pm

@@ -103,6 +103,14 @@ my %dateTimeConv = (
     },
 );
 
+%Image::ExifTool::ID3::UserDefined = (
+    GROUPS => { 1 => 'UserDefined', 2 => 'Other' },
+    NOTES => q{
+        ID3 user-defined text and URL tags will be dynamically added to this table
+        by name when found.
+    },
+);
+
 # Lyrics3 tags (ref 4)
 %Image::ExifTool::ID3::Lyrics3 = (
     GROUPS => { 1 => 'Lyrics3', 2 => 'Audio' },
@@ -493,7 +501,7 @@ my %genre = (
     TT2 => 'Title',
     TT3 => 'Subtitle',
     TXT => 'Lyricist',
-    TXX => 'UserDefinedText',
+    TXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
     TYE => { Name => 'Year', Groups => { 2 => 'Time' } },
     ULT => 'Lyrics',
     WAF => 'FileURL',
@@ -502,7 +510,7 @@ my %genre = (
     WCM => 'CommercialURL',
     WCP => { Name => 'CopyrightURL', Groups => { 2 => 'Author' } },
     WPB => 'PublisherURL',
-    WXX => 'UserDefinedURL',
+    WXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
     # the following written by iTunes 10.5 (ref PH)
     RVA => 'RelativeVolumeAdjustment',
     TST => 'TitleSortOrder',
@@ -605,7 +613,7 @@ my %id3v2_common = (
     TRSO => 'InternetRadioStationOwner',
     TSRC => 'ISRC', # (international standard recording code)
     TSSE => 'EncoderSettings',
-    TXXX => 'UserDefinedText',
+    TXXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
   # UFID => 'UniqueFileID', (not extracted because it is long and nasty and not very useful)
     USER => 'TermsOfUse',
     USLT => 'Lyrics',
@@ -617,7 +625,7 @@ my %id3v2_common = (
     WORS => 'InternetRadioStationURL',
     WPAY => 'PaymentURL',
     WPUB => 'PublisherURL',
-    WXXX => 'UserDefinedURL',
+    WXXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
 #
 # non-standard frames
 #
@@ -1247,7 +1255,14 @@ sub ProcessID3v2($$$)
             # two encoded strings separated by a null
             my @vals = DecodeString($et, $val);
             foreach (0..1) { $vals[$_] = '' unless defined $vals[$_]; }
-            ($val = "($vals[0]) $vals[1]") =~ s/^\(\) //;
+            $vals[0] .= ' ' if $Image::ExifTool::specialTags{$vals[0]};
+            my $tbl = GetTagTable('Image::ExifTool::ID3::UserDefined');
+            unless (defined $$tbl{$vals[0]}) {
+                my $name = Image::ExifTool::MakeTagName($vals[0]);
+                AddTagToTable($tbl, $vals[0], $name, 1);
+            }
+            $et->HandleTag($tbl, $vals[0], $vals[1]);
+            next;
         } elsif ($id =~ /^T/ or $id =~ /^(IPL|IPLS|GP1|MVI|MVN)$/) {
             $val = DecodeString($et, $val);
         } elsif ($id =~ /^(WXX|WXXX)$/) {
@@ -1265,7 +1280,14 @@ sub ProcessID3v2($$$)
             }
             $val = DecodeString($et, $val);
             $url =~ s/\0.*//s;
-            $val = length($val) ? "($val) $url" : $url;
+            $val .= '_URL';
+            my $tbl = GetTagTable('Image::ExifTool::ID3::UserDefined');
+            unless (defined $$tbl{$val}) {
+                my $name = Image::ExifTool::MakeTagName($val);
+                AddTagToTable($tbl, $val, $name, 1);
+            }
+            $et->HandleTag($tbl, $val, $url);
+            next;
         } elsif ($id =~ /^W/) {
             $val =~ s/\0.*//s;  # truncate at null
         } elsif ($id =~ /^(COM|COMM|ULT|USLT)$/) {

package/bin/lib/Image/ExifTool/Nikon.pm

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.33';
+$VERSION = '4.34';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -13688,6 +13688,24 @@ sub ProcessNikonCaptureOffsets($$$)
     return $success;
 }
 
+#------------------------------------------------------------------------------
+# Read Nikon NKA file
+# Inputs: 0) ExifTool ref, 1) dirInfo ref
+# Returns: 1 on success
+sub ProcessNKA($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$et{RAF};
+    my $buff;
+    $raf->Read($buff, 0x35) == 0x35 or return 0;
+    my $len = unpack('x49V', $buff);
+    $raf->Read($buff, $len) == $len or return 0;
+    $et->SetFileType('NKA', 'application/x-nikon-nxstudio');
+    my %dirInfo = ( DataPt => \$buff, DataPos => 0x35 );
+    my $tagTablePtr = GetTagTable('Image::ExifTool::XMP::XML');
+    return $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
+}
+
 #------------------------------------------------------------------------------
 # Read/write Nikon MakerNotes directory
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.46';
+$VERSION = '3.47';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -2741,8 +2741,8 @@ my %binaryDataAttrs = (
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo2' },
     },{
         Name => 'AEInfo3',
-        # size: K-30=48
-        Condition => '$count == 48',
+        # size: K-30=48, K-1mkII,K-70,KP=64
+        Condition => '$count == 48 or $count == 64',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo3' },
     },{
         Name => 'AEInfoUnknown',
@@ -2972,10 +2972,14 @@ my %binaryDataAttrs = (
             ByteOrder => 'BigEndian',
         },
     }],
-    0x022b => { #PH (K-5)
+    0x022b => [{
+        Name => 'LevelInfoK3III',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfoK3III' },
+    },{ #PH (K-5)
         Name => 'LevelInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfo' },
-    },
+    }],
     # 0x022c - undef[46] (K-5)
     0x022d => { #28
         Name => 'WBLevels',
@@ -4034,7 +4038,10 @@ my %binaryDataAttrs = (
 %Image::ExifTool::Pentax::AEInfo3 = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    NOTES => 'Auto-exposure information for the K-3, K-30, K-50 and K-500.',
+    NOTES => q{
+        Auto-exposure information for the K-1mkII, K-3, K-30, K-50, K-70, K-500 and
+        KP.
+    },
     # instead of /8, should these be PentaxEv(), as in CameraSettings? - PH
     16 => {
         Name => 'AEExposureTime',
@@ -4060,6 +4067,7 @@ my %binaryDataAttrs = (
         PrintConv => 'int($val + 0.5)',
         PrintConvInv => '$val',
     },
+    # 23 - bit 0 is related to LiveView, but it isn't reliable
     28 => {
         Name => 'AEMaxAperture',
         Notes => 'val = 2**((raw-68)/16)',
@@ -4676,8 +4684,9 @@ my %binaryDataAttrs = (
 # battery grips available for:
 # BG1 (*istD), BG2 (K10D/K20D), BG3 (K200D), BG4 (K-7,K-5)
 # no grip available: K-x
-    0.1 => { #19
+    0.1 => [{ #19
         Name => 'PowerSource',
+        Condition => '$$self{Model} !~ /K-3 Mark III/',
         Mask => 0x0f,
         # have seen the upper bit set (value of 0x82) for the
         # *istDS and K100D, but I'm not sure what this means - PH
@@ -4688,7 +4697,20 @@ my %binaryDataAttrs = (
             3 => 'Grip Battery',
             4 => 'External Power Supply', #PH
         },
-    },
+    },{ #PH
+        Name => 'PowerSource',
+        Mask => 0x0f,
+        Notes => 'K-3III',
+        # have seen the upper bit set (value of 0x82) for the
+        # *istDS and K100D, but I'm not sure what this means - PH
+        # I've also seen: 0x42 (K2000), 0xf2 (K-7,K-r,K-5), 0x12,0x22 (K-x) - PH
+        PrintConv => {
+            1 => 'Body Battery',
+            2 => 'Grip Battery',
+            4 => 'External Power Supply',
+        },
+    },{
+    }],
     1.1 => [
         {
             Name => 'BodyBatteryState',
@@ -4703,8 +4725,8 @@ my %binaryDataAttrs = (
             },
         },{
             Name => 'BodyBatteryState',
-            Condition => '$$self{Model} !~ /(K110D|K2000|K-m)\b/',
-            Notes => 'other models except the K110D, K2000 and K-m',
+            Condition => '$$self{Model} !~ /(K110D|K2000|K-m|K-3 Mark III)\b/',
+            Notes => 'most other models except the K110D, K2000, K-m and K-3III',
             Mask => 0xf0,
             PrintConv => {
                  1 => 'Empty or Missing',
@@ -4715,7 +4737,8 @@ my %binaryDataAttrs = (
             },
         },{
             Name => 'BodyBatteryState',
-            Notes => 'decoding unknown for other models',
+            Notes => 'decoding unknown for some models',
+            Unknown => 1, # (doesn't appear to be valid for the K-3 III)
             Mask => 0xf0,
         },
     ],
@@ -4758,7 +4781,7 @@ my %binaryDataAttrs = (
         },
         {
             Name => 'BodyBatteryVoltage1', # (static?)
-            Condition => '$$self{Model} !~ /(K100D|K110D|K2000|K-m|Q\d*)\b/',
+            Condition => '$$self{Model} =~ /(645D|645Z|K-(1|01|3|5|7|30|50|70|500|r|x|S[12])|KP)\b/ and $$self{Model} !~ /III/',
             Format => 'int16u',
             ValueConv => '$val / 100',
             ValueConvInv => '$val * 100',
@@ -4797,7 +4820,7 @@ my %binaryDataAttrs = (
         },
         {
             Name => 'BodyBatteryVoltage2', # (less than BodyBatteryVoltage1 -- under load?)
-            Condition => '$$self{Model} !~ /(K100D|K110D|K2000|K-m|Q\d*)\b/',
+            Condition => '$$self{Model} =~ /(645D|645Z|K-(1|01|3|5|7|30|50|70|500|r|x|S[12])|KP)\b/ and $$self{Model} !~ /III/',
             Format => 'int16u',
             ValueConv => '$val / 100',
             ValueConvInv => '$val * 100',
@@ -4940,6 +4963,12 @@ my %binaryDataAttrs = (
             20 => 'Mid-right',
         },
     },
+    0x1fa => {
+        Name => 'LiveView',
+        Notes => 'decoded only for the K-3 III',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # and other models?
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
     0x1fd => {
         Name => 'AFHold',
         Notes => 'decoded only for the K-3 II',
@@ -5006,6 +5035,10 @@ my %binaryDataAttrs = (
             1 => 'As EV Steps',
         },
     },
+    3 => { #PH
+        Name => 'LiveView',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
 );
 
 # shot information? - ref PH (K-5)
@@ -5483,6 +5516,24 @@ my %binaryDataAttrs = (
     },
 );
 
+%Image::ExifTool::Pentax::LevelInfoK3III = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FORMAT => 'int8s',
+    NOTES => 'Tags decoded from the electronic level information for the K-3 III.',
+    3 => {
+        Name => 'RollAngle',
+        Format => 'int16s',
+        ValueConv => '-$val / 2',
+        ValueConvInv => '-$val * 2',
+    },
+    5 => {
+        Name => 'PitchAngle',
+        Format => 'int16s',
+        ValueConv => '-$val / 2',
+        ValueConvInv => '-$val * 2',
+    },
+);
 # white balance RGGB levels (ref 28)
 %Image::ExifTool::Pentax::WBLevels = (
     %binaryDataAttrs,

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

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.96';
+$VERSION = '2.97';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -2332,6 +2332,16 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Binary => 1,
     }],
     # ---- Ricoh ----
+    RICO => { #PH (G900SE)
+        Name => 'RicohInfo',
+        Condition => '$$valPt =~ /^\xff\xe1..Exif\0\0/s',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+            Start => 10,
+            Base => '$start',
+        }
+    },
     RTHU => { #PH (GR)
         Name => 'PreviewImage',
         Groups => { 2 => 'Preview' },
@@ -2929,8 +2939,12 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Format => 'int8u',
         Writable => 'int8u',
         Protected => 1,
-        ValueConv => '$val * 90',
-        ValueConvInv => 'int($val / 90 + 0.5)',
+        PrintConv => {
+            0 => 'Horizontal (Normal)',
+            1 => 'Rotate 270 CW',
+            2 => 'Rotate 180',
+            3 => 'Rotate 90 CW',
+        },
     },
     ispe => {
         Name => 'ImageSpatialExtent',
@@ -3425,7 +3439,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::iTunesInfo' },
     },
     aART => { Name => 'AlbumArtist', Groups => { 2 => 'Author' } },
-    covr => { Name => 'CoverArt',    Groups => { 2 => 'Preview' } },
+    covr => { Name => 'CoverArt',    Groups => { 2 => 'Preview' }, Binary => 1 },
     cpil => { #10
         Name => 'Compilation',
         Format => 'int8u', #27 (ref 23 contradicts what AtomicParsley actually writes, which is int8s)
@@ -6497,8 +6511,8 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     ownr => 'Owner', #PH (obscure) (ref ChrisAdan private communication)
     'xid ' => 'ISRC', #PH
     # found in DJI Osmo Action4 video
-    tnal => { Name => 'ThumbnailImage',  Groups => { 2 => 'Preview' } },
-    snal => { Name => 'PreviewImage',    Groups => { 2 => 'Preview' } },
+    tnal => { Name => 'ThumbnailImage',  Binary => 1, Groups => { 2 => 'Preview' } },
+    snal => { Name => 'PreviewImage',    Binary => 1, Groups => { 2 => 'Preview' } },
 );
 
 # tag decoded from timed face records
@@ -8255,8 +8269,8 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     GROUPS => { 2 => 'Video' },
     Rotation => {
         Notes => q{
-            writing this tag updates QuickTime MatrixStructure for all tracks with a
-            non-zero image size
+            degrees of clockwise camera rotation. Writing this tag updates QuickTime
+            MatrixStructure for all tracks with a non-zero image size
         },
         Require => {
             0 => 'QuickTime:MatrixStructure',
@@ -9758,7 +9772,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             }
             # use value to get tag info if necessary
             $tagInfo or $tagInfo = $et->GetTagInfo($tagTablePtr, $tag, \$val);
-            my $hasData = ($$dirInfo{HasData} and $val =~ /\0...data\0/s);
+            my $hasData = ($$dirInfo{HasData} and $val =~ /^....data\0/s);
             if ($verbose and not $hasData) {
                 my $tval;
                 if ($tagInfo and $$tagInfo{Format}) {