exiftool_vendored 13.31.0 → 13.36.0

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

@@ -46,6 +46,7 @@
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #              NJ) Niels Kristian Bech Jensen private communication
+#              KG) Karsten Gieselmann private communication
 #
 # Notes:        See POD documentation at the bottom of this file
 #------------------------------------------------------------------------------
@@ -58,11 +59,14 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.52';
+$VERSION = '3.57';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
 sub DecodeAFPoints($$$$;$);
+sub AFPointNamesK3III($$;$);
+sub AFPointValuesK3III($$);
+sub AFAreasK3III($$);
 
 # pentax lens type codes (ref 4)
 # The first number gives the lens series, and the 2nd gives the model number
@@ -560,6 +564,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)
@@ -747,6 +752,11 @@ my @k3iiiAF = qw(
     C1 E1 G1 I1 K1 C3 E3 G3 I3 K3 C5 E5 G5
     I5 K5 C7 E7 G7 I7 K7 C9 E9 G9 I9 K9 A5 M5 B3
     L3 B5 L5 B7 L7 B1 L1 B9 L9 A3 M3 A7 M7
+    D1 F1 H1 J1 D3 F3 H3 J3 D5 F5 H5 J5 D7
+    F7 H7 J7 D9 F9 H9 J9 C2 E2 G2 I2 K2 C4
+    E4 G4 I4 K4 C6 E6 G6 I6 K6 C8 E8 G8 I8
+    K8 B2 L2 B4 L4 B6 L6 B8 L8 A1 M1 A2 M2
+    A4 M4 A6 M6 A8 M8 A9 M9
 );
 
 # decoding for Pentax Firmware ID tags - PH
