exiftool_vendored 12.86.0 → 12.92.0

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

@@ -562,7 +562,7 @@ sub BuildMakerNotes($$$$$$);
     3 => {
         Name => 'Rotation',
         Format => 'int32s',
-        Writable => 'int32s',
+        Writable => 1,
     },
     4 => 'ComponentBitDepth', #3
     5 => 'ColorBitDepth', #3

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

@@ -1306,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,

data/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',

data/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) {

data/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

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

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

data/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',

data/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);
         }

data/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,

data/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.36';
 
 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',
 #
@@ -2494,6 +2495,7 @@ my %base64coord = (
         { # D7100=0227
             Condition => '$$valPt =~ /^0[28]/',
             Name => 'ShotInfo02xx',
+            Drop => 50000, # drop if too large (>64k for Z6iii)
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfo',
                 ProcessProc => \&ProcessNikonEncrypted,
@@ -5634,6 +5636,38 @@ my %nikonFocalConversions = (
         Notes => 'P6000',
         PrintConv => \%offOn,
     },
+    # for Nikon Z6iii JPG and RAW images (version 0809),
+    # the offset table starts at 0x24 and is as follows
+    # JPG Offset Size    NEF Offset Size
+    #  0) 0x0000 0        0) 0x009c 21604
+    #  1) 0x0000 0        1) 0x5500 6008
+    #  2) 0x009c 2528     2) 0x6c78 2528
+    #  3) 0x0a7c 200      3) 0x7658 200
+    #  4) 0x0b44 2488     4) 0x7720 2488
+    #  5) 0x14fc 1468     5) 0x80d8 1468
+    #  6) 0x1ab8 1032     6) 0x8694 1032
+    #  7) 0x1ec0 256      7) 0x8a9c 256
+    #  8) 0x1fc0 800      8) 0x8b9c 800
+    #  9) 0x22e0 144      9) 0x8ebc 144
+    # 10) 0x2370 64      10) 0x8f4c 64
+    # 11) 0x0000 0       11) 0x0000 0
+    # 12) 0x23b0 5009    12) 0x8f8c 5009
+    # 13) 0x3741 1536    13) 0xa31d 1536
+    # 14) 0x3d41 11928   14) 0xa91d 11928
+    # 15) 0x6bd9 5937    15) 0xd7b5 5937
+    # 16) 0x830a 500     16) 0xeee6 500
+    # 17) 0x84fe 160     17) 0xf0da 160
+    # 18) 0x859e 464     18) 0xf17a 464
+    # 19) 0x876e 8       19) 0xf34a 8
+    # 20) 0x8776 64      20) 0xf352 64
+    # 21) 0x87b6 6       21) 0xf392 6
+    # 22) 0x87bc 48      22) 0xf398 48
+    # 23) 0x87ec 20      23) 0xf3c8 20
+    # 24) 0x8800 108     24) 0xf3dc 108
+    # 25) 0x886c 8       25) 0xf448 8
+    # 26) 0x8874 2420    26) 0xf450 2420
+    # 27) 0x0000 0       27) 0x0000 0
+    # 28) 0x0000 0       28) 0x0000 0
     0x66 => {
         Name => 'VR_0x66',
         Condition => '$$self{ShotInfoVersion} eq "0204"',
@@ -11710,7 +11744,7 @@ my %nikonFocalConversions = (
     },
     10 => {
         Name => 'NEFCompression',
-        Writable => 'int16u',
+        Format => 'int16u',
         SeparateTable => 'NEFCompression',
         PrintConv => \%nefCompression,
     },

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.67';
+$VERSION = '1.68';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -1400,7 +1400,7 @@ sub ProcessPNG($$)
     my $fastScan = $et->Options('FastScan');
     my $hash = $$et{ImageDataHash};
     my ($n, $sig, $err, $hbuf, $dbuf, $cbuf);
-    my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset);
+    my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset, $wasTrailer);
 
     # check to be sure this is a valid PNG/MNG/JNG image
     return 0 unless $raf->Read($sig,8) == 8 and $pngLookup{$sig};
@@ -1461,6 +1461,7 @@ sub ProcessPNG($$)
         if ($wasEnd) {
             last unless $n; # stop now if normal end of PNG
             $et->WarnOnce("Trailer data after $fileType $endChunk chunk", 1);
+            $wasTrailer = 1;
             last if $n < 8;
             $$et{SET_GROUP1} = 'Trailer';
         } elsif ($n != 8) {
@@ -1654,6 +1655,13 @@ sub ProcessPNG($$)
         }
     }
     delete $$et{SET_GROUP1};
+    # read Samsung trailer if it exists
+    if ($wasTrailer and not $outfile and $raf->Seek(-8, 2) and
+        $raf->Read($dbuf,8) and $dbuf =~ /\0\0(QDIOBS|SEFT)$/) # (have only seen SEFT type)
+    {
+        require Image::ExifTool::Samsung;
+        Image::ExifTool::Samsung::ProcessSamsung($et, { DirName => 'Samsung', RAF => $raf });
+    }
     return -1 if $outfile and ($err or not $wasEnd);
     return 1;   # this was a valid PNG/MNG/JNG image
 }

data/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

data/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',

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

@@ -4697,7 +4697,7 @@ my %binaryDataAttrs = (
             3 => 'Grip Battery',
             4 => 'External Power Supply', #PH
         },
