exiftool-vendored.pl 12.85.0 → 12.89.0

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

@@ -1212,9 +1212,9 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
             4 => 'Emphasize Center',
         },
     },
+    0x2070b => { Name => 'DiffractionCorrectionOn', %noYes },
     # 0x20800 - fmt=1: 0
     # 0x20801 - fmt=1: 0
-    0x2070b => { Name => 'DiffractionCorrectionOn', %noYes },
     0x20900 => 'ColorHue',
     0x20901 => 'SaturationAdj',
     0x20910 => 'RedHSL',
@@ -1282,6 +1282,9 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     # 0xf0521 - DLO data
     # 0xf0520 - DLO data
     # 0xf0530 - created when dust delete data applied (4 bytes, all zero)
+    # 0xf0561 - 1932 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
+    # 0xf0562 - 1596 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
+    # 0xf0566 - 1520 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
     # 0xf0600 - fmt=253 (2308 bytes, JPG images)
     # 0xf0601 - fmt=253 (2308 bytes, JPG images)
     # 0x1ff52c - values: 129,130,132 (related to custom picture style somehow)
@@ -1303,7 +1306,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     # 2 - value: 6
     3 => {
         Name => 'DR4CameraModel',
-        Writable => 'int32u',
+        Format => 'int32u',
         PrintHex => 1,
         SeparateTable => 'Canon CanonModelID',
         PrintConv => \%Image::ExifTool::Canon::canonModelID,

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.94';
+$VERSION = '1.95';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -1169,6 +1169,46 @@ my %faceCategories = (
     Face8Birthday => { },
 );
 
+# tags extracted from RAF header
+%Image::ExifTool::FujiFilm::RAFHeader = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'RAF', 1 => 'RAF', 2 => 'Image' },
+    NOTES => 'Tags extracted from the header of RAF images.',
+  # 0x00 - eg. "FUJIFILMCCD-RAW 0201FA392001FinePix S3Pro"
+    0x3c => { #PH
+        Name => 'RAFVersion',
+        Format => 'undef[4]',
+    },
+    # (all int32u values)
+  # 0x40 - 1 for M-RAW, 0 otherwise?
+  # 0x44 - high word of M-RAW offset? (only seen zero)
+  # 0x48 - M-RAW header offset
+  # 0x4c - M-RAW header length
+  # 0x50 - ? (only seen zero)
+  # 0x54 - JPEG offset
+  # 0x58 - JPEG length
+  # 0x5c - RAF directory offset
+  # 0x60 - RAF directory length
+  # 0x64 - FujiIFD dir offset
+  # 0x68 - FujiIFD dir length
+  # 0x6c - RAFCompression or JPEG start
+    0x6c => { #10
+        Name => 'RAFCompression',
+        Condition => '$$valPt =~ /^\0\0\0/', # (JPEG header is in this location for some RAF versions)
+        Format => 'int32u',
+        PrintConv => { 0 => 'Uncompressed', 2 => 'Lossless', 3 => 'Lossy'  },
+    },
+  # 0x70 - ? same as 0x68?
+  # 0x74 - ? usually 0, but have seen 0x1700
+  # 0x78 - RAF1 dir offset
+  # 0x7c - RAF1 dir length
+  # 0x80 - FujiIFD1 dir offset
+  # 0x84 - FujiIFD1 dir length
+  # 0x88-0x8c - always zero?
+  # 0x90 - ? same as 0x74?
+  # 0x94 - JPEG or M-RAW start
+);
+
 # tags in RAF images (ref 5)
 %Image::ExifTool::FujiFilm::RAF = (
     PROCESS_PROC => \&ProcessFujiDir,
@@ -1797,7 +1837,7 @@ sub ProcessRAF($$)
     my ($buff, $jpeg, $warn, $offset);
 
     my $raf = $$dirInfo{RAF};
-    $raf->Read($buff,0x5c) == 0x5c    or return 0;
+    $raf->Read($buff,0x70) == 0x70    or return 0;
     $buff =~ /^FUJIFILM/              or return 0;
     # get position and size of M-RAW header and jpeg preview
     my ($mpos, $mlen) = unpack('x72NN', $buff);
@@ -1807,9 +1847,11 @@ sub ProcessRAF($$)
         $raf->Seek($jpos, 0)              or return 0;
         $raf->Read($jpeg, $jlen) == $jlen or return 0;
     }
+    SetByteOrder('MM');
     $et->SetFileType();
-    $et->FoundTag('RAFVersion', substr($buff, 0x3c, 4));
-
+    my $tbl = GetTagTable('Image::ExifTool::FujiFilm::RAFHeader');
+    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader' }, $tbl);
+    
     # extract information from embedded JPEG
     my %dirInfo = (
         Parent => 'RAF',

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

@@ -509,6 +509,12 @@ sub Geolocate($;$)
             $city = '' unless defined $city;
         } elsif (/^[-+]?\d+(\.\d+)?$/) {    # coordinate format
             push @coords, $_ if @coords < 2;
+        } elsif (/^([-+]?\d+(?:\.\d+)?) *(([NS])[A-Z]*)? +([-+]?\d+(?:\.\d+)?) *(([EW])[A-Z]*)?/i) { # "lat lon" format
+            next if @coords;
+            my ($lat, $lon) = ($1, $4);
+            $lat = -abs($lat) if $3 and uc($3) eq 'S';
+            $lon = -abs($lon) if $6 and uc($6) eq 'W';
+            push @coords, $lat, $lon;
         } elsif (lc $_ eq 'both') {
             $both = 1;
         } elsif ($_ =~ /^num=(\d+)$/i) {

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.61';
+$VERSION = '1.62';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -68,6 +68,12 @@ my %dateTimeConv = (
     PrintConv => '$self->ConvertDateTime($val)',
 );
 
+# patch for names of user-defined tags which don't automatically generate very well
+my %userTagName = (
+    ALBUMARTISTSORT => 'AlbumArtistSort',
+    ASIN => 'ASIN',
+);
+
 # This table is just for documentation purposes
 %Image::ExifTool::ID3::Main = (
     VARS => { NO_ID => 1 },
@@ -103,14 +109,6 @@ 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' },
@@ -501,7 +499,7 @@ my %genre = (
     TT2 => 'Title',
     TT3 => 'Subtitle',
     TXT => 'Lyricist',
-    TXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
+    TXX => 'UserDefinedText',
     TYE => { Name => 'Year', Groups => { 2 => 'Time' } },
     ULT => 'Lyrics',
     WAF => 'FileURL',
@@ -510,7 +508,7 @@ my %genre = (
     WCM => 'CommercialURL',
     WCP => { Name => 'CopyrightURL', Groups => { 2 => 'Author' } },
     WPB => 'PublisherURL',
-    WXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
+    WXX => 'UserDefinedURL',
     # the following written by iTunes 10.5 (ref PH)
     RVA => 'RelativeVolumeAdjustment',
     TST => 'TitleSortOrder',
@@ -613,7 +611,7 @@ my %id3v2_common = (
     TRSO => 'InternetRadioStationOwner',
     TSRC => 'ISRC', # (international standard recording code)
     TSSE => 'EncoderSettings',
-    TXXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
+    TXXX => 'UserDefinedText',
   # UFID => 'UniqueFileID', (not extracted because it is long and nasty and not very useful)
     USER => 'TermsOfUse',
     USLT => 'Lyrics',
@@ -625,7 +623,7 @@ my %id3v2_common = (
     WORS => 'InternetRadioStationURL',
     WPAY => 'PaymentURL',
     WPUB => 'PublisherURL',
-    WXXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
+    WXXX => 'UserDefinedURL',
 #
 # non-standard frames
 #
@@ -879,6 +877,19 @@ Image::ExifTool::AddCompositeTags('Image::ExifTool::ID3');
     }
 }
 
+#------------------------------------------------------------------------------
+# Make tag name for user-defined tag
+# Inputs: 0) User defined tag description
+# Returns: Tag name
+sub MakeTagName($)
+{
+    my $name = shift;
+    return $userTagName{$name} if $userTagName{$name};
+    $name = ucfirst(lc $name) unless $name =~ /[a-z]/;  # convert all uppercase to mixed case
+    $name =~ s/([a-z])[_ ]([a-z])/$1\U$2/g;
+    return Image::ExifTool::MakeTagName($name);
+}
+
 #------------------------------------------------------------------------------
 # Convert ID3v1 text to exiftool character set
 # Inputs: 0) ExifTool object ref, 1) text string
@@ -1255,39 +1266,34 @@ sub ProcessID3v2($$$)
             # two encoded strings separated by a null
             my @vals = DecodeString($et, $val);
             foreach (0..1) { $vals[$_] = '' unless defined $vals[$_]; }
-            $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);
+            if (length $vals[0]) {
+                $id .= "_$vals[0]";
+                $tagInfo = $$tagTablePtr{$id} || AddTagToTable($tagTablePtr, $id, MakeTagName($vals[0]));
             }
-            $et->HandleTag($tbl, $vals[0], $vals[1]);
-            next;
+            $val = $vals[1];
         } elsif ($id =~ /^T/ or $id =~ /^(IPL|IPLS|GP1|MVI|MVN)$/) {
             $val = DecodeString($et, $val);
         } elsif ($id =~ /^(WXX|WXXX)$/) {
             # one encoded string and one Latin string separated by a null
             my $enc = unpack('C', $val);
-            my $url;
+            my ($tag, $url);
             if ($enc == 1 or $enc == 2) {
-                ($val, $url) = ($val =~ /^(.(?:..)*?)\0\0(.*)/s);
+                ($tag, $url) = ($tag =~ /^(.(?:..)*?)\0\0(.*)/s);
             } else {
-                ($val, $url) = ($val =~ /^(..*?)\0(.*)/s);
+                ($tag, $url) = ($tag =~ /^(..*?)\0(.*)/s);
             }
-            unless (defined $val and defined $url) {
+            unless (defined $tag and defined $url) {
                 $et->Warn("Invalid $id frame value");
                 next;
             }
-            $val = DecodeString($et, $val);
-            $url =~ s/\0.*//s;
-            $val .= '_URL';
-            my $tbl = GetTagTable('Image::ExifTool::ID3::UserDefined');
-            unless (defined $$tbl{$val}) {
-                my $name = Image::ExifTool::MakeTagName($val);
-                AddTagToTable($tbl, $val, $name, 1);
+            $tag = DecodeString($et, $tag);
+            if (length $tag) {
+                $id .= "_$tag";
+                $tag .= '_URL' unless $tag =~ /url/i;
+                $tagInfo = $$tagTablePtr{$id} || AddTagToTable($tagTablePtr, $id, MakeTagName($tag));
             }
-            $et->HandleTag($tbl, $val, $url);
-            next;
+            $url =~ s/\0.*//s;
+            $val = $url;
         } elsif ($id =~ /^W/) {
             $val =~ s/\0.*//s;  # truncate at null
         } elsif ($id =~ /^(COM|COMM|ULT|USLT)$/) {

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # map for writing metadata to InDesign files (currently only write XMP)
 my %indMap = (
@@ -73,9 +73,13 @@ sub ProcessIND($$)
     my $pages = Get32u($curPage, 280);
     $pages < 2 and $err = 'Invalid page count', goto DONE;
     my $pos = $pages * 4096;
-    if ($pos > 0x7fffffff and not $et->Options('LargeFileSupport')) {
-        $err = 'InDesign files larger than 2 GB not supported (LargeFileSupport not set)';
-        goto DONE;
+    if ($pos > 0x7fffffff) {
+        if (not $et->Options('LargeFileSupport')) {
+            $err = 'InDesign files larger than 2 GB not supported (LargeFileSupport not set)';
+            goto DONE;
+        } elsif ($et->Options('LargeFileSupport') eq '2') {
+            $et->WarnOnce('Processing large file (LargeFileSupport is 2)');
+        }
     }
     if ($outfile) {
         # make XMP the preferred group for writing

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

@@ -727,7 +727,6 @@ my %j2cMarker = (
         {
             Name => 'ColorSpecData',
             Format => 'undef[$size-3]',
-            Writable => 'undef',
             Protected => 1,
             Binary => 1,
         },

package/bin/lib/Image/ExifTool/Lang/de.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::de;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.36';
+$VERSION = '1.37';
 
 %Image::ExifTool::Lang::de::Translate = (
    'AEAperture' => 'AE-Blende',
@@ -5118,7 +5118,7 @@ $VERSION = '1.36';
    'LensMake' => 'Objektivhersteller',
    'LensManufacturer' => 'Objektivhersteller',
    'LensMaxApertureRange' => 'Objektiv Blendenbereich',
-   'LensModel' => 'Objektiv-Typ',
+   'LensModel' => 'Objektivmodell',
    'LensProfileDigest' => 'Kennwert des Objektivprofils',
    'LensProperties' => 'Objektivfunktionen?',
    'LensSerialNumber' => 'Objektiv-Seriennummer',

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.15';
+$VERSION = '1.16';
 
 sub HandleStruct($$;$$$$);
 
@@ -44,7 +44,8 @@ my %uidInfo = (
     NOTES => q{
         The following tags are extracted from Matroska multimedia container files. 
         This container format is used by file types such as MKA, MKV, MKS and WEBM. 
-        For speed, by default ExifTool extracts tags only up to the first Cluster.
+        For speed, by default ExifTool extracts tags only up to the first Cluster
+        unless a Seek element specifies the position of a Tags element after this.
         However, the L<Verbose|../ExifTool.html#Verbose> (-v) and L<Unknown|../ExifTool.html#Unknown> = 2 (-U) options force processing of
         Cluster data, and the L<ExtractEmbedded|../ExifTool.html#ExtractEmbedded> (-ee) option skips over Clusters to
         read subsequent tags.  See
@@ -112,8 +113,25 @@ my %uidInfo = (
         Name => 'Seek',
         SubDirectory => { TagTable => 'Image::ExifTool::Matroska::Main' },
     },
-    0x13ab => { Name => 'SeekID',           Binary => 1, Unknown => 1 },
-    0x13ac => { Name => 'SeekPosition',     Format => 'unsigned', Unknown => 1 },
+    0x13ab => {
+        Name => 'SeekID',
+        Unknown => 1,
+        SeekInfo => 'ID',       # save seek ID's
+        # (note: converted from VInt internally)
+        PrintConv => q{
+            my $tagInfo = $Image::ExifTool::Matroska::Main{$val};
+            $val = sprintf('0x%x', $val);
+            $val .= " ($$tagInfo{Name})" if ref $tagInfo eq 'HASH' and $$tagInfo{Name};
+            return $val;
+        },
+    },
+    0x13ac => {
+        Name => 'SeekPosition',
+        Format => 'unsigned',
+        Unknown => 1,
+        SeekInfo => 'Position', # save seek positions
+        RawConv => '$val + $$self{SeekHeadOffset}',
+    },
 #
 # Segment Info
 #
@@ -350,8 +368,9 @@ my %uidInfo = (
         Name => 'VideoScanType',
         Format => 'unsigned',
         PrintConv => {
-            0 => 'Progressive',
+            0 => 'Undetermined',
             1 => 'Interlaced',
+            2 => 'Progressive',
         },
     },
     0x13b8 => {
@@ -893,6 +912,7 @@ sub HandleStruct($$;$$$$)
 # Inputs: 0) data buffer, 1) position in data
 # Returns: integer value and updates position, -1 for unknown/reserved value,
 #          or undef if no data left
+# Notes: Increments position pointer
 sub GetVInt($$)
 {
     return undef if $_[1] >= length $_[0];
@@ -929,7 +949,7 @@ sub ProcessMKV($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, @dirEnd, $trackIndent, %trackTypes, $struct);
+    my ($buff, $buf2, @dirEnd, $trackIndent, %trackTypes, $struct, %seekInfo, %seek);
 
     $raf->Read($buff, 4) == 4 or return 0;
     return 0 unless $buff =~ /^\x1a\x45\xdf\xa3/;
@@ -952,6 +972,7 @@ sub ProcessMKV($$)
     my $processAll = ($verbose or $et->Options('Unknown') > 1) ? 2 : 0;
     ++$processAll if $et->Options('ExtractEmbedded');
     $$et{TrackTypes} = \%trackTypes;  # store Track types reference
+    $$et{SeekHeadOffset} = 0;
     my $oldIndent = $$et{INDENT};
     my $chapterNum = 0;
     my $dirName = 'MKV';
@@ -960,6 +981,16 @@ sub ProcessMKV($$)
     for (;;) {
         while (@dirEnd) {
             if ($pos + $dataPos >= $dirEnd[-1][0]) {
+                if ($dirEnd[-1][1] eq 'Seek') {
+                    # save seek info
+                    if (defined $seekInfo{ID} and defined $seekInfo{Position}) {
+                        my $seekTag = $$tagTablePtr{$seekInfo{ID}};
+                        if (ref $seekTag eq 'HASH' and $$seekTag{Name}) {
+                            $seek{$$seekTag{Name}} = $seekInfo{Position} + $$et{SeekHeadOffset};
+                        }
+                    }
+                    undef %seekInfo;
+                }
                 pop @dirEnd;
                 if ($struct) {
                     if (@dirEnd and $dirEnd[-1][2]) {
@@ -993,9 +1024,10 @@ sub ProcessMKV($$)
         }
         my $tag = GetVInt($buff, $pos);
         last unless defined $tag and $tag >= 0;
+        $$et{SeekHeadOffset} = $pos if $tag == 0x14d9b74;   # save offset of seek head
         my $size = GetVInt($buff, $pos);
         last unless defined $size;
-        my $unknownSize;
+        my ($unknownSize, $seekInfoOnly);
         $size < 0 and $unknownSize = 1, $size = 1e20;
         if (@dirEnd and $pos + $dataPos + $size > $dirEnd[-1][0]) {
             $et->Warn("Invalid or corrupted $dirEnd[-1][1] master element");
@@ -1010,14 +1042,28 @@ sub ProcessMKV($$)
             next;
         }
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-        # just fall through into the contained EBML elements
+        if (not $tagInfo and ref $$tagTablePtr{$tag} eq 'HASH' and $$tagTablePtr{$tag}{SeekInfo}) {
+            $tagInfo = $$tagTablePtr{$tag};
+            $seekInfoOnly = 1;
+        }
         if ($tagInfo) {
             if ($$tagInfo{SubDirectory}) {
                 # stop processing at first cluster unless we are using -v -U or -ee
+                # or there are Tags after this
                 if ($$tagInfo{Name} eq 'Cluster' and $processAll < 2) {
-                    last unless $processAll;
+                    # jump to Tags if possible
+                    unless ($processAll) {
+                        if ($seek{Tags} and $seek{Tags} > $pos + $dataPos and $raf->Seek($seek{Tags},0)) {
+                            $buff = '';
+                            $dataPos = $seek{Tags};
+                            $pos = $dataLen = 0;
+                            next;
+                        }
+                        last;
+                    }
                     undef $tagInfo; # just skip the Cluster when -ee is used
                 } else {
+                    # just fall through into the contained EBML elements
                     $$et{INDENT} .= '| ';
                     $et->VerboseDir($$tagTablePtr{$tag}{Name}, undef, $size);
                     $dirName = $$tagInfo{Name};
@@ -1040,7 +1086,12 @@ sub ProcessMKV($$)
             # just skip unknown and large data blocks
             if (not $tagInfo or $more > 10000000) {
                 # don't try to skip very large blocks unless LargeFileSupport is enabled
-                last if $more >= 0x80000000 and not $et->Options('LargeFileSupport');
+                if ($more >= 0x80000000) {
+                    last unless $et->Options('LargeFileSupport');
+                    if ($et->Options('LargeFileSupport') eq '2') {
+                        $et->WarnOnce('Processing large block (LargeFileSupport is 2)');
+                    }
+                }
                 $raf->Seek($more, 1) or last;
                 $buff = '';
                 $dataPos += $dataLen + $more;
@@ -1118,6 +1169,11 @@ sub ProcessMKV($$)
         if ($$tagInfo{NoSave} or $struct) {
             $et->VerboseInfo($tag, $tagInfo, Value => $val, %parms) if $verbose;
             $$struct{$$tagInfo{Name}} = $val if $struct;
+        } elsif ($$tagInfo{SeekInfo}) {
+            my $p = $pos;
+            $val = GetVInt($buff, $p) unless defined $val;
+            $seekInfo{$$tagInfo{SeekInfo}} = $val;
+            $et->HandleTag($tagTablePtr, $tag, $val, %parms) unless $seekInfoOnly;
         } else {
             $et->HandleTag($tagTablePtr, $tag, $val, %parms);
         }

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

@@ -203,13 +203,13 @@ sub WriteMRW($$;$);
             Name => 'ColorMode',
             Condition => '$$self{Make} !~ /^SONY/',
             Priority => 0,
-            Writable => 'int32u',
+            Writable => 1,
             PrintConv => \%Image::ExifTool::Minolta::minoltaColorMode,
         },
         { #3
             Name => 'ColorMode',
             Condition => '$$self{Model} eq "DSLR-A100"',
-            Writable => 'int32u',
+            Writable => 1,
             Notes => 'Sony A100',
             Priority => 0,
             PrintHex => 1,

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.34';
+$VERSION = '4.35';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -720,6 +720,7 @@ sub GetAFPointGrid($$;$);
     '9A 4C 50 50 14 14 9C 06' => 'Yongnuo YN50mm F1.8N',
     '9F 48 48 48 24 24 A1 06' => 'Yongnuo YN40mm F2.8N', #30
     '9F 54 68 68 18 18 A2 06' => 'Yongnuo YN100mm F2N', #30
+    '9F 4C 44 44 18 18 A1 06' => 'Yongnuo YN35mm F2', #30
 #
     '02 40 44 5C 2C 34 02 00' => 'Exakta AF 35-70mm 1:3.5-4.5 MC',
 #
@@ -11710,7 +11711,7 @@ my %nikonFocalConversions = (
     },
     10 => {
         Name => 'NEFCompression',
-        Writable => 'int16u',
+        Format => 'int16u',
         SeparateTable => 'NEFCompression',
         PrintConv => \%nefCompression,
     },

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

@@ -1935,6 +1935,7 @@ my %indexInfo = (
             3 => 'Trains',
             4 => 'Birds',
             5 => 'Dogs & Cats',
+            6 => 'Human', #forum16072
         },{
             0 => 'Object Not Found',
             1 => 'Object Found',
@@ -2842,24 +2843,32 @@ my %indexInfo = (
         RawConv => '$val=~s/\0+$//; $val',  # (may be null terminated)
         Count => 4,
     },
-    0x100 => { Name => 'WB_RBLevels',       Writable => 'int16u', Count => 2 }, #6
+    0x100 => {  #6
+        Name => 'WB_RBLevels',
+        Writable => 'int16u',
+        Notes => q{
+            These tags store 2 values, red and blue levels, for some models, but 4
+            values, presumably RBGG levels, for other models
+        },
+        Count => -1,
+    }, #6
     # 0x101 - in-camera AutoWB unless it is all 0's or all 256's (ref IB)
-    0x102 => { Name => 'WB_RBLevels3000K',  Writable => 'int16u', Count => 2 }, #11
-    0x103 => { Name => 'WB_RBLevels3300K',  Writable => 'int16u', Count => 2 }, #11
-    0x104 => { Name => 'WB_RBLevels3600K',  Writable => 'int16u', Count => 2 }, #11
-    0x105 => { Name => 'WB_RBLevels3900K',  Writable => 'int16u', Count => 2 }, #11
-    0x106 => { Name => 'WB_RBLevels4000K',  Writable => 'int16u', Count => 2 }, #11
-    0x107 => { Name => 'WB_RBLevels4300K',  Writable => 'int16u', Count => 2 }, #11
-    0x108 => { Name => 'WB_RBLevels4500K',  Writable => 'int16u', Count => 2 }, #11
-    0x109 => { Name => 'WB_RBLevels4800K',  Writable => 'int16u', Count => 2 }, #11
-    0x10a => { Name => 'WB_RBLevels5300K',  Writable => 'int16u', Count => 2 }, #11
-    0x10b => { Name => 'WB_RBLevels6000K',  Writable => 'int16u', Count => 2 }, #11
-    0x10c => { Name => 'WB_RBLevels6600K',  Writable => 'int16u', Count => 2 }, #11
-    0x10d => { Name => 'WB_RBLevels7500K',  Writable => 'int16u', Count => 2 }, #11
-    0x10e => { Name => 'WB_RBLevelsCWB1',   Writable => 'int16u', Count => 2 }, #11
-    0x10f => { Name => 'WB_RBLevelsCWB2',   Writable => 'int16u', Count => 2 }, #11
-    0x110 => { Name => 'WB_RBLevelsCWB3',   Writable => 'int16u', Count => 2 }, #11
-    0x111 => { Name => 'WB_RBLevelsCWB4',   Writable => 'int16u', Count => 2 }, #11
+    0x102 => { Name => 'WB_RBLevels3000K',  Writable => 'int16u', Count => -1 }, #11
+    0x103 => { Name => 'WB_RBLevels3300K',  Writable => 'int16u', Count => -1 }, #11
+    0x104 => { Name => 'WB_RBLevels3600K',  Writable => 'int16u', Count => -1 }, #11
+    0x105 => { Name => 'WB_RBLevels3900K',  Writable => 'int16u', Count => -1 }, #11
+    0x106 => { Name => 'WB_RBLevels4000K',  Writable => 'int16u', Count => -1 }, #11
+    0x107 => { Name => 'WB_RBLevels4300K',  Writable => 'int16u', Count => -1 }, #11
+    0x108 => { Name => 'WB_RBLevels4500K',  Writable => 'int16u', Count => -1 }, #11
+    0x109 => { Name => 'WB_RBLevels4800K',  Writable => 'int16u', Count => -1 }, #11
+    0x10a => { Name => 'WB_RBLevels5300K',  Writable => 'int16u', Count => -1 }, #11
+    0x10b => { Name => 'WB_RBLevels6000K',  Writable => 'int16u', Count => -1 }, #11
+    0x10c => { Name => 'WB_RBLevels6600K',  Writable => 'int16u', Count => -1 }, #11
+    0x10d => { Name => 'WB_RBLevels7500K',  Writable => 'int16u', Count => -1 }, #11
+    0x10e => { Name => 'WB_RBLevelsCWB1',   Writable => 'int16u', Count => -1 }, #11
+    0x10f => { Name => 'WB_RBLevelsCWB2',   Writable => 'int16u', Count => -1 }, #11
+    0x110 => { Name => 'WB_RBLevelsCWB3',   Writable => 'int16u', Count => -1 }, #11
+    0x111 => { Name => 'WB_RBLevelsCWB4',   Writable => 'int16u', Count => -1 }, #11
     0x113 => { Name => 'WB_GLevel3000K',    Writable => 'int16u' }, #11
     0x114 => { Name => 'WB_GLevel3300K',    Writable => 'int16u' }, #11
     0x115 => { Name => 'WB_GLevel3600K',    Writable => 'int16u' }, #11
@@ -3246,6 +3255,7 @@ my %indexInfo = (
                     3 => 'Trains',
                     4 => 'Birds',
                     5 => 'Dogs & Cats',
+                    6 => 'Human', #forum16072
                 },{
                     0 => 'Face Priority',
                     1 => 'Target Priority',

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

@@ -366,6 +366,7 @@ my %shootingMode = (
                 '32 1'  => '3-area (left)?', # (DMC-L1 guess)
                 '32 2'  => '3-area (center)?', # (DMC-L1 guess)
                 '32 3'  => '3-area (right)?', # (DMC-L1 guess)
+                # '32 16' ? (DC-GH6)
                 '64 0'  => 'Face Detect',
                 '64 1' => 'Face Detect (animal detect on)', #forum11194
                 '64 2' => 'Face Detect (animal detect off)', #forum11194

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

@@ -218,6 +218,7 @@ my %panasonicWhiteBalance = ( #forum9396
     0x30 => { Name => 'CropLeft',   Writable => 'int16u' },
     0x31 => { Name => 'CropBottom', Writable => 'int16u' },
     0x32 => { Name => 'CropRight',  Writable => 'int16u' },
+    0x37 => { Name => 'ISO',        Writable => 'int32u' },
     # 0x44 - may contain another pointer to the raw data starting at byte 2 in this data (DC-GH6)
     0x10f => {
         Name => 'Make',