@@ -1148,31 +1158,38 @@ my %binaryDataAttrs = (
             Notes => 'Pentax models',
             Writable => 'int16u',
             PrintConvColumns => 2,
+            PrintHex => 1,
             PrintConv => { #PH
-                0 => 'Normal',
-                1 => 'Macro',
-                2 => 'Infinity',
-                3 => 'Manual',
-                4 => 'Super Macro', #JD
-                5 => 'Pan Focus',
-                6 => 'Auto-area', # (GR III)
-                8 => 'Select', # (GR III)
-                9 => 'Pinpoint', # (GR III)
-                10 => 'Tracking', # (GR III)
-                11 => 'Continuous', # (GR III)
-                12 => 'Snap', # (GR III)
-                16 => 'AF-S (Focus-priority)', #17
-                17 => 'AF-C (Focus-priority)', #17
-                18 => 'AF-A (Focus-priority)', #PH (educated guess)
-                32 => 'Contrast-detect (Focus-priority)', #PH (K-5)
-                33 => 'Tracking Contrast-detect (Focus-priority)', #PH (K-5)
+                0x00 => 'Normal',
+                0x01 => 'Macro',
+                0x02 => 'Infinity',
+                0x03 => 'Manual',
+                0x04 => 'Super Macro', #JD
+                0x05 => 'Pan Focus',
+                0x06 => 'Auto-area', # (GR III)
+                0x07 => 'Zone Select', # (GR III)
+                0x08 => 'Select', # (GR III)
+                0x09 => 'Pinpoint', # (GR III)
+                0x0a => 'Tracking', # (GR III)
+                0x0b => 'Continuous', # (GR III)
+                0x0c => 'Snap', # (GR III)
+                0x10 => 'AF-S (Focus-priority)', #17
+                0x11 => 'AF-C (Focus-priority)', #17
+                0x12 => 'AF-A (Focus-priority)', #PH (educated guess)
+                0x20 => 'Contrast-detect (Focus-priority)', #PH (K-5)
+                0x21 => 'Tracking Contrast-detect (Focus-priority)', #PH (K-5)
                 # bit 8 indicates release priority
-                272 => 'AF-S (Release-priority)', #PH (K-5,K-3)
-                273 => 'AF-C (Release-priority)', #PH (K-5,K-3)
-                274 => 'AF-A (Release-priority)', #PH (K-3)
-                288 => 'Contrast-detect (Release-priority)', #PH (K-01)
-                # 32777 (0x8009) - seen for Ricoh GR III
-                # 32779 (0x800b) - seen for Ricoh GR III
+                0x110 => 'AF-S (Release-priority)', #PH (K-5,K-3)
+                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)
+                0x8006 => 'Auto-area (Macro)', # (GR III)
+                0x8007 => 'Zone Select (Macro)', # (GR III)
+                0x8008 => 'Select (Macro)', # (GR III)
+                0x8009 => 'Pinpoint (Macro)', # (GR III)
+                0x800a => 'Tracking (Macro)', # (GR III)
+                0x800b => 'Continuous (Macro)', # (GR III)
             },
         },{
             Name => 'FocusMode',
@@ -1188,7 +1205,7 @@ my %binaryDataAttrs = (
     ],
     0x000e => [{ #29
         Name => 'AFPointSelected',
-        Condition => '$$self{Model} =~ /K-1\b/',
+        Condition => '$$self{Model} =~ /(K-1|645Z)\b/', # (NC for 645Z)
         Writable => 'int16u',
         Notes => 'K-1',
         PrintConvColumns => 2,
@@ -1367,16 +1384,20 @@ my %binaryDataAttrs = (
             9 => 'Lower-left',
             10 => 'Bottom',
             11 => 'Lower-right',
-        },
+        },{
         # (second number exists for K-5II(s) is usually 0, but is 1 for AF.C with
         # AFPointMode=='Select' and extended tracking focus points are enabled in the settings)
-        ],
+        # -----
+        #KG: for K-70 and older models with 11 PDAF points (K-S2, K-S1, K-50, K-500, K-30, K-5II(s) )
+            0 => 'Single Point',     # Select AF (1-point) in both PDAF and CAF modes
+            1 => 'Expanded Area',    # Expanded Area AF in AF-C
+        }],
     }],
     0x000f => [{ #PH
         Name => 'AFPointsInFocus',
-        Condition => '$$self{Model} =~ /K-3\b/',
+        Condition => '$$self{Model} =~ /K-(3|S1|S2)\b/',  #KG: valid also for K-S1/S2
         Writable => 'int32u',
-        Notes => 'K-3 only',
+        Notes => 'K-3, K-S1 and K-S2 only',
         PrintHex => 1,
         PrintConv => {
             0 => '(none)',
@@ -1957,6 +1978,8 @@ my %binaryDataAttrs = (
             '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
             '26 0' => 'Shutter and Aperture Priority (TAv)', #PH (K-3III)
             '249 0' => 'Movie (TAv)', #31
             '250 0' => 'Movie (TAv, Auto Aperture)', #31
@@ -1978,10 +2001,13 @@ my %binaryDataAttrs = (
         Count => 4,
         PrintConv => [{
             0 => 'Single-frame', # (also Interval Shooting for K-01 - PH)
-            1 => 'Continuous', # (K-5 Hi)
-            2 => 'Continuous (Lo)', #PH (K-5)
+            1 => 'Continuous',   #KG  *ist D, *ist Ds, *ist DS2, K110D, K10D, K100D, K100D Super, K20D, Ricoh GR III / GR IIIx
+                                 #KG  Hi:   K200D, K-x, K-7, K-r, K-5, K-01, K-5 II, K-5 IIs, K-30, K-500, K-50, K-S1, K-S2, K-70
+                                 #KG  High: K-3, K-3 II, K-1, K-1 II, KP, K-3 III, K-3 III Mono
+            2 => 'Continuous (Lo)',     #KG all models listed under 'Hi'
             3 => 'Burst', #PH (K20D)
-            4 => 'Continuous (Medium)', #PH (K-3)
+            4 => 'Continuous (Medium)', #KG all models listed under 'High'
+            5 => 'Continuous (Low)',    #KG all models listed under 'High'
             255 => 'Video', #PH (K-x)
         },{
             0 => 'No Timer',
@@ -2169,7 +2195,7 @@ my %binaryDataAttrs = (
             11 => 'Flat', #31 (K-70)
             # the following values from GR III
             256 => 'Standard',
-            257 => 'Vivid', 
+            257 => 'Vivid',
             258 => 'Monotone',
             259 => 'Soft Monotone',
             260 => 'Hard Monotone',
@@ -2989,7 +3015,7 @@ my %binaryDataAttrs = (
     }],
     0x022b => [{
         Name => 'LevelInfoK3III',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfoK3III' },
     },{ #PH (K-5)
         Name => 'LevelInfo',
@@ -3097,13 +3123,20 @@ my %binaryDataAttrs = (
     # 0x0406 - undef[4116] (K-5)
     # 0x0407 - undef[3072] (Q DNG)
     # 0x0408 - undef[1024] (Q DNG)
+    0x040b => {
+        Name => 'FaceInfoK3III',
+        # undef[1640] (actually int32u[410], K3III)
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::FaceInfoK3III' },
+    },
+    0x040c => {
+        Name => 'AFInfoK3III',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AFInfoK3III' },
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::PrintIM::Main',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::PrintIM::Main' },
     },
 );
 
@@ -5006,11 +5039,11 @@ my %binaryDataAttrs = (
     # 0x0a - values: 00,05,0d,15,86,8e,a6,ae
     0x0b => { #JD
         Name => 'AFPointsInFocus',
-        Condition => '$$self{Model} !~ /(K-(1|3|70)|KP)\b/',
+        Condition => '$$self{Model} !~ /(K-(1|3|70|S1|S2)|KP)\b/',  #KG: valid also for K-S1/S2
         Notes => q{
-            models other than the K-1, K-3, K-70 and KP.  May report two points in focus
-            even though a single AFPoint has been selected, in which case the selected
-            AFPoint is the first reported
+            models other than the K-1, K-3, K-70, KP and K-S1/S2. May report two points
+            in focus even though a single AFPoint has been selected, in which case the
+            selected AFPoint is the first reported
         },
         PrintConvColumns => 2,
         PrintConv => {
@@ -5039,43 +5072,46 @@ my %binaryDataAttrs = (
     },
     0x14 => {
         Name => 'AFPointValues',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/', #KG
         Format => 'int16uRev[69]',
         Unknown => 1,
         Notes => 'some unknown values related to each AFPoint',
-        # order is the same as AFPoints below, but there is an additional value for
+        # order is the same as AFPointsSelected below, but there is an additional value for
         # each AF point starting at offset 28 in the array (yes, the range overlaps
         # with the 1st values)
         # (values are int16s stored in reversed byte order)
         ValueConv => 'my @a=split " ",$val;$_>32767 and $_-=65536 foreach @a;join " ",@a',
-        PrintConv => \&AFPointValues,
+        PrintConv => \&AFPointValuesK3III,
     },
-    0x12a => { # byte has a value of 2 if corresponding AF point is selected
-        Name => 'AFPointsSelected',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+    0x12a => {
+        Name => 'AFPointsSelected', # (should probably be "AFPointSelected", but the bitmask allows multiple points)
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
         Notes => q{
             K-3III only. 41 selectable AF points from a total of 101 available in a 13x9
-            grid. Columns are labelled A-M and rows are 1-9. The center point is G5
+            grid. Columns are labelled A-M and rows are 1-9. The center point is G5. The
+            exact meaning of this tag is not fully understood, although it does seem
+            related to the selected AF point
         },
-        Format => 'int8u[41]',
-        PrintConv => 'Image::ExifTool::Pentax::AFPointsK3iii($val,$self,2)',
+        Format => 'int8u[101]',
+        # value of 1 means "selected point", and 2 means "center of selected area"
+        PrintConv => \&AFPointNamesK3III,
     },
 #
 # (maybe not coincidentally, there are 60 unknown bytes
 #  here, and there are also 60 non-selectable AF points)
 #
     0x18f => { # byte has a value of 1 if corresponding AF point is ... in focus maybe?
-        # usually the same points as AFPoints above, but not always
+        # usually the same points as AFPointsSelected above, but not always
         Name => 'AFPointsUnknown',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/', #KG
         Unknown => 1,
-        Format => 'int8u[41]',
-        PrintConv => \&AFPointsK3iii,
+        Format => 'int8u[101]',
+        PrintConv => \&AFPointNamesK3III,
     },
     0x1fa => {
         Name => 'LiveView',
         Notes => 'decoded only for the K-3 III',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # and other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/', #KG
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
     0x1fd => {
@@ -5084,6 +5120,54 @@ my %binaryDataAttrs = (
         Condition => '$$self{Model} eq "PENTAX K-3 II"',
         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.
+        },
+    },
+    0x0220 => { #KG
+        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' },
+    },
+    545.1 => { #KG
+        Name => 'AFCPointTracking',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x0c,
+        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
+    },
+    545.2 => { #KG
+        Name => 'AFCSensitivity',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x70,
+        PrintConv => '5 - $val',
+        PrintConvInv => '5 - $val',
+    },
+    0x0960 => { #KG
+        Name => 'SubjectRecognition',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
+    },
 );
 
 # AF information for K-01 and later (ref Karsten Gieselmann private communication)
@@ -5097,7 +5181,7 @@ my %binaryDataAttrs = (
         Name => 'NumCAFPoints',
         RawConv => '$$self{NumCAFPoints} = ($val & 0x0f) * ($val >> 4); $val',
         ValueConv => '($val >> 4) * ($val & 0x0f)',
-    }, 
+    },
     1.1 => {
         Name => 'CAFGridSize',
         ValueConv => '($val >> 4) . " " . ($val & 0x0f)', # (width x height)
@@ -5687,6 +5771,175 @@ my %binaryDataAttrs = (
         ValueConvInv => '-$val * 2',
     },
 );
+
+%Image::ExifTool::Pentax::FaceInfoK3III = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    FORMAT => 'int32u',
+    DATAMEMBER => [ 6, 8 ],
+    0.1 => {
+        Name => 'FaceInfoK3III',
+        Format => 'int32u[$size/4]',
+        Notes => q{
+            entire FaceInfoK3III structure. Provides access to raw numerical values and
+            facilitates the writing of the whole structure
+        },
+        Unknown => 1,
+    },
+      0 => { Name => 'FaceImageSize', Format => 'int32u[2]' },
+      2 => { Name => 'CAFArea', Format => 'int32u[4]', Notes => 'top, left, width, height' },
+      6 => { Name => 'FacesDetectedA', RawConv => '$$self{FacesA} = $val' },
+      8 => { Name => 'FacesDetectedB', RawConv => '$$self{FacesA} = $val' },
+     10 => { Name => 'Face1AArea', Condition => '$$self{FacesA} >= 1', Format => 'int32u[4]' },
+     14 => { Name => 'Face1AEye1', Condition => '$$self{FacesA} >= 1', Format => 'int32u[4]' },
+     18 => { Name => 'Face1AEye2', Condition => '$$self{FacesA} >= 1', Format => 'int32u[4]' },
+     30 => { Name => 'Face2AArea', Condition => '$$self{FacesA} >= 2', Format => 'int32u[4]' },
+     34 => { Name => 'Face2AEye1', Condition => '$$self{FacesA} >= 2', Format => 'int32u[4]' },
+     38 => { Name => 'Face2AEye2', Condition => '$$self{FacesA} >= 2', Format => 'int32u[4]' },
+     50 => { Name => 'Face3AArea', Condition => '$$self{FacesA} >= 3', Format => 'int32u[4]' },
+     54 => { Name => 'Face3AEye1', Condition => '$$self{FacesA} >= 3', Format => 'int32u[4]' },
+     58 => { Name => 'Face3AEye2', Condition => '$$self{FacesA} >= 3', Format => 'int32u[4]' },
+     70 => { Name => 'Face4AArea', Condition => '$$self{FacesA} >= 4', Format => 'int32u[4]' },
+     74 => { Name => 'Face4AEye1', Condition => '$$self{FacesA} >= 4', Format => 'int32u[4]' },
+     78 => { Name => 'Face4AEye2', Condition => '$$self{FacesA} >= 4', Format => 'int32u[4]' },
+     90 => { Name => 'Face5AArea', Condition => '$$self{FacesA} >= 5', Format => 'int32u[4]' },
+     94 => { Name => 'Face5AEye1', Condition => '$$self{FacesA} >= 5', Format => 'int32u[4]' },
+     98 => { Name => 'Face5AEye2', Condition => '$$self{FacesA} >= 5', Format => 'int32u[4]' },
+    110 => { Name => 'Face6AArea', Condition => '$$self{FacesA} >= 6', Format => 'int32u[4]' },
+    114 => { Name => 'Face6AEye1', Condition => '$$self{FacesA} >= 6', Format => 'int32u[4]' },
+    118 => { Name => 'Face6AEye2', Condition => '$$self{FacesA} >= 6', Format => 'int32u[4]' },
+    130 => { Name => 'Face7AArea', Condition => '$$self{FacesA} >= 7', Format => 'int32u[4]' },
+    134 => { Name => 'Face7AEye1', Condition => '$$self{FacesA} >= 7', Format => 'int32u[4]' },
+    138 => { Name => 'Face7AEye2', Condition => '$$self{FacesA} >= 7', Format => 'int32u[4]' },
+    150 => { Name => 'Face8AArea', Condition => '$$self{FacesA} >= 8', Format => 'int32u[4]' },
+    154 => { Name => 'Face8AEye1', Condition => '$$self{FacesA} >= 8', Format => 'int32u[4]' },
+    158 => { Name => 'Face8AEye2', Condition => '$$self{FacesA} >= 8', Format => 'int32u[4]' },
+    170 => { Name => 'Face9AArea', Condition => '$$self{FacesA} >= 9', Format => 'int32u[4]' },
+    174 => { Name => 'Face9AEye1', Condition => '$$self{FacesA} >= 9', Format => 'int32u[4]' },
+    178 => { Name => 'Face9AEye2', Condition => '$$self{FacesA} >= 9', Format => 'int32u[4]' },
+    190 => { Name => 'Face10AArea',Condition => '$$self{FacesA} >= 10', Format => 'int32u[4]' },
+    194 => { Name => 'Face10AEye1',Condition => '$$self{FacesA} >= 10', Format => 'int32u[4]' },
+    198 => { Name => 'Face10AEye2',Condition => '$$self{FacesA} >= 10', Format => 'int32u[4]' },
+    210 => { Name => 'Face1BArea', Condition => '$$self{FacesA} >= 1', Format => 'int32u[4]' },
+    214 => { Name => 'Face1BEye1', Condition => '$$self{FacesA} >= 1', Format => 'int32u[4]' },
+    218 => { Name => 'Face1BEye2', Condition => '$$self{FacesA} >= 1', Format => 'int32u[4]' },
+    230 => { Name => 'Face2BArea', Condition => '$$self{FacesA} >= 2', Format => 'int32u[4]' },
+    234 => { Name => 'Face2BEye1', Condition => '$$self{FacesA} >= 2', Format => 'int32u[4]' },
+    238 => { Name => 'Face2BEye2', Condition => '$$self{FacesA} >= 2', Format => 'int32u[4]' },
+    250 => { Name => 'Face3BArea', Condition => '$$self{FacesA} >= 3', Format => 'int32u[4]' },
+    254 => { Name => 'Face3BEye1', Condition => '$$self{FacesA} >= 3', Format => 'int32u[4]' },
+    258 => { Name => 'Face3BEye2', Condition => '$$self{FacesA} >= 3', Format => 'int32u[4]' },
+    270 => { Name => 'Face4BArea', Condition => '$$self{FacesA} >= 4', Format => 'int32u[4]' },
+    274 => { Name => 'Face4BEye1', Condition => '$$self{FacesA} >= 4', Format => 'int32u[4]' },
+    278 => { Name => 'Face4BEye2', Condition => '$$self{FacesA} >= 4', Format => 'int32u[4]' },
+    290 => { Name => 'Face5BArea', Condition => '$$self{FacesA} >= 5', Format => 'int32u[4]' },
+    294 => { Name => 'Face5BEye1', Condition => '$$self{FacesA} >= 5', Format => 'int32u[4]' },
+    298 => { Name => 'Face5BEye2', Condition => '$$self{FacesA} >= 5', Format => 'int32u[4]' },
+    310 => { Name => 'Face6BArea', Condition => '$$self{FacesA} >= 6', Format => 'int32u[4]' },
+    314 => { Name => 'Face6BEye1', Condition => '$$self{FacesA} >= 6', Format => 'int32u[4]' },
+    318 => { Name => 'Face6BEye2', Condition => '$$self{FacesA} >= 6', Format => 'int32u[4]' },
+    330 => { Name => 'Face7BArea', Condition => '$$self{FacesA} >= 7', Format => 'int32u[4]' },
+    334 => { Name => 'Face7BEye1', Condition => '$$self{FacesA} >= 7', Format => 'int32u[4]' },
+    338 => { Name => 'Face7BEye2', Condition => '$$self{FacesA} >= 7', Format => 'int32u[4]' },
+    350 => { Name => 'Face8BArea', Condition => '$$self{FacesA} >= 8', Format => 'int32u[4]' },
+    354 => { Name => 'Face8BEye1', Condition => '$$self{FacesA} >= 8', Format => 'int32u[4]' },
+    358 => { Name => 'Face8BEye2', Condition => '$$self{FacesA} >= 8', Format => 'int32u[4]' },
+    370 => { Name => 'Face9BArea', Condition => '$$self{FacesA} >= 9', Format => 'int32u[4]' },
+    374 => { Name => 'Face9BEye1', Condition => '$$self{FacesA} >= 9', Format => 'int32u[4]' },
+    378 => { Name => 'Face9BEye2', Condition => '$$self{FacesA} >= 9', Format => 'int32u[4]' },
+    390 => { Name => 'Face10BArea',Condition => '$$self{FacesA} >= 10', Format => 'int32u[4]' },
+    394 => { Name => 'Face10BEye1',Condition => '$$self{FacesA} >= 10', Format => 'int32u[4]' },
+    398 => { Name => 'Face10BEye2',Condition => '$$self{FacesA} >= 10', Format => 'int32u[4]' },
+);
+
+%Image::ExifTool::Pentax::AFInfoK3III = (
+    %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.',
+    0 => {
+        Name => 'AFInfo',
+        Format => 'int16u[$size/2]',
+        Notes => q{
+            entire AFInfoK3III structure. Provides access to raw numerical values and
+            facilitates the writing of the whole structure
+        },
+        Unknown => 1,
+    },
+    0.1 => {
+        Name => 'AFMode',
+        PrintConv => {
+            0 => 'Phase Detect',
+            2 => 'Contrast Detect',
+            255 => 'Manual Focus',
+        },
+    },
+    1 => {
+        Name => 'AFSelectionMode',
+        PrintHex => 1,
+        PrintConv => {
+            0 => 'Manual Focus',
+            1 => 'Spot',
+            2 => 'Select (5-points)',
+            3 => 'Expanded Area (S)',
+            4 => 'Expanded Area (M)',
+            5 => 'Expanded Area (L)',
+            6 => 'Select (S)',
+            7 => 'Zone Select (21-point)',
+            8 => 'Select XS',
+            0xff => 'Auto Area',
+            # Contrast-detect modes
+            0x2001 => 'Contrast-detect Auto Area',
+            0x2002 => 'Contrast-detect Select', # (GR III)
+            0x2003 => 'Pinpoint', # (GR III)
+            0x2004 => 'Tracking',
+            0x2005 => 'Continuous', # (GR III)
+            0x2006 => 'Face Detection',
+            0x2007 => 'Contrast-detect Select (S)',
+            0x2008 => 'Contrast-detect Select (M)',
+            0x2009 => 'Contrast-detect Select (L)',
+            0x200a => 'Contrast-detect Zone Select', # (GR III)
+            0x200b => 'Contrast-detect Spot',
+        },
+    },
+    3 => {
+        Name => 'NumAFPoints',
+        RawConv => '$$self{NumAFPoints} = $val',
+    },
+    # the data for each AF point consists of 7 int16u values:
+    # the frame width/height, the X/Y position of the focus area,
+    # width/height of the focus area (0/0 for phase-detect modes),
+    # followed by a flags word
+    7 => { # (the same for all areas in my samples, so only extract the first)
+        Name => 'AFFrameSize',
+        Condition => '$$self{NumAFPoints} > 0',
+        Format => 'int16u[2]',
+        Writable => 0,
+        PrintConv => '$val=~s/ /x/; $val',
+    },
+    7.1 => {
+        Name => 'AFAreas',
+        Format => 'int16u[7 * $val{3}]',
+        Notes => q{
+            X,Y position of each AF area, width, with "in-focus" for points in focus,
+            "central" for the center of the selected area, or "peripheral" for points
+            outside the selected area
+        },
+        Writable => 0,
+        List => 1, # (for documentation purposes only)
+        PrintConv => \&AFAreasK3III,
+    },
+    11 => { # (the same for all areas in my samples, so only extract the first)
+        Name => 'AFAreaSize',
+        Condition => '$$self{NumAFPoints} > 0 and $$valPt !~ /^\0\0\0\0/',
+        Notes => 'only for contrast-detect modes',
+        Format => 'int16u[2]',
+        Writable => 0,
+        PrintConv => '$val=~s/ /x/; $val',
+    },
+);
+
 # white balance RGGB levels (ref 28)
 %Image::ExifTool::Pentax::WBLevels = (
     %binaryDataAttrs,
@@ -5750,7 +6003,7 @@ my %binaryDataAttrs = (
     },
 );
 
-# lens information for Penax Q (ref PH)
+# lens information for Pentax Q (ref PH)
 # (306 bytes long, I wonder if this contains vignetting information too?)
 %Image::ExifTool::Pentax::LensInfoQ = (
     %binaryDataAttrs,
@@ -5824,6 +6077,14 @@ my %binaryDataAttrs = (
         K-500.  It is currently not known where the corresponding temperature
         sensors are located in the camera.
     },
+    0x0a => { #KG
+          Name => 'ShotNumber',
+          Condition => '$$self{Model} =~ /K-3 Mark III/',
+          # The exact same method to detect this tag with a similar set of files
+          # does not reveal anything for K-1. Is this only available for K-3-III ?
+          # Internal representation starts at 0 for the 1st shot
+          ValueConv => '$val+1',
+    },
     # (it would be nice to know where these temperature sensors are located,
     #  but since according to the manual the Slow Shutter Speed NR Auto mode
     #  is based on "internal temperature", my guess is that there must be
@@ -6461,9 +6722,9 @@ sub DecodeAFPoints($$$$;$)
 }
 
 #------------------------------------------------------------------------------
-# Print AF Point names for K-3III (ref PH)
+# Print K-3III AF Point names (ref PH)
 # Inputs: 0) value, 1) ExifTool ref, 2) optional value to match
-sub AFPointsK3iii($$;$)
+sub AFPointNamesK3III($$;$)
 {
     my @a = split ' ', $_[0];
     my $match = $_[2];
@@ -6477,10 +6738,10 @@ sub AFPointsK3iii($$;$)
 }
 
 #------------------------------------------------------------------------------
-# Print AF point values for K-3III (ref PH)
+# Print K-3III AF point values (ref PH)
 # Inputs: 0) value, 1) ExifTool ref
 # Notes: this is experimental and not well understood
-sub AFPointValues($$)
+sub AFPointValuesK3III($$)
 {
     my @a = split ' ', shift;
     my @vals;
@@ -6499,6 +6760,25 @@ sub AFPointValues($$)
     return @vals ? join ',', sort @vals : '(none)';
 }
 
+#------------------------------------------------------------------------------
+# Print K-3III AF point positions from tag 0x040c (ref KG)
+# Inputs: 0) raw value, 1) ExifTool ref
+sub AFAreasK3III($$)
+{
+    my ($val, $et) = @_;
+    return '(none)' unless $val;
+    my @vals = split ' ', $val;
+    # flags bits: [mask, value, description]
+    my @flags = ([0x10,0x10,'central'],[0x08,0,'peripheral'],[0x04,0x04,'in-focus']);
+    my ($i, @strs);
+    for ($i=0; $i+7<=@vals; $i+=7) {
+        my @a;
+        ($vals[$i+6] & $$_[0]) == $$_[1] and push @a, $$_[2] foreach @flags;
+        push @strs, $vals[$i+2] . ',' . $vals[$i+3] . (@a ? '(' . join(',',@a) . ')' : '');
+    }
+    return \@strs;
+}
+
 #------------------------------------------------------------------------------
 # Convert Pentax hex-based EV (modulo 8) to real number
 # Inputs: 0) value to convert

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ProcessProtobuf($$$;$);
 

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.18';
+$VERSION = '3.19';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -2379,7 +2379,14 @@ my %userDefined = (
     # saut - 4 bytes all zero (Samsung SM-N900T)
     # smrd - string "TRUEBLUE" (Samsung SM-C101, etc)
     # ---- Sigma ----
-    SIGM => {
+    SIGM => [{
+        Name => 'SigmaEXIF',
+        Condition => '$$valPt =~ /^(II\x2a\0|MM\0\x2a)/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF, # (because ProcessMOV is default)
+        },
+    },{
         Name => 'PreviewImage',
         # 32-byte header followed by preview image.  Length at offset 6 in header
         Condition => 'length($$valPt) > 0x20 and length($$valPt) == unpack("x6V",$$valPt) + 0x20',
@@ -2396,7 +2403,7 @@ my %userDefined = (
             }
             return $pt;
         },
-    },
+    }],
     # ---- TomTom Bandit Action Cam ----
     TTMD => {
         Name => 'TomTomMetaData',
@@ -2937,7 +2944,7 @@ my %userDefined = (
         Writable => 'int8u',
         Protected => 1,
         PrintConv => {
-            0 => 'Horizontal (Normal)',
+            0 => 'Horizontal (normal)',
             1 => 'Rotate 270 CW',
             2 => 'Rotate 180',
             3 => 'Rotate 90 CW',

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 110 different types of timed GPS metadata from video files.
+        currently reads 111 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },