exiftool_vendored 13.34.0 → 13.37.0

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

@@ -42,7 +42,7 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
 # information extracted from H.264 video streams
 %Image::ExifTool::H264::Main = (
     GROUPS => { 2 => 'Video' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Tags extracted from H.264 video streams.  The metadata for AVCHD videos is
         stored in this stream.

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

@@ -964,7 +964,7 @@ my %manuSig = ( #6
 %Image::ExifTool::ICC_Profile::Metadata = (
     PROCESS_PROC => \&ProcessMetadata,
     GROUPS => { 0 => 'ICC_Profile', 1 => 'ICC-meta', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Only these few tags have been pre-defined, but ExifTool will extract any
         Metadata tags that exist.

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

@@ -76,7 +76,7 @@ my %userTagName = (
 
 # This table is just for documentation purposes
 %Image::ExifTool::ID3::Main = (
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     PROCESS_PROC => \&ProcessID3Dir, # (used to process 'id3 ' chunk in WAV files)
     NOTES => q{
         ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, AIFF,
@@ -720,7 +720,7 @@ my %id3v2_common = (
 # Synchronized lyrics/text
 %Image::ExifTool::ID3::SynLyrics = (
     GROUPS => { 1 => 'ID3', 2 => 'Audio' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     PROCESS_PROC => \&ProcessSynText,
     NOTES => 'The following tags are extracted from synchronized lyrics/text frames.',
     desc => { Name => 'SynchronizedLyricsDescription' },
@@ -754,7 +754,7 @@ my %id3v2_common = (
 %Image::ExifTool::ID3::Private = (
     PROCESS_PROC => \&Image::ExifTool::ID3::ProcessPrivate,
     GROUPS => { 1 => 'ID3', 2 => 'Audio' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         ID3 private (PRIV) tags.  ExifTool will decode any private tags found, even
         if they do not appear in this table.

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

@@ -565,7 +565,7 @@ sub ProcessJPEG_HDR($$$);
 # APP9 Media Jukebox segment (ref PH)
 %Image::ExifTool::JPEG::MediaJukebox = (
     GROUPS => { 0 => 'XML', 1 => 'MediaJukebox', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'Tags found in the XML metadata of the APP9 "Media Jukebox" segment.',
     Date => {
         Groups => { 2 => 'Time' },

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

@@ -21,7 +21,7 @@ sub ProcessTag($$$$%);
 
 %Image::ExifTool::JSON::Main = (
     GROUPS => { 0 => 'JSON', 1 => 'JSON', 2 => 'Other' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     PROCESS_PROC => \&ProcessJSON,
     NOTES => q{
         Other than a few tags in the table below, JSON tags have not been

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

@@ -18,7 +18,7 @@ $VERSION = '1.01';
 %Image::ExifTool::LIF::Main = (
     GROUPS => { 0 => 'XML', 1 => 'XML', 2 => 'Image' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Tags extracted from Leica Image Format (LIF) imaging files.  As well as the
         tags listed below, all available information is extracted from the

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

@@ -26,7 +26,7 @@ sub ProcessLinkInfo($$$);
 %Image::ExifTool::LNK::Main = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 2 => 'Other' },
-    VARS => { HEX_ID => 1 },    # print hex ID's in documentation
+    VARS => { ID_FMT => 'hex' },    # print hex ID's in documentation
     NOTES => 'Information extracted from MS Shell Link (Windows shortcut) files.',
     # maybe the Flags aren't very useful to the user (since they are
     # mainly structural), but extract them anyway for completeness
@@ -262,7 +262,7 @@ sub ProcessLinkInfo($$$);
     GROUPS => { 2 => 'Other' },
     PROCESS_PROC => \&ProcessLinkInfo,
     FORMAT => 'int32u',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     VolumeID => { },
     DriveType => {
         PrintConv => {

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

@@ -22,7 +22,7 @@ sub ExtractTags($$$);
 # Lytro LFP tags (ref PH)
 %Image::ExifTool::Lytro::Main = (
     GROUPS => { 2 => 'Camera' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Tag definitions for Lytro Light Field Picture (LFP) files.  ExifTool
         extracts the full JSON metadata blocks, as well as breaking them down into

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.29';
+$VERSION = '1.30';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -132,7 +132,7 @@ my $knotsToKph = 1.852;     # knots --> km/h
 # information extracted from the MPEG-2 transport stream
 %Image::ExifTool::M2TS::Main = (
     GROUPS => { 2 => 'Video' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         The MPEG-2 transport stream is used as a container for many different
         audio/video formats (including AVCHD).  This table lists information
@@ -165,7 +165,7 @@ my $knotsToKph = 1.852;     # knots --> km/h
 # information extracted from AC-3 audio streams
 %Image::ExifTool::M2TS::AC3 = (
     GROUPS => { 1 => 'AC3', 2 => 'Audio' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'Tags extracted from AC-3 audio streams.',
     AudioSampleRate => {
         PrintConv => {
@@ -557,7 +557,7 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
+    my ($buff, $pLen, $j, $fileType, $eof);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
@@ -570,10 +570,8 @@ sub ProcessM2TS($$)
     unless ($1) {
         $pLen = 188;        # no timecode
         $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-        $upkPrefix = 'N';
     } else {
         $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-        $upkPrefix = 'x4N';
     }
     my $prePos = $pLen - 188;       # byte position of packet prefix
     my $readSize = 64 * $pLen;      # size of our read buffer

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

@@ -322,7 +322,7 @@ $VERSION = '1.17';
 
 %Image::ExifTool::MPEG::Xing = (
     GROUPS => { 2 => 'Audio' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'These tags are extracted from the Xing/Info frame.',
     1 => { Name => 'VBRFrames' },
     2 => { Name => 'VBRBytes' },

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

@@ -28,7 +28,7 @@ my $mwgLoaded;  # flag set if we alreaded Load()ed the MWG tags
 # MWG Composite tags
 %Image::ExifTool::MWG::Composite = (
     GROUPS => { 0 => 'Composite', 1 => 'MWG', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     WRITE_PROC => \&Image::ExifTool::DummyWriteProc,
     NOTES => q{
         The table below lists special Composite tags which are used to access other

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

@@ -116,7 +116,7 @@ my %componentDataDef = (
 # Note: The Binary flag is automatically set for all Unknown tags with unknown Type
 %Image::ExifTool::MXF::Main = (
     GROUPS => { 2 => 'Video' },
-    VARS => { NO_LOOKUP => 1, NO_ID => 1 }, # tag ID's are too bulky
+    VARS => { NO_LOOKUP => 1, ID_FMT => 'none' }, # tag ID's are too bulky
     NOTES => q{
         Tags extracted from Material Exchange Format files.  Tag ID's are not listed
         because they are bulky 16-byte binary values.

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

@@ -52,7 +52,7 @@ my %delXAttr = (
 # "mdls" tags (ref PH)
 %Image::ExifTool::MacOS::MDItem = (
     WRITE_PROC => \&Image::ExifTool::DummyWriteProc,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     GROUPS => { 0 => 'File', 1 => 'MacOS', 2 => 'Other' },
     NOTES => q{
         MDItem tags are extracted using the "mdls" utility.  They are extracted if
@@ -245,7 +245,7 @@ my %delXAttr = (
 %Image::ExifTool::MacOS::XAttr = (
     WRITE_PROC => \&Image::ExifTool::DummyWriteProc,
     GROUPS => { 0 => 'File', 1 => 'MacOS', 2 => 'Other' },
-    VARS => { NO_ID => 1 }, # (id's are too long)
+    VARS => { ID_FMT => 'none' }, # (id's are too long)
     NOTES => q{
         XAttr tags are extracted using the "xattr" utility.  They are extracted if
         any "XAttr*" tag or the MacOS group is specifically requested, or by setting

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

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '2.17';
+$VERSION = '2.18';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -157,6 +157,13 @@ my $debug;          # set to 1 to enable debugging code
             FixOffsets => '$valuePtr -= 210 if $tagID >= 0x1303',
        },
     },
+    {
+        Name => 'MakerNoteGoogle',
+        Condition => '$$valPt =~ /^HDRP[\x02\x03]/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Google::HDRPlusMakerNote',
+        },
+    },
     {
         Name => 'MakerNoteHasselblad',
         Condition => '$$self{Make} eq "Hasselblad"',
@@ -843,29 +850,45 @@ my $debug;          # set to 1 to enable debugging code
         PutFirst => 1,      # place immediately after TIFF header
     },
     {
-        Name => 'MakerNoteReconyx',
+        Name => 'MakerNoteReconyxHyperFire',
         Condition => q{
             $$valPt =~ /^\x01\xf1([\x02\x03]\x00)?/ and
             ($1 or $$self{Make} eq "RECONYX")
         },
         SubDirectory => {
-            TagTable => 'Image::ExifTool::Reconyx::Main',
+            TagTable => 'Image::ExifTool::Reconyx::HyperFire',
             ByteOrder => 'Little-endian',
         },
     },
     {
-        Name => 'MakerNoteReconyx2',
+        Name => 'MakerNoteReconyxUltraFire',
         Condition => '$$valPt =~ /^RECONYXUF\0/',
         SubDirectory => {
-            TagTable => 'Image::ExifTool::Reconyx::Type2',
+            TagTable => 'Image::ExifTool::Reconyx::UltraFire',
             ByteOrder => 'Little-endian',
         },
     },
     {
-        Name => 'MakerNoteReconyx3',
+        Name => 'MakerNoteReconyxHyperFire2',
         Condition => '$$valPt =~ /^RECONYXH2\0/',
         SubDirectory => {
-            TagTable => 'Image::ExifTool::Reconyx::Type3',
+            TagTable => 'Image::ExifTool::Reconyx::HyperFire2',
+            ByteOrder => 'Little-endian',
+        },
+    },
+    {
+        Name => 'MakerNoteReconyxMicroFire',
+        Condition => '$$valPt =~ /^RECONYXMF\0/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Reconyx::MicroFire',
+            ByteOrder => 'Little-endian',
+        },
+    },
+    {
+        Name => 'MakerNoteReconyxHyperFire4K',
+        Condition => '$$valPt =~ /^RECONYXHF4K\0/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Reconyx::HyperFire4K',
             ByteOrder => 'Little-endian',
         },
     },

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

@@ -230,7 +230,7 @@ sub CheckXtra($$$);
     GROUPS => { 0 => 'XMP', 1 => 'XMP-microsoft', 2 => 'Image' },
     NAMESPACE => 'MicrosoftPhoto',
     TABLE_DESC => 'XMP Microsoft',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Microsoft Photo 1.0 schema XMP tags.  This is likely not a complete list,
         but represents tags which have been observed in sample images.  The actual
@@ -263,7 +263,7 @@ sub CheckXtra($$$);
     GROUPS => { 0 => 'XMP', 1 => 'XMP-MP1', 2 => 'Image' },
     NAMESPACE => 'MP1',
     TABLE_DESC => 'XMP Microsoft Photo',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Microsoft Photo 1.1 schema XMP tags which have been observed.
     },
@@ -320,7 +320,7 @@ my %sRegions = (
     GROUPS => { 0 => 'XMP', 1 => 'XMP-MP', 2 => 'Image' },
     NAMESPACE => 'MP',
     TABLE_DESC => 'XMP Microsoft Photo',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Microsoft Photo 1.2 schema XMP tags which have been observed.
     },
@@ -361,7 +361,7 @@ my %sRegions = (
     WRITE_GROUP => 'Microsoft',
     AVOID => 1,
     GROUPS => { 0 => 'QuickTime', 2 => 'Video' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Tags found in the Microsoft "Xtra" atom of QuickTime videos.  Tag ID's are
         not shown because some are unruly GUID's.  Currently most of these tags are

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.50';
+$VERSION = '4.51';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -583,6 +583,7 @@ sub GetAFPointGrid($$;$);
     '0E 4A 31 48 23 2D 0E 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     'FE 48 37 5C 24 24 DF 0E' => 'Tamron SP 24-70mm f/2.8 Di VC USD (A007)', #24
     'CE 47 37 5C 25 25 DF 4E' => 'Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)', #forum9110
+    'CE 00 37 5C 25 25 DF 4E' => 'Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)', #github345
     '45 41 37 72 2C 3C 48 02' => 'Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro (190D)',
     '33 54 3C 5E 24 24 62 02' => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09)',
     'FA 54 3C 5E 24 24 84 06' => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)', #JD
@@ -13068,7 +13069,7 @@ my %nikonFocalConversions = (
     GROUPS => { 0 => 'XMP', 1 => 'XMP-ast', 2 => 'Image' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
     NAMESPACE => 'ast',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'Tags used by Nikon NX Studio in Nikon NKSC sidecar files and trailers.',
     about      => { },
     version    => { },
@@ -13126,7 +13127,7 @@ my %nikonFocalConversions = (
     GROUPS => { 0 => 'XMP', 1 => 'XMP-sdc', 2 => 'Image' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
     NAMESPACE => 'sdc',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     about      => { },
     version    => { },
     appversion => { Name => 'AppVersion' },
@@ -13136,7 +13137,7 @@ my %nikonFocalConversions = (
     GROUPS => { 0 => 'XMP', 1 => 'XMP-nine', 2 => 'Image' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
     NAMESPACE => 'nine',
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     about      => { },
     version    => { },
     Label      => { },
@@ -13153,7 +13154,7 @@ my %nikonFocalConversions = (
 %Image::ExifTool::Nikon::NineEdits = (
     GROUPS => { 0 => 'XML', 1 => 'NineEdits', 2 => 'Image' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'XML-based tags used to store editing information.',
     filterParametersBinary => { %base64bin },
     filterParametersExportExportData => { %base64bin },

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

@@ -54,7 +54,7 @@ my @vectorVals;
 %Image::ExifTool::OOXML::Main = (
     GROUPS => { 0 => 'XML', 1 => 'XML', 2 => 'Document' },
     PROCESS_PROC => \&Image::ExifTool::XMP::ProcessXMP,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         The Office Open XML (OOXML) format was introduced with Microsoft Office 2007
         and is used by file types such as DOCX, PPTX and XLSX.  These are

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

@@ -21,7 +21,7 @@ $VERSION = '1.04';
 
 my $MAX_PACKETS = 2;    # maximum packets to scan from each stream at start of file
 
-# Information types recognizedi in Ogg files
+# Information types recognized in Ogg files
 %Image::ExifTool::Ogg::Main = (
     NOTES => q{
         ExifTool extracts the following types of information from Ogg files.  See

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

@@ -41,7 +41,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.89';
+$VERSION = '2.91';
 
 sub PrintLensInfo($$$);
 
@@ -117,8 +117,10 @@ my %olympusLensTypes = (
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB (also OM System M.Zuiko Digital ED 100-400mm F5.0-6.3 IS II", forum2833)
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
     '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
+    '0 38 10' => 'Olympus M.Zuiko Digital ED 20mm F1.4 Pro',
     '0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
     '0 40 10' => 'Olympus M.Zuiko Digital ED 150-600mm F5.0-6.3', #forum15652
+    '0 41 10' => 'OM System M.Zuiko Digital ED 50-200mm F2.8 IS Pro', #github#352
     # Sigma lenses
     '1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
     '1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
@@ -2252,12 +2254,15 @@ my %indexInfo = (
             5 => 'i-Enhance', #11
             6 => 'e-Portrait', #23
             7 => 'Color Creator', #23
+            8 => 'Underwater', #7
             9 => 'Color Profile 1', #23
             10 => 'Color Profile 2', #23
             11 => 'Color Profile 3', #23
             12 => 'Monochrome Profile 1', #23
             13 => 'Monochrome Profile 2', #23
             14 => 'Monochrome Profile 3', #23
+            17 => 'Art Mode', #7
+            18 => 'Monochrome Profile 4', #7
             256 => 'Monotone',
             512 => 'Sepia',
         }],

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

@@ -20,7 +20,7 @@ $VERSION = '1.00';
 # Other info
 %Image::ExifTool::Other::PFM = (
     GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => q{
         Tags extracted from Portable FloatMap images. See
         L<http://www.pauldebevec.com/Research/HDR/PFM/> for the specification.

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

@@ -2553,7 +2553,7 @@ my %shootingMode = (
     NAMESPACE => 'xmpDSA',
     WRITABLE => 'string',
     AVOID => 1,
-    VARS => { NO_ID => 1 },
+    VARS => { ID_FMT => 'none' },
     NOTES => 'XMP Digital Shift Assistant tags written by some Leica cameras.',
     Version             => { }, # eg. "1.0.0"
     CorrectionAlreadyApplied => { Writable => 'boolean' },

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

@@ -59,7 +59,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.55';
+$VERSION = '3.58';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -416,6 +416,8 @@ sub AFAreasK3III($$);
 #
     '31 1' => '18.3mm F2.8', #PH (GR III built-in)
     '31 4' => '26.1mm F2.8', #PH (GR IIIx built-in)
+    '31 5' => '26.1mm F2.8 GT-2 TC', #KG (GR IIIx built-in plus GT-2 TC)
+    '31 8' => '18.3mm F2.8', #KG (GR IV built-in)
 );
 
 # Pentax model ID codes - PH
@@ -564,6 +566,7 @@ my %pentaxModelID = (
     0x1329a => 'GR IIIx', # (Ricoh)
     0x132b8 => 'KF', #github322 (Ricoh)
     0x132d6 => 'K-3 Mark III Monochrome', #github226 (Ricoh)
+    0x132e0 => 'GR IV', #github347 (Ricoh)
 );
 
 # Pentax city codes - (PH, Optio WP)
@@ -1182,7 +1185,8 @@ my %binaryDataAttrs = (
                 0x111 => 'AF-C (Release-priority)', #PH (K-5,K-3)
                 0x112 => 'AF-A (Release-priority)', #PH (K-3)
                 0x120 => 'Contrast-detect (Release-priority)', #PH (K-01)
-                # bit 15 indicates macro mode (disabled for MF, and defaults to Select for Snap, Infinity)
+                # bit 15 indicates macro mode (disabled for MF, and defaults to Select for Snap, Infinity)  #KG 'disabled for MF' - in contradiction with 0x8003 ??
+                0x8003 => 'Manual (Macro)', # (GR IV)
                 0x8006 => 'Auto-area (Macro)', # (GR III)
                 0x8007 => 'Zone Select (Macro)', # (GR III)
                 0x8008 => 'Select (Macro)', # (GR III)
@@ -1969,16 +1973,18 @@ my %binaryDataAttrs = (
             '19 0' => 'Astrotracer', #29
             # extra K10D modes (ref 16)
             '13 0' => 'Shutter & Aperture Priority AE',
+            '14 0' => 'Shutter Priority AE', #KG (K-3III))
             '15 0' => 'Sensitivity Priority AE',
             '16 0' => 'Flash X-Sync Speed AE',
+            '17 0' => 'Flash X-Sync Speed', #KG (K-3III))
             '18 0' => 'Auto Program (Normal)', #PH (K-5)
             '18 1' => 'Auto Program (Hi-speed)', #PH (NC)
             '18 2' => 'Auto Program (DOF)', #PH (K-5)
             '18 3' => 'Auto Program (MTF)', #PH (NC)
             '18 22' => 'Auto Program (Shallow DOF)', #PH (NC)
             '20 22' => 'Blur Control', #PH (Q)
-            '24 0' => 'Aperture Priority (Adv.Hyp)', #KG
-            '25 0' => 'Manual Exposure (Adv.Hyp)', #KG
+            '24 0' => 'Aperture Priority (Adv.Hyp)', #KG (K-3III)
+            '25 0' => 'Manual Exposure (Adv.Hyp)', #KG (K-3III)
             '26 0' => 'Shutter and Aperture Priority (TAv)', #PH (K-3III)
             '249 0' => 'Movie (TAv)', #31
             '250 0' => 'Movie (TAv, Auto Aperture)', #31
@@ -2208,7 +2214,9 @@ my %binaryDataAttrs = (
             # 256 - seen for GR III
             # 257 - seen for GR III
             # 262 - seen for GR III
-            32768 => 'n/a',
+            32768 => 'Standard', #KG (K-3IIIm) (was "n/a" previously - PH)
+            32769 => 'Hard', #KG (K-3IIIm)
+            32770 => 'Soft', #KG (K-3IIIm)
         },
     },
     0x0050 => { #PH
@@ -5120,52 +5128,52 @@ my %binaryDataAttrs = (
         PrintConv => { 0 => 'Off', 1 => 'Short', 2 => 'Medium', 3 => 'Long' },
     },
     0x021f => { #KG
-          Name => 'FirstFrameActionInAFC',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              '0'   => 'Auto',
-              '1'   => 'Release Priority',
-              '2'   => 'Focus Priority',
-              # there is at least another value '3' but I couldn't figure out the
-              # meaning. However, this occurs for a few AF-S captures, so it has
-              # no real practical meaning.
-          },
+        Name => 'FirstFrameActionInAFC',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Release Priority',
+            '2'   => 'Focus Priority',
+            # there is at least another value '3' but I couldn't figure out the
+            # meaning. However, this occurs for a few AF-S captures, so it has
+            # no real practical meaning.
+        },
     },
     0x0220 => { #KG
-          Name => 'ActionInAFCCont',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              '0'   => 'Auto',
-              '1'   => 'Focus Priority',
-              '2'   => 'FPS Priority',
-          },
+        Name => 'ActionInAFCCont',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Focus Priority',
+            '2'   => 'FPS Priority',
+        },
     },
     545 => { #KG
-          Name => 'AFCHold',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          Mask => 0x03,
-          PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
+        Name => 'AFCHold',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x03,
+        PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
     },
     545.1 => { #KG
-        Name => 'AFCSensitivity',
+        Name => 'AFCPointTracking',
         Condition => '$$self{Model} =~ /K-3 Mark III/',
         Mask => 0x0c,
-        PrintConv => '5 - $val',
-        PrintConvInv => '5 - $val',
+        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
     },
     545.2 => { #KG
-        Name => 'AFCPointTracking',
+        Name => 'AFCSensitivity',
         Condition => '$$self{Model} =~ /K-3 Mark III/',
         Mask => 0x70,
-        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
+        PrintConv => '5 - $val',
+        PrintConvInv => '5 - $val',
     },
     0x0960 => { #KG
-          Name => 'SubjectRecognition',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              0 => 'Off',
-              1 => 'On',
-          },
+        Name => 'SubjectRecognition',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
     },
 );
 
@@ -5855,8 +5863,8 @@ my %binaryDataAttrs = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     FORMAT => 'int16u',
-    DATAMEMBER => [ 3 ],
-    NOTES => 'AF tags written by the K-3 Mark III, GR III and GR IIIx.',
+    DATAMEMBER => [ 2, 3 ],
+    NOTES => 'AF tags written by the K-3 Mark III, GR III, GR IIIx and GR IV.',
     0 => {
         Name => 'AFInfo',
         Format => 'int16u[$size/2]',
@@ -5902,6 +5910,10 @@ my %binaryDataAttrs = (
             0x200b => 'Contrast-detect Spot',
         },
     },
+    2 => {
+        Name => 'MaxNumAFPoints',
+        RawConv => '$$self{MaxNumAFPoints} = $val',
+    },
     3 => {
         Name => 'NumAFPoints',
         RawConv => '$$self{NumAFPoints} = $val',