-    },{ #PH
+    },{ #PH (forum15976)
         Name => 'PowerSource',
         Mask => 0x0f,
         Notes => 'K-3III',
@@ -4709,8 +4709,18 @@ my %binaryDataAttrs = (
             2 => 'Grip Battery',
             4 => 'External Power Supply',
         },
-    },{
     }],
+    0.2 => {
+        Name => 'PowerAvailable',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Notes => 'K-3III',
+        Mask => 0xf0,
+        PrintConv => { BITMASK => {
+            0 => 'Body Battery',
+            1 => 'Grip Battery',
+            3 => 'External Power Supply',
+        }},
+    },
     1.1 => [
         {
             Name => 'BodyBatteryState',
@@ -4735,11 +4745,6 @@ my %binaryDataAttrs = (
                  4 => 'Close to Full',
                  5 => 'Full',
             },
-        },{
-            Name => 'BodyBatteryState',
-            Notes => 'decoding unknown for some models',
-            Unknown => 1, # (doesn't appear to be valid for the K-3 III)
-            Mask => 0xf0,
         },
     ],
     1.2 => [
@@ -4754,11 +4759,6 @@ my %binaryDataAttrs = (
                  3 => 'Running Low',
                  4 => 'Full',
             },
-        },{
-            Name => 'GripBatteryState',
-            Notes => 'decoding unknown for other models',
-            Unknown => 1, # (doesn't appear to be valid for the K-5)
-            Mask => 0x0f,
         },
     ],
     # internal and grip battery voltage Analogue to Digital measurements,
@@ -4794,7 +4794,19 @@ my %binaryDataAttrs = (
             # BodyBatteryVoltage4  6.10 V   7.55 V     7.45 V
             # "Meas" open-circuit voltages with DVM: AB=0V, AC=+8.33V, BC=+8.22V
             # (terminal "C" is closest to edge of battery)
-        },
+        },{
+            Name => 'BodyBatteryState',
+            Condition => '$$self{Model} =~ /K-3 Mark III/',
+            Notes => 'K-3III',
+            PrintConv => {
+                0 => 'Empty or Missing',
+                1 => 'Almost Empty',
+                2 => 'Running Low',
+                3 => 'Half Full',
+                4 => 'Close to Full',
+                5 => 'Full',
+            },
+        }
     ],
     3 => [
         {
@@ -4810,7 +4822,11 @@ my %binaryDataAttrs = (
             Name => 'BodyBatteryADLoad',
             Description => 'Body Battery A/D Load',
             Condition => '$$self{Model} =~ /(\*ist|K100D|K200D)\b/',
-        },
+        },{
+            Name => 'BodyBatteryPercent',
+            Condition => '$$self{Model} =~ /K-3 Mark III/',
+            Notes => 'K-3III',
+        }
     ],
     4 => [
         {
@@ -4827,6 +4843,15 @@ my %binaryDataAttrs = (
             PrintConv => 'sprintf("%.2f V", $val)',
             PrintConvInv => '$val =~ s/\s*V$//',
         },
+        {
+            Name => 'BodyBatteryVoltage',
+            Condition => '$$self{Model} =~ /K-3 Mark III/',
+            Format => 'int32u',
+            ValueConv => '$val * 4e-8 + 0.27219',
+            ValueConvInv => '($val - 0.27219) / 4e-8',
+            PrintConv => 'sprintf("%.2f V", $val)',
+            PrintConvInv => '$val =~ s/\s*V$//',
+        },
     ],
     5 => {
         Name => 'GripBatteryADLoad',
@@ -4853,6 +4878,34 @@ my %binaryDataAttrs = (
         PrintConv => 'sprintf("%.2f V", $val)',
         PrintConvInv => '$val =~ s/\s*V$//',
     },
+    16 => {
+        Name => 'GripBatteryState',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Notes => 'K-3III',
+        PrintConv => {
+            0 => 'Empty or Missing',
+            1 => 'Almost Empty',
+            2 => 'Running Low',
+            3 => 'Half Full',
+            4 => 'Close to Full',
+            5 => 'Full',
+        },
+    },
+    17 => {
+        Name => 'GripBatteryPercent',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Notes => 'K-3III',
+    },
+    18 => {
+        Name => 'GripBatteryVoltage',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Notes => 'K-3III',
+        Format => 'int32u',
+        ValueConv => '$val * 4e-8 + 0.27219',
+        ValueConvInv => '($val - 0.27219) / 4e-8',
+        PrintConv => 'sprintf("%.2f V", $val)',
+        PrintConvInv => '$val =~ s/\s*V$//',
+    },
 );
 
 # auto focus information
@@ -5521,14 +5574,27 @@ my %binaryDataAttrs = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     FORMAT => 'int8s',
     NOTES => 'Tags decoded from the electronic level information for the K-3 III.',
+    1 => {
+        Name => 'CameraOrientation',
+        PrintConv => {
+            0 => 'Horizontal (normal)',
+            1 => 'Rotate 270 CW',
+            2 => 'Rotate 180',
+            3 => 'Rotate 90 CW',
+            4 => 'Upwards', # (to the sky)
+            5 => 'Downwards', # (to the ground)
+        },
+    },
     3 => {
         Name => 'RollAngle',
+        Notes => 'converted to degrees of clockwise camera rotation',
         Format => 'int16s',
         ValueConv => '-$val / 2',
         ValueConvInv => '-$val * 2',
     },
     5 => {
         Name => 'PitchAngle',
+        Notes => 'converted to degrees of upward camera tilt',
         Format => 'int16s',
         ValueConv => '-$val / 2',
         ValueConvInv => '-$val * 2',