Changeset 34921 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Pentax.pm

Timestamp:

2021-02-26T19:39:51+13:00 (3 years ago)

Author:

anupama

Message:

Committing the improvements to EmbeddedMetaPlugin's processing of Keywords vs other metadata fields. Keywords were literally stored as arrays of words rather than phrases in PDFs (at least in Diego's sample PDF), whereas other meta fields like Subjects and Creators stored them as arrays of phrases. To get both to work, Kathy updated EXIF to a newer version, to retrieve the actual EXIF values stored in the PDF. And Kathy and Dr Bainbridge came up with a new option that I added called apply_join_before_split_to_metafields that's a regex which can list the metadata fields to apply the join_before_split to and whcih previously always got applied to all metadata fields. Now it's applied to any *Keywords metafields by default, as that's the metafield we have experience of that behaves differently to the others, as it stores by word instead of phrases. Tested on Diego's sample PDF. Diego has double-checked it to works on his sample PDF too, setting the split char to ; and turning on the join_before_split and leaving apply_join_before_split_to_metafields at its default of .*Keywords. File changes are strings.properties for the tooltip, the plugin introducing the option and working with it and Kathy's EXIF updates affecting cpan/File and cpan/Image.

File:

• main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Pentax.pm (modified) (160 diffs)

main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Pentax.pm

@@ -31 +31 @@
 #              16) Axel Kellner private communication (K10D)
 #              17) Cvetan Ivanov private communication (K100D)
-#              18) http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html
+#              18) http://gvsoft.homedns.org/exif/makernote-pentax-type3.html
 #              19) Dave Nicholson private communication (K10D)
 #              20) Bogdan and yeryry (http://www.cpanforum.com/posts/8037)
@@ -38 +38 @@
 #              23) Akos Szalkai (https://rt.cpan.org/Ticket/Display.html?id=43743)
 #              24) Albert Bogner private communication
-#              25) Niels Kristian Bech Jensen private communication
+#              26) https://exiftool.org/forum/index.php/topic,3444.0.html
+#              27) https://exiftool.org/forum/index.php/topic,3833.0.html
+#              28) Klaus Homeister https://exiftool.org/forum/index.php/topic,4803.0.html
+#              29) Louis Granboulan private communication (K-5II)
+#              30) https://exiftool.org/forum/index.php?topic=5433
+#              31) Andras Salamon private communication (K-70)
+#              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
+#              NJ) Niels Kristian Bech Jensen private communication
 #
 # Notes:        See POD documentation at the bottom of this file
@@ -47 +54 @@
 
 use strict;
-use vars qw($VERSION);
+use vars qw($VERSION %pentaxLensTypes);
 use Image::ExifTool::Exif;
+use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '2.30';
+$VERSION = '3.36';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
+sub DecodeAFPoints($$$$;$);
 
 # pentax lens type codes (ref 4)
 # The first number gives the lens series, and the 2nd gives the model number
 # Series numbers: K=1; A=2; F=3; FAJ=4; DFA=4,7; FA=3,4,5,6; FA*=5,6;
-#                 DA=3,4,7; DA*=7,8; FA645=11; DFA645=13
-my %pentaxLensTypes = (
+#                 DA=3,4,7; DA*=7,8; FA645=11; DFA645=13; Q=21
+%pentaxLensTypes = (
     Notes => q{
         The first number gives the series of the lens, and the second identifies the
         lens model.  Note that newer series numbers may not always be properly
-        identified by cameras running older firmware versions.  Decimal values
-        differentiate lenses which would otherwise have the same LensType, and are
-        used by the Composite LensID tag when attempting to identify the specific
-        lens model.
+        identified by cameras running older firmware versions.  Decimal values have
+        been added to differentiate lenses which would otherwise have the same
+        LensType, and are used by the Composite LensID tag when attempting to
+        identify the specific lens model.
+    },
+    OTHER => sub {
+        my ($val, $inv, $conv) = @_;
+        return undef if $inv;
+        # *istD may report a series number of 4 for series 7 lenses
+        $val =~ s/^4 /7 / and $$conv{$val} and return "$$conv{$val} ($_[0])";
+        # cameras that don't recognize SDM lenses (eg. older K10 firmware)
+        # may report series 7 instead of 8
+        $val =~ s/^7 /8 / and $$conv{$val} and return "$$conv{$val} ? ($_[0])";
+        # there seems to some inconsistency between FA and DFA lenses for the 645D...
+        ($val =~ s/^11 /13 / or $val =~ s/^13 /11 /) and $$conv{$val} and return "$$conv{$val} ? ($_[0])";
+        return undef;
     },
     '0 0' => 'M-42 or No Lens', #17
     '1 0' => 'K or M Lens',
     '2 0' => 'A Series Lens', #7 (from smc PENTAX-A 400mm F5.6)
-    '3 0' => 'Sigma', # (includes 'Sigma 30mm F1.4 EX DC' - PH)
-    '3 17' => 'smc PENTAX-FA SOFT 85mm F2.8',
+    '3 0' => 'Sigma',
+    # (and 'Sigma 18-50mm F2.8 EX Macro')
+    # (and 'Sigma 30mm F1.4 EX DC', ref PH)
+    # (and 'Sigma 50-500mm F4-6.3 DG APO')
+    # (and 'Sigma 70mm F2.8 EX DG Macro')
+    # (and 'Sigma 105mm F2.8 EX DG Macro', ref 24)
+    # (and 'Sigma 180mm F4.5 EX DG Macro')
+    '3 17' => 'smc PENTAX-FA SOFT 85mm F2.8', # (also F version, ref 29)
     '3 18' => 'smc PENTAX-F 1.7X AF ADAPTER',
     '3 19' => 'smc PENTAX-F 24-50mm F4',
@@ -82 +109 @@
     '3 23.1' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #JD
     '3 23.2' => 'Sigma AF 28-300mm F3.5-6.3 DG IF Macro', #JD
+    '3 23.3' => 'Tokina 80-200mm F2.8 ATX-Pro', #Exiv2
     '3 24' => 'smc PENTAX-F 35-135mm F3.5-4.5',
     '3 25' => 'smc PENTAX-F 35-105mm F4-5.6 or Sigma or Tokina Lens',
-    '3 25.1' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #11
-    '3 25.2' => 'Sigma 55-200mm F4-5.6 DC', #JD
-    '3 25.3' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #JD
+    '3 25.1' => 'Sigma 55-200mm F4-5.6 DC', #JD
+    '3 25.2' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #11
+    '3 25.3' => 'Sigma AF 28-300mm F3.5-6.3 DL IF', #Exiv2
     '3 25.4' => 'Sigma AF 28-300mm F3.5-6.3 DG IF Macro', #JD
     '3 25.5' => 'Tokina 80-200mm F2.8 ATX-Pro', #12
@@ -94 +122 @@
     '3 28' => 'smc PENTAX-F 35-70mm F3.5-4.5 or Tokina Lens',
     '3 28.1' => 'Tokina 19-35mm F3.5-4.5 AF', #12
+    '3 28.2' => 'Tokina AT-X AF 400mm F5.6', #NJ
     '3 29' => 'PENTAX-F 28-80mm F3.5-4.5 or Sigma or Tokina Lens',
     '3 29.1' => 'Sigma AF 18-125mm F3.5-5.6 DC', #11
@@ -111 +140 @@
     '3 41' => 'smc PENTAX-F Macro 50mm F2.8 or Sigma Lens', #4
     '3 41.1' => 'Sigma 50mm F2.8 Macro', #16
+    '3 42' => 'Sigma 300mm F2.8 EX DG APO IF', #27
     '3 44' => 'Sigma or Tamron Lens (3 44)',
     '3 44.1' => 'Sigma AF 10-20mm F4-5.6 EX DC', #JD
-    '3 44.2' => 'Sigma 12-24mm F4.5 EX DG', #12
+    '3 44.2' => 'Sigma 12-24mm F4.5-5.6 EX DG', #12 (added "-5.6", ref 29)
     '3 44.3' => 'Sigma 17-70mm F2.8-4.5 DC Macro', #(Bart Hickman)
     '3 44.4' => 'Sigma 18-50mm F3.5-5.6 DC', #4
-    '3 44.5' => 'Tamron 35-90mm F4 AF', #12
-    '3 46' => 'Sigma Lens (3 46)',
+    '3 44.5' => 'Sigma 17-35mm F2.8-4 EX DG', #29
+    '3 44.6' => 'Tamron 35-90mm F4-5.6 AF', #12 (added "-5.6", ref IB)
+    '3 44.7' => 'Sigma AF 18-35mm F3.5-4.5 Aspherical', #29
+    '3 46' => 'Sigma or Samsung Lens (3 46)',
     '3 46.1' => 'Sigma APO 70-200mm F2.8 EX',
     '3 46.2' => 'Sigma EX APO 100-300mm F4 IF', #JD
+    '3 46.3' => 'Samsung/Schneider D-XENON 50-200mm F4-5.6 ED', #29
     '3 50' => 'smc PENTAX-FA 28-70mm F4 AL',
     '3 51' => 'Sigma 28mm F1.8 EX DG Aspherical Macro',
@@ -141 +174 @@
     '3 255.7' => 'Sigma 70-300mm F4-5.6 Macro', #JD
     '3 255.8' => 'Sigma 55-200mm F4-5.6 DC', #JD
-    '3 255.9' => 'Sigma 18-50mm F2.8 EX DC', #JD
+    '3 255.9' => 'Sigma 18-50mm F2.8 EX DC', #JD (also Macro version - PH)
     '4 1' => 'smc PENTAX-FA SOFT 28mm F2.8',
     '4 2' => 'smc PENTAX-FA 80-320mm F4.5-5.6',
     '4 3' => 'smc PENTAX-FA 43mm F1.9 Limited',
     '4 6' => 'smc PENTAX-FA 35-80mm F4-5.6',
+    '4 8' => 'Irix 150mm F2.8 Macro', #exiv2 issue 1084
+    '4 9' => 'Irix 11mm F4 Firefly', #27
+    '4 10' => 'Irix 15mm F2.4', #27
     '4 12' => 'smc PENTAX-FA 50mm F1.4', #17
     '4 15' => 'smc PENTAX-FA 28-105mm F4-5.6 [IF]',
@@ -163 +199 @@
     '4 34' => 'smc PENTAX-FA 24-90mm F3.5-4.5 AL[IF]',
     '4 35' => 'smc PENTAX-FA 100-300mm F4.7-5.8',
-    '4 36' => 'Tamron AF70-300mm F4-5.6 LD Macro', # both 572D and A17 (Di) - ref JD
+  # '4 36' => 'Tamron AF70-300mm F4-5.6 LD Macro', # both 572D and A17 (Di) - ref JD
+    '4 36' => 'Tamron AF 70-300mm F4-5.6 LD Macro 1:2', #NJ
     '4 37' => 'Tamron SP AF 24-135mm F3.5-5.6 AD AL (190D)', #13
     '4 38' => 'smc PENTAX-FA 28-105mm F3.2-4.5 AL[IF]',
@@ -175 +212 @@
     '4 46' => 'smc PENTAX-FA J 28-80mm F3.5-5.6 AL',
     '4 47' => 'smc PENTAX-FA J 18-35mm F4-5.6 AL',
-    '4 49' => 'Tamron SP AF 28-75mm F2.8 XR Di (A09)',
+   #'4 49' => 'Tamron SP AF 28-75mm F2.8 XR Di (A09)',
+    '4 49' => 'Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical [IF] Macro', #NJ
     '4 51' => 'smc PENTAX-D FA 50mm F2.8 Macro',
     '4 52' => 'smc PENTAX-D FA 100mm F2.8 Macro',
+    '4 55' => 'Samsung/Schneider D-XENOGON 35mm F2', #29
+    '4 56' => 'Samsung/Schneider D-XENON 100mm F2.8 Macro', #Alan Robinson
     '4 75' => 'Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)', #JD
+    '4 214' => 'smc PENTAX-DA 35mm F2.4 AL', #PH
     '4 229' => 'smc PENTAX-DA 18-55mm F3.5-5.6 AL II', #JD
     '4 230' => 'Tamron SP AF 17-50mm F2.8 XR Di II', #20
     '4 231' => 'smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]', #21
     '4 237' => 'Samsung/Schneider D-XENOGON 10-17mm F3.5-4.5', #JD
-    '4 239' => 'Samsung D-XENON 12-24mm F4 ED AL [IF]', #23
+    '4 239' => 'Samsung/Schneider D-XENON 12-24mm F4 ED AL [IF]', #23
+    '4 242' => 'smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM unused)', #Pietu Pohjalainen
     '4 243' => 'smc PENTAX-DA 70mm F2.4 Limited', #JD
     '4 244' => 'smc PENTAX-DA 21mm F3.2 AL Limited', #9
-    '4 245' => 'Schneider D-XENON 50-200mm F4-5.6', #15
-    '4 246' => 'Schneider D-XENON 18-55mm F3.5-5.6', #15
+    '4 245' => 'Samsung/Schneider D-XENON 50-200mm F4-5.6', #15
+    '4 246' => 'Samsung/Schneider D-XENON 18-55mm F3.5-5.6', #15
     '4 247' => 'smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]', #10
     '4 248' => 'smc PENTAX-DA 12-24mm F4 ED AL [IF]', #10
@@ -228 +270 @@
     '7 58' => 'smc PENTAX-D FA Macro 100mm F2.8 WR', #PH - this bit of information cost me $600 ;)
     '7 75' => 'Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)', #(Anton Bondar)
+    '7 201' => 'smc Pentax-DA L 50-200mm F4-5.6 ED WR', #(Bruce Rusk)
+    '7 202' => 'smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR', #29
+    '7 203' => 'HD PENTAX-DA 55-300mm F4-5.8 ED WR', #29
+    '7 204' => 'HD PENTAX-DA 15mm F4 ED AL Limited', #forum5318
+    '7 205' => 'HD PENTAX-DA 35mm F2.8 Macro Limited', #29
+    '7 206' => 'HD PENTAX-DA 70mm F2.4 Limited', #29
+    '7 207' => 'HD PENTAX-DA 21mm F3.2 ED AL Limited', #forum5327
+    '7 208' => 'HD PENTAX-DA 40mm F2.8 Limited', #PH
+    '7 212' => 'smc PENTAX-DA 50mm F1.8', #PH
+    '7 213' => 'smc PENTAX-DA 40mm F2.8 XS', #PH
     '7 214' => 'smc PENTAX-DA 35mm F2.4 AL', #PH
     '7 216' => 'smc PENTAX-DA L 55-300mm F4-5.8 ED', #PH
@@ -235 +287 @@
     '7 221' => 'smc PENTAX-DA L 50-200mm F4-5.6 ED', #Ar't
     '7 222' => 'smc PENTAX-DA L 18-55mm F3.5-5.6', #PH (tag 0x003f -- was '7 229' in LensInfo of one test image)
-    '7 223' => 'Samsung D-XENON 18-55mm F3.5-5.6 II', #PH
+    '7 223' => 'Samsung/Schneider D-XENON 18-55mm F3.5-5.6 II', #PH
     '7 224' => 'smc PENTAX-DA 15mm F4 ED AL Limited', #JD
-    '7 225' => 'Samsung D-XENON 18-250mm F3.5-6.3', #8/PH
+    '7 225' => 'Samsung/Schneider D-XENON 18-250mm F3.5-6.3', #8/PH
     '7 226' => 'smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)', #PH (NC)
-    '7 227' => 'smc PENTAX DA* 60-250mm F4 [IF] SDM (SDM unused)', #PH (NC)
+    '7 227' => 'smc PENTAX-DA* 60-250mm F4 [IF] SDM (SDM unused)', #PH (NC)
+    '7 228' => 'Samsung 16-45mm F4 ED', #29
     '7 229' => 'smc PENTAX-DA 18-55mm F3.5-5.6 AL II', #JD
     '7 230' => 'Tamron AF 17-50mm F2.8 XR Di-II LD (Model A16)', #JD
@@ -252 +305 @@
     '7 243' => 'smc PENTAX-DA 70mm F2.4 Limited', #PH
     '7 244' => 'smc PENTAX-DA 21mm F3.2 AL Limited', #16
+    '8 0' => 'Sigma 50-150mm F2.8 II APO EX DC HSM', #forum2997
+    '8 3' => 'Sigma 18-125mm F3.8-5.6 DC HSM', #forum10167
+    '8 4' => 'Sigma 50mm F1.4 EX DG HSM', #Artur private communication
+    '8 6' => 'Sigma 4.5mm F2.8 EX DC Fisheye', #IB
+    '8 7' => 'Sigma 24-70mm F2.8 IF EX DG HSM', #Exiv2
+    '8 8' => 'Sigma 18-250mm F3.5-6.3 DC OS HSM', #27
+    '8 11' => 'Sigma 10-20mm F3.5 EX DC HSM', #27
+    '8 12' => 'Sigma 70-300mm F4-5.6 DG OS', #forum3382
+    '8 13' => 'Sigma 120-400mm F4.5-5.6 APO DG OS HSM', #26
     '8 14' => 'Sigma 17-70mm F2.8-4.0 DC Macro OS HSM', #(Hubert Meier)
-    '8 18' => 'Sigma 8-16mm F4.5-5.6 DC HSM', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2998.0.html
+    '8 15' => 'Sigma 150-500mm F5-6.3 APO DG OS HSM', #26
+    '8 16' => 'Sigma 70-200mm F2.8 EX DG Macro HSM II', #26
+    '8 17' => 'Sigma 50-500mm F4.5-6.3 DG OS HSM', #(Heike Herrmann) (also APO, ref 26)
+    '8 18' => 'Sigma 8-16mm F4.5-5.6 DC HSM', #forum2998
+    '8 20' => 'Sigma 18-50mm F2.8-4.5 DC HSM', #IB
+    '8 21' => 'Sigma 17-50mm F2.8 EX DC OS HSM', #26
+    '8 22' => 'Sigma 85mm F1.4 EX DG HSM', #26
+    '8 23' => 'Sigma 70-200mm F2.8 APO EX DG OS HSM', #27
+    '8 24' => 'Sigma 17-70mm F2.8-4 DC Macro OS HSM', #27
+    '8 25' => 'Sigma 17-50mm F2.8 EX DC HSM', #Exiv2
+    '8 27' => 'Sigma 18-200mm F3.5-6.3 II DC HSM', #27
+    '8 28' => 'Sigma 18-250mm F3.5-6.3 DC Macro HSM', #27
+    '8 29' => 'Sigma 35mm F1.4 DG HSM', #27
+    '8 30' => 'Sigma 17-70mm F2.8-4 DC Macro HSM | C', #27
+    '8 31' => 'Sigma 18-35mm F1.8 DC HSM', #27
+    '8 32' => 'Sigma 30mm F1.4 DC HSM | A', #27
+    '8 33' => 'Sigma 18-200mm F3.5-6.3 DC Macro HSM', #DieterPearcey (C014)
+    '8 34' => 'Sigma 18-300mm F3.5-6.3 DC Macro HSM', #NJ
+    '8 59' => 'HD PENTAX-D FA 150-450mm F4.5-5.6 ED DC AW', #29
+    '8 60' => 'HD PENTAX-D FA* 70-200mm F2.8 ED DC AW', #29
+    '8 61' => 'HD PENTAX-D FA 28-105mm F3.5-5.6 ED DC WR', #PH
+    '8 62' => 'HD PENTAX-D FA 24-70mm F2.8 ED SDM WR', #PH
+    '8 63' => 'HD PENTAX-D FA 15-30mm F2.8 ED SDM WR', #PH
+    '8 64' => 'HD PENTAX-D FA* 50mm F1.4 SDM AW', #27
+    '8 65' => 'HD PENTAX-D FA 70-210mm F4 ED SDM WR', #PH
+    '8 66' => 'HD PENTAX-D FA 85mm F1.4 ED SDM AW', #James O'Neill
+    '8 196' => 'HD PENTAX-DA* 11-18mm F2.8 ED DC AW', #29
+    '8 197' => 'HD PENTAX-DA 55-300mm F4.5-6.3 ED PLM WR RE', #29
+    '8 198' => 'smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE', #29
+    '8 199' => 'HD PENTAX-DA 18-50mm F4-5.6 DC WR RE', #29
+    '8 200' => 'HD PENTAX-DA 16-85mm F3.5-5.6 ED DC WR', #29
+    '8 209' => 'HD PENTAX-DA 20-40mm F2.8-4 ED Limited DC WR', #29
+    '8 210' => 'smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM', #Helmut Schutz
+    '8 211' => 'HD PENTAX-DA 560mm F5.6 ED AW', #PH
     '8 215' => 'smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR', #PH
     '8 226' => 'smc PENTAX-DA* 55mm F1.4 SDM', #JD
-    '8 227' => 'smc PENTAX DA* 60-250mm F4 [IF] SDM', #JD
+    '8 227' => 'smc PENTAX-DA* 60-250mm F4 [IF] SDM', #JD
     '8 232' => 'smc PENTAX-DA 17-70mm F4 AL [IF] SDM', #JD
     '8 234' => 'smc PENTAX-DA* 300mm F4 ED [IF] SDM', #19
@@ -264 +359 @@
     '8 255' => 'Sigma Lens (8 255)',
     '8 255.1' => 'Sigma 70-200mm F2.8 EX DG Macro HSM II', #JD
-    '8 255.2' => 'Sigma APO 150-500mm F5-6.3 DG OS HSM', #JD
-    '8 255.3' => 'Sigma 50-150mm F2.8 II APO EX DC HSM', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2997.0.html
+    '8 255.2' => 'Sigma 150-500mm F5-6.3 DG APO [OS] HSM', #JD (non-OS version has same type, ref 29)
+    '8 255.3' => 'Sigma 50-150mm F2.8 II APO EX DC HSM', #forum2997
+    '8 255.4' => 'Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye', #PH
+    '8 255.5' => 'Sigma 50-200mm F4-5.6 DC OS', #26
+    '8 255.6' => 'Sigma 24-70mm F2.8 EX DG HSM', #29
+#
+# 645 lenses
+#
+    '9 0' => '645 Manual Lens', #PH (NC)
+    '10 0' => '645 A Series Lens', #PH
+    '11 1' => 'smc PENTAX-FA 645 75mm F2.8', #PH
+    '11 2' => 'smc PENTAX-FA 645 45mm F2.8', #PH
+    '11 3' => 'smc PENTAX-FA* 645 300mm F4 ED [IF]', #PH
     '11 4' => 'smc PENTAX-FA 645 45-85mm F4.5', #PH
+    '11 5' => 'smc PENTAX-FA 645 400mm F5.6 ED [IF]', #PH
+    '11 7' => 'smc PENTAX-FA 645 Macro 120mm F4', #PH
     '11 8' => 'smc PENTAX-FA 645 80-160mm F4.5', #PH
+    '11 9' => 'smc PENTAX-FA 645 200mm F4 [IF]', #PH
+    '11 10' => 'smc PENTAX-FA 645 150mm F2.8 [IF]', #PH
     '11 11' => 'smc PENTAX-FA 645 35mm F3.5 AL [IF]', #PH
+    '11 12' => 'smc PENTAX-FA 645 300mm F5.6 ED [IF]', #29
+    '11 14' => 'smc PENTAX-FA 645 55-110mm F5.6', #PH
+    '11 16' => 'smc PENTAX-FA 645 33-55mm F4.5 AL', #PH
     '11 17' => 'smc PENTAX-FA 645 150-300mm F5.6 ED [IF]', #PH
+    '11 21' => 'HD PENTAX-D FA 645 35mm F3.5 AL [IF]', #29
     '13 18' => 'smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW', #PH
+    '13 19' => 'smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW', #PH
+    '13 20' => 'HD PENTAX-D FA 645 90mm F2.8 ED AW SR', #PH
+    '13 253' => 'HD PENTAX-DA 645 28-45mm F4.5 ED AW SR', #Dominique Schrekling email
+    '13 254' => 'smc PENTAX-DA 645 25mm F4 AL [IF] SDM AW', #forum8253
+#
+# Q-mount lenses (21=auto focus lens, 22=manual focus)
+#
+    '21 0' => 'Pentax Q Manual Lens', #PH
+    '21 1' => '01 Standard Prime 8.5mm F1.9', #PH
+    '21 2' => '02 Standard Zoom 5-15mm F2.8-4.5', #PH
+    '22 3' => '03 Fish-eye 3.2mm F5.6', #PH
+    '22 4' => '04 Toy Lens Wide 6.3mm F7.1', #PH
+    '22 5' => '05 Toy Lens Telephoto 18mm F8', #PH
+    '21 6' => '06 Telephoto Zoom 15-45mm F2.8', #PH
+    '21 7' => '07 Mount Shield 11.5mm F9', #PH (NC)
+    '21 8' => '08 Wide Zoom 3.8-5.9mm F3.7-4', #PH (NC)
+    '21 233' => 'Adapter Q for K-mount Lens', #29
+#
+# Ricoh lenses
+#
+    '31 1' => 'GR Lens', #PH (GR III 28mm F2.8)
 );
 
@@ -327 +462 @@
     0x12c3c => 'Optio W20',
     0x12c46 => 'Optio A20',
-    0x12c8c => 'Optio M30',
     0x12c78 => 'Optio E30',
     0x12c7d => 'Optio E35',
     0x12c82 => 'Optio T30',
+    0x12c8c => 'Optio M30',
     0x12c91 => 'Optio L30',
     0x12c96 => 'Optio W30',
@@ -373 +508 @@
     0x12e6c => 'K-r',
     0x12e76 => 'K-5',
-    0x12e8a => 'Optio RS1000 / RS1500',
+    0x12e8a => 'Optio RS1000/RS1500',
     0x12e94 => 'Optio RZ10',
+    0x12e9e => 'Optio LS1000',
     0x12ebc => 'Optio WG-1 GPS',
+    0x12ed0 => 'Optio S1',
+    0x12ee4 => 'Q',
+    0x12ef8 => 'K-01',
+    0x12f0c => 'Optio RZ18',
+    0x12f16 => 'Optio VS20',
+    0x12f2a => 'Optio WG-2 GPS',
+    0x12f48 => 'Optio LS465',
+    0x12f52 => 'K-30',
+    0x12f5c => 'X-5',
+    0x12f66 => 'Q10',
+    0x12f70 => 'K-5 II',
+    0x12f71 => 'K-5 II s', #forum4515
+    0x12f7a => 'Q7',
+    0x12f84 => 'MX-1',
+    0x12f8e => 'WG-3 GPS',
+    0x12f98 => 'WG-3',
+    0x12fa2 => 'WG-10',
+    0x12fb6 => 'K-50',
+    0x12fc0 => 'K-3', #29
+    0x12fca => 'K-500',
+    0x12fe8 => 'WG-4', # (Ricoh)
+    0x12fde => 'WG-4 GPS', # (Ricoh)
+    0x13006 => 'WG-20', # (Ricoh)
+    0x13010 => '645Z',
+    0x1301a => 'K-S1',
+    0x13024 => 'K-S2', #29 (Ricoh)
+    0x1302e => 'Q-S1',
+    0x13056 => 'WG-30', # (Ricoh)
+    0x1307e => 'WG-30W', # (Ricoh)
+    0x13088 => 'WG-5 GPS', # (Ricoh)
+    0x13092 => 'K-1', #IB (Ricoh)
+    0x1309c => 'K-3 II', #29 (Ricoh)
+    0x131f0 => 'WG-M2', # (Ricoh)
+    0x1320e => 'GR III', # (Ricoh)
+    0x13222 => 'K-70', #29 (Ricoh)
+    0x1322c => 'KP', #29 (Ricoh)
+    0x13240 => 'K-1 Mark II', # (Ricoh)
+    0x13290 => 'WG-70', # (Ricoh)
 );
 
@@ -384 +558 @@
     2 => 'Anchorage',
     3 => 'Vancouver',
-    4 => 'San Fransisco',
+    4 => 'San Francisco',
     5 => 'Los Angeles',
     6 => 'Calgary',
@@ -451 +625 @@
     69 => 'Stockholm',
     70 => 'Lisbon', #14
-    71 => 'Copenhagen', #25
+    71 => 'Copenhagen', #NJ
     72 => 'Warsaw',
     73 => 'Prague',
@@ -489 +663 @@
         18 => 'Posterization',
         19 => 'Sketch Filter',
+        20 => 'Shading', # (Q)
+        21 => 'Invert Color', # (Q)
+        23 => 'Tone Expansion', #Forum5247
+        27 => 'Unicolor Bold', #31
+        28 => 'Bold Monochrome', #31
+        29 => 'Replace Color', #31
         254 => 'Custom Filter',
     },
@@ -506 +686 @@
     9  => ['Color',         { 1=>'Red',2=>'Magenta',3=>'Blue',4=>'Cyan',5=>'Green',6=>'Yellow' }], # Color Filter
     10 => ['Density',       { 1=>'Light',2=>'Standard',3=>'Dark' }], # Color Filter
-    11 => ['ExtractedColor',{ 0=>'Off',1=>'Red',2=>'Magenta',3=>'Blue',4=>'Cyan',5=>'Green',6=>'Yellow' }], # ExtractColor [x2]
-    12 => ['ColorRange', '%+d'],    # ExtractColor [x2] (-2-+2)
+    11 => ['ExtractedColor',{ 0=>'Off',1=>'Red',2=>'Magenta',3=>'Blue',4=>'Cyan',5=>'Green',6=>'Yellow' }], # Extract Color [x2]
+    12 => ['ColorRange', '%+d'],    # Extract Color [x2] (-2-+2)
     13 => ['FilterEffect',  { 0=>'Off',1=>'Red',2=>'Green',3=>'Blue',4=>'Infrared'}], # Monochrome
     14 => ['ToningBA', '%+d'],      # Monochrome (-3-+3)
-    15 => ['InvertColor',   { 0=>'Off',1=>'On' }], # Custom
+    15 => ['InvertColor',   { 0=>'Off',1=>'On' }], # Custom/Invert Color
     16 => ['Slim', '%+d'],          # Slim (-8-+8)
     17 => ['EffectDensity', { 1=>'Sparse',2=>'Normal',3=>'Dense' }], # Starburst
@@ -518 +698 @@
     21 => ['DistortionType', '%d'], # Custom (1-3)
     22 => ['DistortionLevel',{0=>'Off',1=>'Weak',2=>'Medium',3=>'Strong' }], #Custom
-    23 => ['ShadingType', '%d'],    # Custom (1-6)
-    24 => ['ShadingLevel', '%+d'],  # Custom (-3-+3)
+    23 => ['ShadingType', '%d'],    # Custom/Shading (1-6)
+    24 => ['ShadingLevel', '%+d'],  # Custom/Shading (-3-+3)
     25 => ['Shading', '%d'],        # Toy Camera (1-3)
     26 => ['Blur',  '%d'],          # Toy Camera (1-3)
@@ -529 +709 @@
     32 => ['Saturation2',   { 0=>'Off',1=>'Low',2=>'Medium',3=>'High' }], # Water Color
     33 => ['HDR',           { 1=>'Weak',2=>'Medium',3=>'Strong' }], # HDR
+    # (34 missing)
     35 => ['FocusPlane', '%+d'],    # Miniature (-3-+3)
     36 => ['FocusWidth',    { 1=>'Narrow',2=>'Middle',3=>'Wide' }], # Miniature
@@ -537 +718 @@
     41 => ['Contrast2',     { 1=>'Low',2=>'Medium',3=>'High'}], # Sketch Filter
     42 => ['ScratchEffect', { 0=>'Off',1=>'On' }], # Sketch Filter
+    45 => ['ToneExpansion', { 1=>'Low',2=>'Medium',3=>'High' }], # Tone Expansion (ref Forum5247)
+    47 => ['UnicolorBold',  { 1=>'Red',2=>'Magenta',3=>'Blue',4=>'Cyan',5=>'Green',6=>'Yellow' }], #31 Unicolor Bold
+    48 => ['BoldMonochrome', '%d'], #31 Bold Monochrome (1-3)
+    49 => ['OriginalColor', { 1=>'Red',2=>'Magenta',3=>'Blue',4=>'Cyan',5=>'Green',6=>'Yellow' }], #31 Replace Color
+    50 => ['NewColor',      { 1=>'Red',2=>'Magenta',3=>'Blue',4=>'Cyan',5=>'Green',6=>'Yellow' }], #31 Replace Color
+    51 => ['ColorScale', '%d'], #31 Replace Color (1-5)
+    52 => ['Toning2', '%+d'], #31 Extract Color (-3-+3)
 );
 
@@ -578 +766 @@
     PrintConvInv => 'hex($val)',
 );
+
+# conversions for tags 0x0053-0x005a
+my %colorTemp = (
+    Writable => 'undef',
+    Count => 4,
+    ValueConv => sub {
+        my $val = shift;
+        return $val unless length $val == 4;
+        my @a = unpack 'nCC', $val;
+        $a[0] = 53190 - $a[0];
+        $a[1] = ($a[2] & 0x0f); $a[1] -= 16 if $a[1] >= 8;
+        $a[2] = ($a[2] >> 4);   $a[2] -= 16 if $a[2] >= 8;
+        return "@a";
+    },
+    ValueConvInv => sub {
+        my $val = shift;
+        my @a = split ' ', $val;
+        return undef unless @a == 3;
+        return pack 'nCC', 53190 - $a[0], 0, ($a[1] & 0x0f) + (($a[2] & 0x0f) << 4);
+    },
+    PrintConv => sub {
+        $_ = shift;
+        s/ ([1-9])/ +$1/g;
+        s/ 0/  0/g;
+        return $_;
+    },
+    PrintConvInv => '$val',
+);
+
+# conversions for KelvinWB tags
+my %kelvinWB = (
+    Format => 'int16u[4]',
+    ValueConv => sub {
+        my @a = split ' ', shift;
+        (53190 - $a[0]) . ' ' . $a[1] . ' ' . ($a[2] / 8192) . ' ' . ($a[3] / 8192);
+    },
+    ValueConvInv => sub {
+        my @a = split ' ', shift;
+        (53190 - $a[0]) . ' ' . $a[1] . ' ' . int($a[2]*8192+0.5) . ' ' . int($a[3]*8192+0.5);
+    },
+);
+
+my %noYes = ( 0 => 'No', 1 => 'Yes' );
 
 # common attributes for writable BinaryData directories
@@ -600 +831 @@
         PrintConv => '$val=~tr/ /./; $val',
         PrintConvInv => '$val=~tr/./ /; $val',
+        # 0.1.0.3 - PENTAX Optio E40
+        # 3.0.0.0 - K10D
+        # 3.1.0.0 - Optio A40/S10/L36/L40/M40/V10
+        # 3.1.1.0 - Optio L36/L40/M40/V10
+        # 3.1.2.0 - Optio Z10
+        # 4.0.2.0 - Optio E50
+        # 4.1.0.0 - Optio S12
+        # 4.1.1.0 - Optio M50
+        # 4.1.2.0 - K20D, K200D
+        # 4.2.0.0 - Optio L50/V20
+        # 4.2.1.0 - Optio E60/M90
+        # 4.2.2.0 - Optio W60
+        # 4.2.3.0 - Optio M60
+        # 4.4.0.1 - K-m, K2000
+        # 4.5.0.0 - Optio E70/L70
+        # 4.5.0.0 - Optio E70/L70/P70
+        # 4.6.0.0 - Optio E80/E90/W80
+        # 5.0.0.0 - K-7, Optio P80/WS80
+        # 5.1.0.0 - K-x
+        # 5.2.0.0 - Optio I-10
+        # 5.3.0.0 - Optio H90
+        # 5.3.2.0 - Optio W90/X90
+        # 6.0.0.0 - K-r, 645D
+        # 6.1.3.0 - Optio LS1000/RS1000/RS1500/RZ10
+        # 7.0.0.0 - K-5
+        # 7.1.0.0 - Optio WG-1GPS/WG-10/WG-20
+        # 7.2.0.0 - Optio S1
+        # 8.0.0.0 - Q
+        # 8.0.1.0 - Optio RZ18
+        # 8.0.4.0 - Optio VS20
+        # 8.1.0.0 - Optio LS465/WG-2GPS
+        # 9.0.0.0 - K-01
+        # 9.1.2.0 - X-5
+        # 10.0.0.0 - K-30, K-50, K-500, K-5 II, K-5 II s
+        # 10.0.2.0 - Q10
+        # 10.2.0.0 - WG-3/WG-4
+        # 10.2.1.0 - MX-1
+        # 10.4.1.0 - WG-3/4/5 GPS, WG-30/30W
+        # 10.6.1.0 - Q-S1, Q7
+        # 11.0.0.0 - K-3
+        # 11.2.1.0 - 645Z
+        # 11.3.0.0 - K-S1
+        # 11.5.0.0 - K-S2
+        # 11.6.1.0 - K-3 II
+        # 11.7.5.0 - WG-M2
+        # 12.0.0.0 - K-1
+        # 12.1.3.0 - K-70
+        # 12.1.5.0 - KP
     },
     0x0001 => { #PH
@@ -612 +891 @@
         Count => 2,
         PrintConv => '$val =~ tr/ /x/; $val',
+        PrintConvInv => '$val =~ tr/x/ /; $val',
     },
     0x0003 => { #PH
@@ -619 +899 @@
         Groups => { 2 => 'Image' },
         Writable => 'int32u',
+        WriteGroup => 'MakerNotes',
         Protected => 2,
     },
@@ -624 +905 @@
         Name => 'PreviewImageStart',
         IsOffset => 2,  # code to use original base
-        Protected => 2,
         OffsetPair => 0x0003, # point to associated byte count
         DataTag => 'PreviewImage',
         Groups => { 2 => 'Image' },
         Writable => 'int32u',
+        WriteGroup => 'MakerNotes',
+        Protected => 2,
     },
     0x0005 => { #13
@@ -635 +917 @@
         PrintHex => 1,
         SeparateTable => 1,
+        DataMember => 'PentaxModelID',
+        RawConv => '$$self{PentaxModelID} = $val',
         PrintConv => \%pentaxModelID,
     },
@@ -679 +963 @@
             4 => 'RAW', #5
             5 => 'Premium', #PH (K20D)
+            7 => 'RAW (pixel shift enabled)', #forum6536 (K-3 II)
+            8 => 'Dynamic Pixel Shift', #IB
+            65535 => 'n/a', #PH (Q MOV video)
         },
     },
@@ -705 +992 @@
             29 => '4000x3000', #PH (X70)
             30 => '4288x3216', #PH (Optio RS1000)
+            31 => '4608x3456', #PH (Optio RZ18)
             129 => '1920x1080', #PH (Optio RZ10)
+            135 => '4608x2592', #PH (Q10 stretch filter)
             257 => '3216x3216', #PH (Optio RZ10)
             '0 0' => '2304x1728', #13
@@ -717 +1006 @@
             '36 0' => '3008x2008 or 3040x2024',  #PH
             '37 0' => '3008x2000', #13
+            # 65535 - seen for an X-5 panorama (PH)
         },
     },
@@ -727 +1017 @@
             different from other models
         },
-        ValueConv => '($val < 4 and $$self{Model} =~ /Optio 555\b/) ? $val + 0.1 : $val',
+        ValueConv => '(IsInt($val) and $val < 4 and $$self{Model} =~ /Optio 555\b/) ? $val + 0.1 : $val',
         ValueConvInv => 'int $val',
         PrintConvColumns => 2,
@@ -764 +1054 @@
             31 => 'Illustrations', #13
             33 => 'Digital Filter', #13
-            35 => 'Night Scene Portrait', #25
+            35 => 'Night Scene Portrait', #NJ
             37 => 'Museum', #PH
             38 => 'Food', #PH
-            39 => 'Underwater', #25
+            39 => 'Underwater', #NJ
             40 => 'Green Mode', #PH
             49 => 'Light Pet', #PH
@@ -777 +1067 @@
             56 => 'Synchro Sound Record', #PH
             58 => 'Frame Composite', #14
-            59 => 'Report', #25
+            59 => 'Report', #NJ
             60 => 'Kids', #13
             61 => 'Blur Reduction', #13
+            63 => 'Panorama 2', #PH (X-5)
             65 => 'Half-length Portrait', #JD
+            66 => 'Portrait 2', #PH (LS645)
+            74 => 'Digital Microscope', #PH (WG-4)
+            75 => 'Blue Sky', #PH (LS465)
+            80 => 'Miniature', #PH (VS20)
+            81 => 'HDR', #PH (LS465)
+            83 => 'Fisheye', #PH (VS20)
+            85 => 'Digital Filter 4', #PH (WG-5)
             221 => 'P', #PH (Optio 555)
             255=> 'PICT', #PH (Optio 555)
@@ -822 +1120 @@
         {
             Name => 'FocusMode',
-            Condition => '$self->{Make} =~ /^PENTAX/',
+            # (can't test for "PENTAX" because MOV videos don't have Make)
+            Condition => '$$self{Make} !~ /^Asahi/',
             Notes => 'Pentax models',
             Writable => 'int16u',
@@ -833 +1132 @@
                 4 => 'Super Macro', #JD
                 5 => 'Pan Focus',
-                16 => 'AF-S', #17
-                17 => 'AF-C', #17
-                18 => 'AF-A', #PH (educated guess)
-                32 => 'Contrast-detect', #PH (K-5)
-                33 => 'Tracking Contrast-detect', #PH (K-5)
+                # 8 - seen for Ricoh GR III
+                # 9 - seen for Ricoh 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)
+                # 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
             },
-        },
-        {
+        },{
             Name => 'FocusMode',
             Writable => 'int16u',
@@ -852 +1159 @@
         },
     ],
-    0x000e => { #7
+    0x000e => [{ #29
         Name => 'AFPointSelected',
+        Condition => '$$self{Model} =~ /K-1\b/',
         Writable => 'int16u',
+        Notes => 'K-1',
         PrintConvColumns => 2,
-        PrintConv => {
+        PrintConv => [{
+            0xffff => 'Auto',
+            0xfffe => 'Fixed Center',
+            0xfffd => 'Automatic Tracking AF', #JD
+            0xfffc => 'Face Detect AF', #JD
+            0xfffb => 'AF Select', #PH (Q select from 25-areas)
+            # AF pattern:
+            #       01 02 03 04 05
+            #    06 07 08 09 10 11 12
+            # 13 14 15 16 17 18 19 20 21
+            #    22 23 24 25 26 27 28
+            #       29 30 31 32 33
+            0 => 'None',
+            1 => 'Top-left',
+            2 => 'Top Near-left',
+            3 => 'Top',
+            4 => 'Top Near-right',
+            5 => 'Top-right',
+            6 => 'Upper Far-left',
+            7 => 'Upper-left',
+            8 => 'Upper Near-left',
+            9 => 'Upper-middle',
+            10 => 'Upper Near-right',
+            11 => 'Upper-right',
+            12 => 'Upper Far-right',
+            13 => 'Far Far Left',
+            14 => 'Far Left',
+            15 => 'Left',
+            16 => 'Near-left',
+            17 => 'Center',
+            18 => 'Near-right',
+            19 => 'Right',
+            20 => 'Far Right',
+            21 => 'Far Far Right',
+            22 => 'Lower Far-left',
+            23 => 'Lower-left',
+            24 => 'Lower Near-left',
+            25 => 'Lower-middle',
+            26 => 'Lower Near-right',
+            27 => 'Lower-right',
+            28 => 'Lower Far-right',
+            29 => 'Bottom-left',
+            30 => 'Bottom Near-left',
+            31 => 'Bottom',
+            32 => 'Bottom Near-right',
+            33 => 'Bottom-right',
+            263 => 'Zone Select Upper-left',       # 01,02;06,07,08;14,15,16
+            264 => 'Zone Select Upper Near-left',  # 01,02,03;07,08,09;15,16,17
+            265 => 'Zone Select Upper Middle',     # 02,03,04;08,09,10;16,17,18
+            266 => 'Zone Select Upper Near-right', # 03,04,05;09,10,11;17,18,19
+            267 => 'Zone Select Upper-right',      # 04,05;10,11,12;18,19,20
+            270 => 'Zone Select Far Left',         # 06,07;13,14,15;22,23
+            271 => 'Zone Select Left',             # 06,07,08;14,15,16;22,23,24
+            272 => 'Zone Select Near-left',        # 07,08,09;15,16,17;23,24,25
+            273 => 'Zone Select Center',           # 08,09,10;16,17,18;24,25,26
+            274 => 'Zone Select Near-right',       # 09,10,11;17,18,19;25,26,27
+            275 => 'Zone Select Right',            # 10,11,12;18,19,20;26,27,28
+            276 => 'Zone Select Far Right',        # 11,12;19,20,21;27,28
+            279 => 'Zone Select Lower-left',       # 14,15,16;22,23,24;29,30
+            280 => 'Zone Select Lower Near-left',  # 15,16,17;23,24,25;29,30,31
+            281 => 'Zone Select Lower-middle',     # 16,17,18;24,25,26;30,31,32
+            282 => 'Zone Select Lower Near-right', # 17,18,19;25,26,27;31,32,33
+            283 => 'Zone Select Lower-right',      # 18,19,20;26,27,28;32,33
+        },{
+            0 => 'Single Point',
+            1 => 'Expanded Area 9-point (S)',
+            3 => 'Expanded Area 25-point (M)',
+            5 => 'Expanded Area 33-point (L)',
+        }],
+    },{
+        Name => 'AFPointSelected',
+        Condition => '$$self{Model} =~ /K-3\b/',
+        Writable => 'int16u',
+        Notes => 'K-3',
+        PrintConvColumns => 2,
+        PrintConv => [{
             # 0 - Contrast-detect AF? - PH (K-5)
             0xffff => 'Auto',
@@ -862 +1246 @@
             0xfffd => 'Automatic Tracking AF', #JD
             0xfffc => 'Face Detect AF', #JD
+            0xfffb => 'AF Select', #PH (Q select from 25-areas)
+            # AF pattern: (ref forum5422)
+            #    01 02 03 04 05
+            #    06 07 08 09 10
+            # 11 12 13 14 15 16 17
+            #    18 19 20 21 22
+            #    23 24 25 26 27
+            0 => 'None',
+            1 => 'Top-left',
+            2 => 'Top Near-left',
+            3 => 'Top',
+            4 => 'Top Near-right',
+            5 => 'Top-right',
+            6 => 'Upper-left',
+            7 => 'Upper Near-left',
+            8 => 'Upper-middle',
+            9 => 'Upper Near-right',
+            10 => 'Upper-right',
+            11 => 'Far Left',
+            12 => 'Left',
+            13 => 'Near-left',
+            14 => 'Center',
+            15 => 'Near-right',
+            16 => 'Right',
+            17 => 'Far Right',
+            18 => 'Lower-left',
+            19 => 'Lower Near-left',
+            20 => 'Lower-middle',
+            21 => 'Lower Near-right',
+            22 => 'Lower-right',
+            23 => 'Bottom-left',
+            24 => 'Bottom Near-left',
+            25 => 'Bottom',
+            26 => 'Bottom Near-right',
+            27 => 'Bottom-right',
+            #forum5892
+            257 => 'Zone Select Top-left',
+            258 => 'Zone Select Top Near-left',
+            259 => 'Zone Select Top',
+            260 => 'Zone Select Top Near-right',
+            261 => 'Zone Select Top-right',
+            262 => 'Zone Select Upper-left',
+            263 => 'Zone Select Upper Near-left',
+            264 => 'Zone Select Upper-middle',
+            265 => 'Zone Select Upper Near-right',
+            266 => 'Zone Select Upper-right',
+            267 => 'Zone Select Far Left',
+            268 => 'Zone Select Left',
+            269 => 'Zone Select Near-left',
+            270 => 'Zone Select Center',
+            271 => 'Zone Select Near-right',
+            272 => 'Zone Select Right',
+            273 => 'Zone Select Far Right',
+            274 => 'Zone Select Lower-left',
+            275 => 'Zone Select Lower Near-left',
+            276 => 'Zone Select Lower-middle',
+            277 => 'Zone Select Lower Near-right',
+            278 => 'Zone Select Lower-right',
+            279 => 'Zone Select Bottom-left',
+            280 => 'Zone Select Bottom Near-left',
+            281 => 'Zone Select Bottom',
+            282 => 'Zone Select Bottom Near-right',
+            283 => 'Zone Select Bottom-right',
+        },{ #forum5892
+            0 => 'Single Point',
+            1 => 'Expanded Area 9-point (S)',
+            3 => 'Expanded Area 25-point (M)',
+            5 => 'Expanded Area 27-point (L)',
+        }],
+    },{ #7
+        Name => 'AFPointSelected',
+        Writable => 'int16u',
+        Notes => 'other models',
+        PrintConvColumns => 2,
+        PrintConv => [{
+            # 0 - Contrast-detect AF? - PH (K-5)
+            0xffff => 'Auto',
+            0xfffe => 'Fixed Center',
+            0xfffd => 'Automatic Tracking AF', #JD
+            0xfffc => 'Face Detect AF', #JD
+            0xfffb => 'AF Select', #PH (Q select from 25-areas)
+            0 => 'None', #PH (Q in manual focus mode)
             1 => 'Upper-left',
             2 => 'Top',
@@ -874 +1340 @@
             11 => 'Lower-right',
         },
-    },
-    0x000f => { #PH
+        # (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)
+        ],
+    }],
+    0x000f => [{ #PH
         Name => 'AFPointsInFocus',
+        Condition => '$$self{Model} =~ /K-3\b/',
+        Writable => 'int32u',
+        Notes => 'K-3 only',
+        PrintHex => 1,
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                0 => 'Top-left',
+                1 => 'Top Near-left',
+                2 => 'Top',
+                3 => 'Top Near-right',
+                4 => 'Top-right',
+                5 => 'Upper-left',
+                6 => 'Upper Near-left',
+                7 => 'Upper-middle',
+                8 => 'Upper Near-right',
+                9 => 'Upper-right',
+                10 => 'Far Left',
+                11 => 'Left',
+                12 => 'Near-left',
+                13 => 'Center',
+                14 => 'Near-right',
+                15 => 'Right',
+                16 => 'Far Right',
+                17 => 'Lower-left',
+                18 => 'Lower Near-left',
+                19 => 'Lower-middle',
+                20 => 'Lower Near-right',
+                21 => 'Lower-right',
+                22 => 'Bottom-left',
+                23 => 'Bottom Near-left',
+                24 => 'Bottom',
+                25 => 'Bottom Near-right',
+                26 => 'Bottom-right',
+            },
+        },
+    },{ #PH
+        Name => 'AFPointsInFocus',
+        Notes => 'other models',
         Writable => 'int16u',
         PrintHex => 1,
@@ -892 +1400 @@
             9 => 'Bottom-right',
         },
-    },
+    }],
     0x0010 => { #PH
         Name => 'FocusPosition',
@@ -956 +1464 @@
             32 => 40000, #PH
             33 => 51200, #PH
+            34 => 64000, #PH (NC)
+            35 => 80000, #PH (NC)
+            36 => 102400, #27
+            37 => 128000, #PH (NC)
+            38 => 160000, #PH (NC)
+            39 => 204800, #27
+            40 => 256000, #PH (NC)
+            41 => 320000, #PH (NC)
+            42 => 409600, #PH (NC)
+            43 => 512000, #PH (NC)
+            44 => 640000, #PH (NC)
+            45 => 819200, #PH (KP)
             # Optio 330/430 (oddball)
             50 => 50, #PH
@@ -986 +1506 @@
             277 => 36000, #PH
             278 => 51200, #PH
+            279 => 72000, #PH (NC)
+            280 => 102400, #PH (NC)
+            281 => 144000, #PH (NC)
+            282 => 204800, #PH (NC)
+            283 => 288000, #PH (NC)
+            284 => 409600, #PH (NC)
+            285 => 576000, #PH (NC)
+            286 => 819200, #PH (NC)
+            65534 => 'Auto 2', #PH (Q/Q10/Q7 MOV) [how is this different from 65535?]
+            65535 => 'Auto', #PH/31 (K-01/K-70 MP4)
         },
     },
@@ -995 +1525 @@
         Notes => q{
             calibrated differently for different models.  For the Optio WP, add 6 to get
-            approximate Light Value.  May not be valid for some models, ie. Optio S
-        },
-    },
-    0x0016 => { #PH
+            approximate Light Value.  May not be valid for some models, eg. Optio S
+        },
+    },
+    0x0016 => [{ #PH
         Name => 'ExposureCompensation',
+        Condition => '$count == 1',
+        Notes => q{
+            some models write two values here.  The second value is meaning of the
+            second value is not yet known
+        },
         Writable => 'int16u',
         ValueConv => '($val - 50) / 10',
@@ -1005 +1540 @@
         PrintConv => '$val ? sprintf("%+.1f", $val) : 0',
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
-    },
+    },{
+        Name => 'ExposureCompensation',
+        Writable => 'int16u',
+        # (2 values for K-70, etc -- have only seen "0" for the 2nd value - PH)
+        Count => 2,
+        ValueConv => '$val =~ s/ .*//; ($val - 50) / 10',
+        ValueConvInv => 'int($val * 10 + 50.5) . " 0"',
+        PrintConv => '$val ? sprintf("%+.1f", $val) : 0',
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    }],
     0x0017 => { #3
         Name => 'MeteringMode',
@@ -1026 +1570 @@
             '+1', '+2' or '+3' for step size
         },
-        # 1=.3ev, 2=.7, 3=1.0, ... 10=.5ev, 11=1.5, ...
-        ValueConv => [ '$val<10 ? $val/3 : $val-9.5' ],
-        ValueConvInv => [ 'abs($val-int($val)-.5)>0.05 ? int($val*3+0.5) : int($val+10)' ],
+        # 1=.3ev, 2=.7, 3=1.0 ... 10=.5, 11=1.5, ... 4096=0, 4097=0.5 ... 8192=0, 8193=0.3
+        # (models like K-1 and K-5 use 0x1000 and 0x2000 to indicate 1/2 and 1/3 EV step
+        # size -- convert this as a fraction so we can recognize this format when writing)
+        ValueConv => [ q{
+            return $val / 3 if $val < 10;
+            return $val - 9.5 if $val < 20;
+            return ($val - 0x1000) . '/2' if $val & 0x1000;
+            return ($val - 0x2000) . '/3' if $val & 0x2000;
+            return $val; # (shouldn't happen)
+        }],
+        ValueConvInv => [ q{
+            if ($val =~ s{/(\d+)$}{}) {
+                return $val + 0x1000 if $1 == 2;
+                return $val + 0x2000 if $1 == 3;
+                return undef;
+            }
+            return abs($val-int($val)-.5)>0.05 ? int($val*3+0.5) : int($val+10);
+        }],
         PrintConv => sub {
             my @v = split(' ', shift);
-            $v[0] = sprintf('%.1f', $v[0]) if $v[0];
+            $v[0] = sprintf('%.1f', $v[0]) if $v[0] and $v[0]!~m{/};
             if ($v[1]) {
                 my %s = (1=>'WB-BA',2=>'WB-GM',3=>'Saturation',4=>'Sharpness',
@@ -1077 +1636 @@
             9 => 'Flash', #13
             10 => 'Cloudy', #13
+            11 => 'Warm White Fluorescent', #PH (K-3)
+            14 => 'Multi Auto', #PH (K-3)
             15 => 'Color Temperature Enhancement', #PH
             17 => 'Kelvin', #PH
@@ -1152 +1713 @@
         PrintConvColumns => 2,
         PrintConv => [{ # the *istD has pairs of values - PH
-            0 => 'Low', #PH
-            1 => 'Normal', #PH
-            2 => 'High', #PH
-            3 => 'Med Low', #2
-            4 => 'Med High', #2
-            5 => 'Very Low', #(NC)
-            6 => 'Very High', #(NC)
-            7 => '-4', #PH (K-5)
-            8 => '+4', #PH (NC)
+            0 => '-2 (low)', #PH
+            1 => '0 (normal)', #PH
+            2 => '+2 (high)', #PH
+            3 => '-1 (medium low)', #2
+            4 => '+1 (medium high)', #2
+            5 => '-3 (very low)', #PH
+            6 => '+3 (very high)', #PH (NC)
+            7 => '-4 (minimum)', #PH (NC)
+            8 => '+4 (maximum)', #PH (K-5)
             65535 => 'None', #PH (Monochrome)
         }],
@@ -1171 +1732 @@
         PrintConvColumns => 2,
         PrintConv => [{ # the *istD has pairs of values - PH
-            0 => 'Low', #PH
-            1 => 'Normal', #PH
-            2 => 'High', #PH
-            3 => 'Med Low', #2
-            4 => 'Med High', #2
-            5 => 'Very Low', #PH
-            6 => 'Very High', #PH (NC)
-            7 => '-4', #PH (NC)
-            8 => '+4', #PH (K-5)
+            0 => '-2 (low)', #PH
+            1 => '0 (normal)', #PH
+            2 => '+2 (high)', #PH
+            3 => '-1 (medium low)', #2
+            4 => '+1 (medium high)', #2
+            5 => '-3 (very low)', #PH
+            6 => '+3 (very high)', #PH (NC)
+            7 => '-4 (minimum)', #PH (NC)
+            8 => '+4 (maximum)', #PH (K-5)
+            65535 => 'n/a', # got this for a Backlight Silhouette - PH (Q)
         }],
     },
@@ -1189 +1751 @@
         PrintConvColumns => 2,
         PrintConv => [{ # the *istD has pairs of values - PH
-            0 => 'Soft', #PH
-            1 => 'Normal', #PH
-            2 => 'Hard', #PH
-            3 => 'Med Soft', #2
-            4 => 'Med Hard', #2
-            5 => 'Very Soft', #(NC)
-            6 => 'Very Hard', #(NC)
-            7 => '-4', #PH (NC)
-            8 => '+4', #PH (NC)
+            0 => '-2 (soft)', #PH
+            1 => '0 (normal)', #PH
+            2 => '+2 (hard)', #PH
+            3 => '-1 (medium soft)', #2
+            4 => '+1 (medium hard)', #2
+            5 => '-3 (very soft)', #(NC)
+            6 => '+3 (very hard)', #(NC)
+            7 => '-4 (minimum)', #PH (NC)
+            8 => '+4 (maximum)', #PH (NC)
         }],
     },
@@ -1256 +1818 @@
     },
     # 0x002b - definitely exposure related somehow - PH
-    0x002d => { #PH
+    0x002d => [{ #PH
         Name => 'EffectiveLV',
+        Condition => '$format eq "int16u"',
         Notes => 'camera-calculated light value, but includes exposure compensation',
         Writable => 'int16u',
+        Format => 'int16s', # (negative values are valid even though Pentax writes int16u)
         ValueConv => '$val/1024',
         ValueConvInv => '$val * 1024',
         PrintConv => 'sprintf("%.1f",$val)',
         PrintConvInv => '$val',
-    },
+    },{
+        Name => 'EffectiveLV',
+        Condition => '$format eq "int32u"',
+        Writable => 'int32u',
+        Format => 'int32s',
+        ValueConv => '$val/1024',
+        ValueConvInv => '$val * 1024',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    }],
     0x0032 => { #13
         Name => 'ImageEditing',
@@ -1277 +1850 @@
             '2 0 0 0' => 'Cropped', #PH
             # note: doesn't apply to digital filters applied when picture is taken
-            '4 0 0 0' => 'Digital Filter 4', #PH (K10D)
+            '4 0 0 0' => 'Digital Filter 4', #PH (K10D, Ricoh WG-5)
             '6 0 0 0' => 'Digital Filter 6', #PH (K-5)
+            '8 0 0 0' => 'Red-eye Correction', #PH (WG-10)
             '16 0 0 0' => 'Frame Synthesis?',
         },
@@ -1310 +1884 @@
             '0 17' => 'Candlelight',
             '0 18' => 'Museum',
-            '0 19' => 'Food', #(n/c)
+            '0 19' => 'Food',
             '0 20' => 'Stage Lighting',
             '0 21' => 'Night Snap',
+            '0 23' => 'Blue Sky', # (Q)
+            '0 24' => 'Sunset', # (Q)
+            '0 26' => 'Night Scene HDR', # (Q)
+            '0 27' => 'HDR', # (Q)
+            '0 28' => 'Quick Macro', # (Q)
+            '0 29' => 'Forest', # (Q)
+            '0 30' => 'Backlight Silhouette', # (Q)
             # AUTO PICT modes (auto-selected)
             '1 4'  => 'Auto PICT (Standard)', #13
@@ -1335 +1916 @@
             '11 0' => 'Manual, Off-Auto-Aperture',
             '12 0' => 'Bulb, Off-Auto-Aperture',
+            '19 0' => 'Astrotracer', #29
             # extra K10D modes (ref 16)
             '13 0' => 'Shutter & Aperture Priority AE',
@@ -1344 +1926 @@
             '18 3' => 'Auto Program (MTF)', #PH (NC)
             '18 22' => 'Auto Program (Shallow DOF)', #PH (NC)
-            '254 0' => 'Video', #PH (K-7,K-5)
-            '255 0' => 'Video (Auto Aperture)', #PH (K-5)
-            '255 4' => 'Video (4)', #PH (K-x)
+            '20 22' => 'Blur Control', #PH (Q)
+            '249 0' => 'Movie (TAv)', #31
+            '250 0' => 'Movie (TAv, Auto Aperture)', #31
+            '251 0' => 'Movie (Manual)', #31
+            '252 0' => 'Movie (Manual, Auto Aperture)', #31
+            '253 0' => 'Movie (Av)', #31
+            '254 0' => 'Movie (Av, Auto Aperture)', #31
+            '255 0' => 'Movie (P, Auto Aperture)', #31
+            '255 4' => 'Video (4)', #PH (K-x,K-01)
         },{
             # EV step size (ref 19)
@@ -1358 +1946 @@
         Count => 4,
         PrintConv => [{
-            0 => 'Single-frame',
+            0 => 'Single-frame', # (also Interval Shooting for K-01 - PH)
             1 => 'Continuous', # (K-5 Hi)
             2 => 'Continuous (Lo)', #PH (K-5)
             3 => 'Burst', #PH (K20D)
+            4 => 'Continuous (Medium)', #PH (K-3)
             255 => 'Video', #PH (K-x)
-            # (K20D also has an Interval mode that needs decoding)
         },{
             0 => 'No Timer',
             1 => 'Self-timer (12 s)',
             2 => 'Self-timer (2 s)',
+            15 => 'Video', #PH (Q MOV)
             16 => 'Mirror Lock-up', # (K-5)
             255 => 'n/a', #PH (K-x)
@@ -1378 +1967 @@
             0x00 => 'Single Exposure',
             0x01 => 'Multiple Exposure',
+            0x02 => 'Composite Average', #31
+            0x03 => 'Composite Additive', #31
+            0x04 => 'Composite Bright', #31
+            0x08 => 'Interval Shooting', #31
+            0x0a => 'Interval Composite Average', #31
+            0x0b => 'Interval Composite Additive', #31
+            0x0c => 'Interval Composite Bright', #31
+            0x0f => 'Interval Movie', #PH (K-01)
             0x10 => 'HDR', #PH (645D)
             0x20 => 'HDR Strong 1', #PH (NC) (K-5)
             0x30 => 'HDR Strong 2', #PH (K-5)
             0x40 => 'HDR Strong 3', #PH (K-5)
-            0xe0 => 'HDR Auto', #PH (K-5)
+            0x50 => 'HDR Manual', #31 (K-70 HDR 1 and HDR 2)
+            0xe0 => 'HDR Auto', #PH (K-5, K-70)
             0xff => 'Video', #PH (K-x)
         }],
@@ -1394 +1992 @@
         #  11894 7962 (K10D,K-m)   12012 7987 (*istDS,K100D,K110D)   12012 8019 (*istD),
         #  12061 7988 (K-5)        12053 8005 (K-r,K-x)              14352 9535 (K20D,K-7)
-        #  22315 16711 (645)
+        #  22315 16711 (645)       12080 8008 (K-01)
         ValueConv => 'my @a=split(" ",$val); $_/=500 foreach @a; join(" ",@a)',
         ValueConvInv => 'my @a=split(" ",$val); $_*=500 foreach @a; join(" ",@a)',
@@ -1431 +2029 @@
         ValueConv => '$val & 0x7ff', # ignore other bits for now
         PrintConvColumns => 2,
-        PrintConv => { BITMASK => {
-            0 => 'Upper-left',
-            1 => 'Top',
-            2 => 'Upper-right',
-            3 => 'Left',
-            4 => 'Mid-left',
-            5 => 'Center',
-            6 => 'Mid-right',
-            7 => 'Right',
-            8 => 'Lower-left',
-            9 => 'Bottom',
-            10 => 'Lower-right',
-        } },
-    },
-    # 0x003d - int16u: 8192 for most images, but occasionally 11571 for K100D/K110D,
-    #              and 8289 or 8456 for the K-x - PH
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                0 => 'Upper-left',
+                1 => 'Top',
+                2 => 'Upper-right',
+                3 => 'Left',
+                4 => 'Mid-left',
+                5 => 'Center',
+                6 => 'Mid-right',
+                7 => 'Right',
+                8 => 'Lower-left',
+                9 => 'Bottom',
+                10 => 'Lower-right',
+            },
+        },
+    },
+    0x003d => { #IB
+        Name => 'DataScaling',
+        Writable => 'int16u',
+        # divide by the second value of Pentax_0x0201 (WhitePoint), usually
+        # 8192, to get the floating point normalization factor.
+        # One of the examples of how this tag can be used is calculation of
+        # baseline exposure compensation (Adobe-style) for a PEF:
+        # log2(Pentax_0x007e)-14-0.5+log2(Pentax_0x003d)-13
+        # or
+        # log2(Pentax_0x007e*(Pentax_0x003d/(2^13))/(2^14))-0.5
+        # where
+        # makernotes:Pentax_0x003d/(2^13) is the normalization factor. (ref IB)
+        # - 8192 for most images, but occasionally 11571 for K100D/K110D,
+        #   and 8289 or 8456 for the K-x (ref PH)
+    },
     0x003e => { #PH
         Name => 'PreviewImageBorders',
@@ -1454 +2068 @@
     },
     0x003f => { #PH
-        Name => 'LensType',
-        Writable => 'int8u',
-        Count => 2,
-        SeparateTable => 1,
-        # the K-m adds two zeros to the LensType, some other models add only 1
-        ValueConv => '$val=~s/^(\d+ \d+)( 0){1,2}$/$1/; $val',
-        ValueConvInv => '$val',
-        PrintConv => \%pentaxLensTypes,
+        Name => 'LensRec',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensRec' },
     },
     0x0040 => { #PH
@@ -1476 +2084 @@
     },
     0x0047 => { #PH
-        Name => 'CameraTemperature',
+        Name => 'CameraTemperature', # (chassis temperature, ref forum6677)
         Writable => 'int8s',
         PrintConv => '"$val C"',
@@ -1494 +2102 @@
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
-    0x004d => { #PH
+    0x004d => [{ #PH
         Name => 'FlashExposureComp',
+        Condition => '$count == 1',
         Writable => 'int32s',
         ValueConv => '$val / 256',
@@ -1501 +2110 @@
         PrintConv => '$val ? sprintf("%+.1f", $val) : 0',
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
-    },
+    },{ #PH (K-3)
+        Name => 'FlashExposureComp',
+        Writable => 'int8s',
+        Count => 2,     # (don't know what the 2nd number is for)
+        ValueConv => [ '$val / 6' ],
+        ValueConvInv => [ '$val / 6' ],
+        PrintConv => [ '$val ? sprintf("%+.1f", $val) : 0' ],
+        PrintConvInv => [ 'Image::ExifTool::Exif::ConvertFraction($val)' ],
+    }],
     0x004f => { #PH
         Name => 'ImageTone', # (Called CustomImageMode in K20D manual)
@@ -1514 +2131 @@
             5 => 'Monochrome', # (K20D)
             6 => 'Muted', # (645D)
-            7 => 'Reversal Film', # (645D)
+            7 => 'Reversal Film', # (645D) (Ricoh WG-5 "Slide Film")
             8 => 'Bleach Bypass', # (K-5)
+            9 => 'Radiant', # (Q)
+            10 => 'Cross Processing', #31 (K-70)
+            11 => 'Flat', #31 (K-70)
+            # 256 - seen for GR III
+            # 262 - seen for GR III
         },
     },
@@ -1526 +2148 @@
     },
     # 0x0053-0x005a - not in JPEG images - PH
-    0x005c => { #PH
+    0x0053 => { #28
+        Name => 'ColorTempDaylight',
+        %colorTemp,
+        Notes => '0x0053-0x005a are 3 numbers: Kelvin, shift AB, shift GM',
+    },
+    0x0054 => { Name => 'ColorTempShade',        %colorTemp }, #28
+    0x0055 => { Name => 'ColorTempCloudy',       %colorTemp }, #28
+    0x0056 => { Name => 'ColorTempTungsten',     %colorTemp }, #28
+    0x0057 => { Name => 'ColorTempFluorescentD', %colorTemp }, #28
+    0x0058 => { Name => 'ColorTempFluorescentN', %colorTemp }, #28
+    0x0059 => { Name => 'ColorTempFluorescentW', %colorTemp }, #28
+    0x005a => { Name => 'ColorTempFlash',        %colorTemp }, #28
+    0x005c => [{ #PH
+        Name => 'ShakeReductionInfo',
+        Condition => '$count == 4', # (2 bytes for the K-3)
+        Format => 'undef', # (written as int8u) - do this just to save time converting the value
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::SRInfo' },
+    },{
         Name => 'ShakeReductionInfo',
         Format => 'undef', # (written as int8u) - do this just to save time converting the value
-        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::SRInfo' },
-    },
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::SRInfo2' },
+    }],
     0x005d => { #JD/PH
         # (used by all Pentax DSLR's except *istD and *istDS until firmware 2.0 - PH)
@@ -1537 +2176 @@
         # of test images shot in the factory. (But my new K-5 started at 1 - PH)
         # This count includes shutter actuations even if they don't result in a
-        # recorded image (ie. manual white balance frame or digital preview), but
+        # recorded image (eg. manual white balance frame or digital preview), but
         # does not include actuations due to Live View or video recording - PH
         Name => 'ShutterCount',
@@ -1555 +2194 @@
         ValueConvInv => '$val',
     },
+    # 0x005e -
     0x0060 => { #PH (K-5)
         Name => 'FaceInfo',
@@ -1560 +2200 @@
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::FaceInfo' },
     },
-    # 0x0062 - int16u: 1 (K10D,K200D,K-m,K2000), 3 (K20D), 4 (K-7), 5 (K-x), 6 (645D), 7 (K-r), 8 (K-5)
+    0x0062 => { #forum4803
+        Name => 'RawDevelopmentProcess',
+        Condition => '$$self{Make} =~ /^(PENTAX|RICOH)/', # rules out Kodak, which also use this tag
+        Writable => 'int16u',
+        PrintConv => {
+            1 => '1 (K10D,K200D,K2000,K-m)',
+            3 => '3 (K20D)',
+            4 => '4 (K-7)',
+            5 => '5 (K-x)',
+            6 => '6 (645D)',
+            7 => '7 (K-r)',
+            8 => '8 (K-5,K-5II,K-5IIs)',
+            9 => '9 (Q)',
+            10 => '10 (K-01,K-30,K-50,K-500)',
+            11 => '11 (Q10)',
+            12 => '12 (MX-1,Q-S1,Q7)',
+            13 => '13 (K-3,K-3II)',
+            14 => '14 (645Z)',
+            15 => '15 (K-S1,K-S2)', #PH
+            16 => '16 (K-1)', #PH
+            17 => '17 (K-70)', #29
+            18 => '18 (KP)', #PH
+            19 => '19 (GR III)', #PH
+        },
+    },
     0x0067 => { #PH (K-5)
         Name => 'Hue',
@@ -1584 +2248 @@
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AWBInfo' },
     },
-    0x0069 => { #PH (K20D; K-5 highlights only)
+    0x0069 => { #PH (K20D, K-5, K-01 highlights only)
         Name => 'DynamicRangeExpansion',
+        Notes => q{
+            called highlight correction by Pentax for the K20D, K-5, K-01 and maybe
+            other models
+        },
         Writable => 'undef',
         Format => 'int8u',
         Count => 4,
-        PrintConv => {
-            '0 0 0 0' => 'Off',
-            '1 0 0 0' => 'On',
-        },
+        PrintConv => [{
+            0 => 'Off',
+            1 => 'On',
+        },{
+            0 => 0,
+            1 => 'Enabled', # (K-01)
+            2 => 'Auto', # (K-01)
+        }],
     },
     0x006b => { #PH (K-5)
@@ -1739 +2411 @@
         DataMember => 'FacesDetected',
         RawConv => '$val =~ / (\d+)/ and $$self{FacesDetected} = $1; $val',
+        # (the K-3 reports "On" even in phase-detect focus modes)
         PrintConv => [
             '$val ? "On ($val faces max)" : "Off"',
@@ -1757 +2430 @@
     # 0x0078 - int16u[2]: '0 0' (K-5,K-7,K-r,K-x)
     0x0079 => { #PH
-        Name => 'ShadowCompensation',
+        Name => 'ShadowCorrection',
         Writable => 'int8u',
         Count => -1,
@@ -1765 +2438 @@
             0 => 'Off',
             1 => 'On',
+            2 => 'Auto 2', # (NC, WG-3)
             '0 0' => 'Off',
             '1 1' => 'Weak',
             '1 2' => 'Normal',
             '1 3' => 'Strong',
+            '2 4' => 'Auto', # (K-01)
         },
     },
@@ -1779 +2454 @@
             '2 0' => 'Standard',
             '3 0' => 'Fast',
+            # '1 108' - seen for GR III
         },
     },
@@ -1801 +2477 @@
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensCorr' },
     },
-    # 0x007e - int32u: 15859,15860,15864,15865,16315 (K-5 PEF/DNG only) - PH
+    0x007e => { #IB
+        Name => 'WhiteLevel', # (with black level already subtracted)
+        Writable => 'int32u',
+        # 15859,15860,15864,15865,16315 (K-5 PEF/DNG only) - PH
+        # 3934, 3935 (Q DNG) - PH
+    },
     0x007f => { #PH (K-5)
         Name => 'BleachBypassToning',
@@ -1807 +2488 @@
         PrintConvColumns => 2,
         PrintConv => {
-            65535 => 'Off',
+            65535 => 'n/a', #31
+            0 => 'Off', #31
             1 => 'Green',
             2 => 'Yellow',
@@ -1818 +2500 @@
         },
     },
+    0x0080 => { #PH (Q)
+        Name => 'AspectRatio',
+        PrintConv => {
+            0 => '4:3',
+            1 => '3:2',
+            2 => '16:9',
+            3 => '1:1',
+        },
+    },
+    # 0x0081 - int8u: 0 (Q)
+    0x0082 => {
+        Name => 'BlurControl',
+        Writable => 'int8u',
+        Count => 4,
+        PrintConv => [
+            {
+                0 => 'Off',
+                1 => 'Low',
+                2 => 'Medium',
+                3 => 'High',
+            },
+            undef, # 0 with BlurControl is Off, seen 0,1,3 when on (related to subject distance?)
+            undef, # 0 with BlurControl Off, 45 when on
+            undef, # always 0
+        ],
+    },
+    # 0x0083 - int8u: 0 (Q DNG)
+    # 0x0084 - int8u: 0 (Q)
+    0x0085 => { #PH
+        Name => 'HDR',
+        Format => 'int8u',
+        Count => 4,
+        PrintConv => [{ # (K-01,K-3)
+            0 => 'Off',
+            1 => 'HDR Auto',
+            2 => 'HDR 1',
+            3 => 'HDR 2',
+            4 => 'HDR 3',
+            5 => 'HDR Advanced', #29 (K-1)
+        },{ # (K-01)
+            0 => 'Auto-align Off',
+            1 => 'Auto-align On',
+        },{
+            # not sure about this - PH
+            # - you can set HDR "Exposure Bracket Value" with the K-3
+            # - guessed from imaging-resource K-3 samples K3OUTBHDR_A{1,2,3}
+            0 => 'n/a',
+            4 => '1 EV',
+            8 => '2 EV',
+            12 => '3 EV', # (get this from K-01, but can't set EV)
+        },
+        # (4th number is always 0)
+        ],
+    },
+    # 0x0086 - int8u: 0, 111[Sport,Pet] (Q) - related to Tracking FocusMode?
+    # 0x0087 - int8u: 0 (Q)
+    0x0087 => { #PH
+        Name => 'ShutterType',
+        Writable => 'int8u',
+        PrintConv => {
+            0 => 'Normal', # ('Mechanical' if the camera has a mechanical shutter)
+            1 => 'Electronic', # (KP)
+        },
+    },
+    0x0088 => { #PH
+        Name => 'NeutralDensityFilter',
+        Writable => 'int8u',
+        Count => -1,
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+            '0 2' => 'Off (0 2)', #PH (NC, GR III)
+            '1 2' => 'On (1 2)', #PH (NC, GR III)
+        },
+    },
+    0x008b => { #PH (LS465)
+        Name => 'ISO',
+        Priority => 0,
+        Writable => 'int32u',
+    },
+    0x0092 => { #31
+        Name => 'IntervalShooting',
+        Notes => '2 numbers: 1. Shot number 2. Total number of shots',
+        Writable => 'int16u',
+        Count => 2,
+        PrintConv => {
+            '0 0' => 'Off',
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                if ($inv) {
+                    $val =~ tr/0-9 //dc;
+                } else {
+                    $val =~ s/(\d+) (\d+)/Shot $1 of $2/;
+                }
+                return $val;
+            },
+        },
+    },
+    0x0095 => { #31
+        Name => 'SkinToneCorrection',
+        Writable => 'int8s',
+        Count => 2,
+        PrintConv => {
+            '0 0' => 'Off',
+            '1 1' => 'On (type 1)',
+            '1 2' => 'On (type 2)',
+        },
+    },
+    0x0096 => { #31
+        Name => 'ClarityControl',
+        Writable => 'int8s',
+        Count => 2,
+        PrintConv => {
+            '0 0' => 'Off',
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                if ($inv) {
+                    $val =~ /(\d+ -?\d+)/ and return $1;
+                    return ("1 $val");
+                } elsif ($val =~ /^1 (-?\d+)$/) {
+                    return $1 ? sprintf('%+d', $1) : 0;
+                } else {
+                    return "Unknown ($val)";
+                }
+            },
+        },
+    },
     0x0200 => { #5
         Name => 'BlackPoint',
@@ -1834 +2643 @@
     # 0x0202: int16u[4]: all 0's in all my samples
     0x0203 => { #JD (not really sure what these mean)
-        Name => 'ColorMatrixA',
+        Name => 'ColorMatrixA', # (camera RGB to sRGB matrix, *ist D, ref IB)
         Writable => 'int16s',
         Count => 9,
@@ -1843 +2652 @@
     },
     0x0204 => { #JD
-        Name => 'ColorMatrixB',
+        Name => 'ColorMatrixB', # (camera RGB to Adobe RGB matrix, *ist D, ref IB)
         Writable => 'int16s',
         Count => 9,
@@ -1851 +2660 @@
         PrintConvInv => '"$val"',
     },
-    0x0205 => { #19
+    0x0205 => [{ #19
         Name => 'CameraSettings',
+        # size: *istD/*istDs/K100D/K110D=16, K-m/K2000=14, K-7/K-x=19,
+        #       K200D/K20D/K-5/645D=20, K-r=21, K10D=22, K-01=25
+        Condition => '$count < 25', # (not valid for the K-01)
         SubDirectory => {
             TagTable => 'Image::ExifTool::Pentax::CameraSettings',
             ByteOrder => 'BigEndian',
         },
-    },
-    0x0206 => { #PH
+    },{
+        Name => 'CameraSettingsUnknown',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Pentax::CameraSettingsUnknown',
+            ByteOrder => 'BigEndian',
+        },
+    }],
+    0x0206 => [{ #PH
         Name => 'AEInfo',
+        # size: *istD/*istDs/K100D/K110D=14, K10D/K200D/K20D=16, K-m/K2000=20,
+        #        K-7/K-x=24, K-5/K-r/645D=25
+        Condition => '$count <= 25 and $count != 21 and $$self{AEInfoSize} = $count',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo' },
-    },
+    },{
+        Name => 'AEInfo2',
+        # size: K-01=21
+        Condition => '$count == 21',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo2' },
+    },{
+        Name => 'AEInfo3',
+        # size: K-30=48
+        Condition => '$count == 48',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo3' },
+    },{
+        Name => 'AEInfoUnknown',
+        # size: Q/Q10=34
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfoUnknown' },
+    }],
     0x0207 => [ #PH
         {
@@ -1876 +2711 @@
         },{
             Name => 'LensInfo',
-            Condition => '$count < 90',
+            Condition => '$count != 90 and $count != 91 and $count != 80 and $count != 128 and $count != 168',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo2' },
         },{
-            Name => 'LensInfo',
+            Name => 'LensInfo', # 645D
             Condition => '$count == 90',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo3' },
         },{
-            Name => 'LensInfo',
+            Name => 'LensInfo', # K-r, K-5, K-5II
+            Condition => '$count == 91',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo4' },
+        },{
+            Name => 'LensInfo', # K-01, K-30, K-50, K-500, K-3, K-3II
+            Condition => '$count == 80 or $count == 128',
+            SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfo5' },
         }
+        # ($count == 168 - Ricoh GR III)
     ],
     0x0208 => [ #PH
@@ -1904 +2745 @@
         Notes => q{
             measurements from each of the 16 AE metering segments for models such as the
-            K10D, and 77 metering segments for models such as the K-5, converted to LV
+            K10D, 77 metering segments for models such as the K-5, and 4050 metering
+            segments for the K-3, converted to LV
         },
         %convertMeteringSegments,
-        #    16 metering segment             77 metering segment
-        #    locations (ref JD)              locations (ref PH, K-5)
+        #  16 metering segment              77 metering segment
+        #  locations (ref JD, K10D)         locations (ref PH, K-5)
         # +-------------------------+
         # |           14            | +----------------------------------+
@@ -1986 +2828 @@
         },
     },
-    # 0x021a - undef[1068] (K-5)
+    # 0x021a - undef[1068] (K-5) - ToneMode/Saturation mapping matrices (ref 28)
     0x021b => { #19
         Name => 'SaturationInfo',
@@ -2003 +2845 @@
     # 0x021c - undef[18] (K-5)
     # 0x021d - undef[18] (K-5)
-    # 0x021e - undef[8] (K-5)
+    # 0x021e - undef[8] (K-5, Q)
     0x021f => { #JD
         Name => 'AFInfo',
@@ -2019 +2861 @@
         Flags => [ 'Unknown', 'Binary' ],
         Writable => 0,
-        Notes => 'found in K10D, K20D and K2000D PEF images',
-    },
-    # 0x0221 - undef[138] (K-5)
+        Notes => 'found in K10D, K20D and K2000 PEF images',
+    },
+    0x0221 => { #28
+        Name => 'KelvinWB',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::KelvinWB' },
+    },
     0x0222 => { #PH
         Name => 'ColorInfo',
@@ -2029 +2874 @@
     0x0224 => { #19
         Name => 'EVStepInfo',
+        Drop => 200, # drop if larger than 200 bytes (40 kB in Pentax Q and Q10)
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::EVStepInfo' },
     },
@@ -2050 +2896 @@
         Notes => 'left blank by some cameras',
     },
-    0x022a => { #PH (K-5)
+    0x022a => [{ #PH (RICOH models (GR III))
+        Name => 'FilterInfo',
+        Condition => '$$self{Make} =~ /^RICOH/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Pentax::FilterInfo',
+            ByteOrder => 'LittleEndian',
+        },
+    },{ #PH (K-5)
         Name => 'FilterInfo',
         SubDirectory => {
@@ -2056 +2909 @@
             ByteOrder => 'BigEndian',
         },
-    },
+    }],
     0x022b => { #PH (K-5)
         Name => 'LevelInfo',
@@ -2062 +2915 @@
     },
     # 0x022c - undef[46] (K-5)
-    # 0x022d - undef[100] (K-5)
+    0x022d => { #28
+        Name => 'WBLevels',
+        Condition => '$count == 100', # (just to be safe, but no other counts observed)
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::WBLevels' },
+    },
     0x022e => { #PH (K-5 AVI videos)
         Name => 'Artist',
@@ -2073 +2930 @@
         Writable => 'string',
     },
-    0x0230 => { #PH (K-x AVI videos)
+    0x0230 => { #PH (K-x AVI videos) (and K-70/Q-S1 MOV videos, ref 31)
         Name => 'FirmwareVersion',
-        Notes => 'only in AVI videos',
-        # this tag only exists in AVI videos, and for the K-x the value of
+        Notes => 'only in videos',
+        # this tag only exists in AVI/MOV videos, and for the K-x the value of
         # this tag is "K-x Ver 1.00", which is the same as the EXIF Software
         # tag.  I used a different tag name for this because Pentax uses the
@@ -2098 +2955 @@
         Count => 10,
     },
+    # 0x0236 - undef[52] (Q)
+    # 0x0237 - undef[11] possibly related to smart effect setting? (Q)
+    # 0x0238 - undef[9] (Q)
+    0x0239 => { #PH
+        Name => 'LensInfoQ',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfoQ' },
+    },
+    # 0x023a - undef[10] (Q)
+    # 0x023b - undef[9] (K-01)
+    #  01a700500000000000, 91a700500000000000, 41a700500000000000, 002700500000000000
+    #  c00500400000000000, 400500500000000000, 4004ff420100000000, 4087ff480000000000
+    0x023f => { #31 (K-70 MOV videos)
+        Name => 'Model',
+        Description => 'Camera Model Name',
+        Writable => 'string',
+    },
+    0x0243 => { #PH
+        Name => 'PixelShiftInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::PixelShiftInfo' },
+    },
+    0x0245 => { #29
+        Name => 'AFPointInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AFPointInfo' },
+    },
     0x03fe => { #PH
         Name => 'DataDump',
@@ -2105 +2986 @@
     0x03ff => [ #PH
         {
-            Name => 'TempInfoK5',
-            Condition => '$$self{Model} =~ /K-5\b/',
-            SubDirectory => { TagTable => 'Image::ExifTool::Pentax::TempInfoK5' },
+            Name => 'TempInfo',
+            Condition => '$$self{Model} =~ /K-(01|3|30|5|50|500)\b/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Pentax::TempInfo' },
         },{
             Name => 'UnknownInfo',
@@ -2122 +3003 @@
     },
     # 0x0404 - undef[2086] (K-5)
-    # 0x0405 - undef[24200] (K-5 PEF/DNG only)
+    0x0405 => { #PH - undef[24200] (K-5 PEF/DNG only), undef[28672] (Q DNG)
+        Name => 'UnknownBlock',
+        Writable => 'undef',
+        Notes => 'large unknown data block in PEF/DNG images but not JPG images',
+        Flags => [ 'Unknown', 'Binary', 'Drop' ],
+    },
     # 0x0406 - undef[4116] (K-5)
+    # 0x0407 - undef[3072] (Q DNG)
+    # 0x0408 - undef[1024] (Q DNG)
     0x0e00 => {
         Name => 'PrintIM',
@@ -2157 +3045 @@
             1 => 'On',
             4 => 'Off (4)', # (K20D, K200D, K-7, K-5)
-            5 => 'On (5)', #(guess) (K20D)
-            # (got 5 for K-5 with HDR [auto-align off only], Composition Adjust, and movie with SR off!)
+            5 => 'On but Disabled', # (K20D, K-5)
+            # (can be 5 "On but Disabled" for K-5 with HDR [auto-align off only],
+            # Composition Adjust, DriveMode = Self-timer or Remote, and movie with SR off!)
             6 => 'On (Video)', # (K-7)
             7 => 'On (7)', #(NC) (K20D, K200D, K-m, K-5)
-            15 => 'On (15)', # (K20D (with Tamron 10-20mm @ 10mm))
+            15 => 'On (15)', # (K20D with Tamron 10-20mm @ 10mm)
+            39 => 'On (mode 2)', # (K-01) (on during capture and live view)
+            135 => 'On (135)', # (K-5IIs)
+            167 => 'On (mode 1)', # (K-01) (on during capture only)
         },
     },
@@ -2169 +3061 @@
         # (from http://www.patentstorm.us/patents/6597867-description.html)
         # (here, SR could more accurately mean Shutter Release, not Shake Reduction)
+        # (not valid for K-01 - PH)
         Notes => q{
             time from when the shutter button was half pressed to when the shutter was
-            released, including time for focusing
+            released, including time for focusing.  Not valid for some models
         },
         # (constant of 60 determined from times: 2sec=127; 3sec=184,197; 4sec=244,249,243,246 - PH)
@@ -2185 +3078 @@
         PrintConv => '"$val mm"',
         PrintConvInv => '$val=~s/\s*mm//;$val',
+    },
+);
+
+# shake reduction information for the K-3 (ref PH)
+%Image::ExifTool::Pentax::SRInfo2 = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Shake reduction information for the K-3.',
+    0 => {
+        Name => 'SRResult',
+        Unknown => 1,
+        PrintConv => { BITMASK => {
+            # Bit 0 - have seen this set in a few Pentax samples - PH
+            # Bit 6 - usually set when SR is Off, and occasionally when On - PH
+            # Bit 7 - set when AA simulation is on - PH
+        }},
+    },
+    1 => {
+        Name => 'ShakeReduction',
+        PrintConv => { #forum5425
+            0 => 'Off', # (NC for K-3)
+            1 => 'On', # (NC for K-3)
+            4 => 'Off (AA simulation off)',
+            5 => 'On but Disabled', # (NC for K-3)
+            6 => 'On (Video)', # (NC for K-3)
+            7 => 'On (AA simulation off)',
+            8 => 'Off (AA simulation type 1) (8)', #forum8362 (K-70)
+            12 => 'Off (AA simulation type 1)', # (AA linear motion)
+            15 => 'On (AA simulation type 1)', # (AA linear motion)
+            16 => 'Off (AA simulation type 2) (16)', #forum8362 (K-70)
+            20 => 'Off (AA simulation type 2)', # (AA circular motion)
+            23 => 'On (AA simulation type 2)', # (AA circular motion)
+        },
     },
 );
@@ -2237 +3163 @@
         Mask => 0x01,
         PrintConv => {
-            0x00 => 'Hometown',
-            0x01 => 'Destination',
+            0 => 'Hometown',
+            1 => 'Destination',
         },
     },
@@ -2244 +3170 @@
         Name => 'HometownDST',
         Mask => 0x02,
-        PrintConv => {
-            0x00 => 'No',
-            0x02 => 'Yes',
-        },
+        PrintConv => \%noYes,
     },
     0.3 => {
         Name => 'DestinationDST',
         Mask => 0x04,
-        PrintConv => {
-            0x00 => 'No',
-            0x04 => 'Yes',
-        },
+        PrintConv => \%noYes,
     },
     2 => {
@@ -2281 +3201 @@
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
+    2 => {
+        Name => 'PeripheralIlluminationCorr',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
+    3 => {
+        Name => 'DiffractionCorrection',
+        PrintConv => { 0 => 'Off', 16 => 'On' },
+    },
 );
 
@@ -2288 +3216 @@
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     PRIORITY => 0,
-    NOTES => 'Shot information written by Pentax DSLR cameras.',
+    NOTES => 'Camera settings information written by Pentax DSLR cameras.',
     0 => {
         Name => 'PictureMode2',
@@ -2325 +3253 @@
         Mask => 0x20,
         PrintConv => {
-            0x00 => '1/2 EV Steps',
-            0x20 => '1/3 EV Steps',
+            0 => '1/2 EV Steps',
+            1 => '1/3 EV Steps',
         },
     },
@@ -2334 +3262 @@
         Mask => 0x40,
         PrintConv => {
-            0x00 => 'Tv or Av',
-            0x40 => 'P Shift',
+            0 => 'Tv or Av',
+            1 => 'P Shift',
         },
     },
@@ -2343 +3271 @@
         Mask => 0x80,
         PrintConv => {
-            0x00 => 'Prohibited',
-            0x80 => 'Permitted',
+            0 => 'Prohibited',
+            1 => 'Permitted',
         },
     },
@@ -2351 +3279 @@
         Notes => 'the camera flash options settings, set even if the flash is off',
         Mask => 0xf0,
-        ValueConv => '$val>>4',
-        ValueConvInv => '$val<<4',
         # Note: These tags correlate with the FlashMode and InternalFlashMode values,
         # and match what is displayed by the Pentax software
@@ -2370 +3296 @@
         Name => 'MeteringMode2',
         Mask => 0x0f,
-        Notes => 'may not be valid for some models, ie. *ist D',
+        Notes => 'may not be valid for some models, eg. *ist D',
         PrintConv => {
             0 => 'Multi-segment',
@@ -2383 +3309 @@
         Mask => 0xf0,
         PrintConv => {
-            0x00 => 'Auto',
+            0 => 'Auto',
             BITMASK => {
-                4 => 'Select',
-                5 => 'Fixed Center',
-                # have seen bit 6 set in pre-production images (firmware 0.20) - PH
+                0 => 'Select',
+                1 => 'Fixed Center',
+                # have seen bit 2 set in pre-production images (firmware 0.20) - PH
             },
         },
@@ -2446 +3372 @@
         Name => 'ExposureBracketStepSize',
         # This is set even when Exposure Bracket is Off (and the K10D
-        # displays Ò---Ó as the step size when you press the EB button) - DaveN
+        # displays "---" as the step size when you press the EB button) - DaveN
         # because the last value is remembered and if you turn Exposure Bracket
         # on the step size goes back to what it was before.
@@ -2485 +3411 @@
         PrintConv => {
             0 => 'Auto',
-            16 => 'Daylight',
-            32 => 'Shade',
-            48 => 'Cloudy',
-            64 => 'Daylight Fluorescent',
-            80 => 'Day White Fluorescent',
-            96 => 'White Fluorescent',
-            112 => 'Tungsten',
-            128 => 'Flash',
-            144 => 'Manual',
+            1 => 'Daylight',
+            2 => 'Shade',
+            3 => 'Cloudy',
+            4 => 'Daylight Fluorescent',
+            5 => 'Day White Fluorescent',
+            6 => 'White Fluorescent',
+            7 => 'Tungsten',
+            8 => 'Flash',
+            9 => 'Manual',
             # The three Set Color Temperature settings refer to the 3 preset settings which
             # can be saved in the menu (see page 123 of the K10D manual)
-            192 => 'Set Color Temperature 1',
-            208 => 'Set Color Temperature 2',
-            224 => 'Set Color Temperature 3',
+            12 => 'Set Color Temperature 1',
+            13 => 'Set Color Temperature 2',
+            14 => 'Set Color Temperature 3',
         },
     },
@@ -2551 +3477 @@
         Notes => 'K-5 only',
         Mask => 0x01,
-        PrintConv => {
-            0x00 => 'Off',
-            0x01 => 'On',
-        },
+        PrintConv => { 0 => 'Off', 1 => 'On' },
     },
     14.3 => { #PH (K-5)
@@ -2562 +3485 @@
         Mask => 0x02,
         PrintConv => {
-            0x00 => '1 EV Steps',
-            0x02 => 'As EV Steps',
+            0 => '1 EV Steps',
+            1 => 'As EV Steps',
         },
     },
@@ -2571 +3494 @@
         Notes => 'K-5 only',
         Mask => 0x04,
-        PrintConv => {
-            0x00 => 'Off',
-            0x04 => 'On',
-        },
+        PrintConv => { 0 => 'Off', 1 => 'On' },
     },
     # 14.5 Mask 0x80 - changes for K-5
@@ -2589 +3509 @@
         # (these tags relate closely to InternalFlashMode values - PH)
         PrintConv => {
-            0x00 => 'Normal', # (this value never occurs in Green Mode) - ref 19
-            0x10 => 'Red-eye reduction', # (this value never occurs in Green Mode) - ref 19
-            0x20 => 'Auto',  # (this value only occurs in Green Mode) - ref 19
-            0x30 => 'Auto, Red-eye reduction', # (this value only occurs in Green Mode) - ref 19
-            0x50 => 'Wireless (Master)',
-            0x60 => 'Wireless (Control)',
-            0x80 => 'Slow-sync',
-            0x90 => 'Slow-sync, Red-eye reduction',
-            0xa0 => 'Trailing-curtain Sync'
+            0 => 'Normal', # (this value never occurs in Green Mode) - ref 19
+            1 => 'Red-eye reduction', # (this value never occurs in Green Mode) - ref 19
+            2 => 'Auto',  # (this value only occurs in Green Mode) - ref 19
+            3 => 'Auto, Red-eye reduction', # (this value only occurs in Green Mode) - ref 19
+            5 => 'Wireless (Master)',
+            6 => 'Wireless (Control)',
+            8 => 'Slow-sync',
+            9 => 'Slow-sync, Red-eye reduction',
+            10 => 'Trailing-curtain Sync'
         },
     },
@@ -2622 +3542 @@
         },
         Mask => 0x80,
-        PrintConv => {
-            0x00 => 'No',
-            0x80 => 'Yes',
-        },
+        PrintConv => \%noYes,
     },
     17.2 => {
@@ -2633 +3550 @@
         Mask => 0x60,
         PrintConv => {
-            0x00 => 'Horizontal (normal)',
-            0x20 => 'Rotate 180',
-            0x40 => 'Rotate 90 CW',
-            0x60 => 'Rotate 270 CW',
+            0 => 'Horizontal (normal)',
+            1 => 'Rotate 180',
+            2 => 'Rotate 90 CW',
+            3 => 'Rotate 270 CW',
         },
     },
@@ -2647 +3564 @@
         Mask => 0x04,
         PrintConv => {
-            0x00 => 'Manual',
-            0x04 => 'Auto',
+            0 => 'Manual',
+            1 => 'Auto',
         },
     },
@@ -2657 +3574 @@
         Mask => 0x02,
         PrintConv => {
-            0x00 => '1 EV Steps',
-            0x02 => 'As EV Steps',
+            0 => '1 EV Steps',
+            1 => 'As EV Steps',
         },
     },
@@ -2704 +3621 @@
 );
 
+# unknown camera settings (K-01)
+%Image::ExifTool::Pentax::CameraSettingsUnknown = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'This information has not yet been decoded for models such as the K-01.',
+);
+
 # auto-exposure information (ref PH)
 %Image::ExifTool::Pentax::AEInfo = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    DATAMEMBER => [ 8 ],
-    # instead of /8, should these be PentaxEV(), as in CameraSettings? - PH
+    DATAMEMBER => [ 7 ],
+    NOTES => 'Auto-exposure information for most Pentax models.',
+    # instead of /8, should these be PentaxEv(), as in CameraSettings? - PH
     0 => {
         Name => 'AEExposureTime',
@@ -2777 +3702 @@
             83 => 'No Flash',
             91 => 'Night Scene',
+            # 96 - seen for Pentax Q10
             99 => 'Surf & Snow',
+            104 => 'Night Snap', # (Q)
             107 => 'Text',
             115 => 'Sunset',
+            # 116 - seen for Pentax Q (vivid?)
             123 => 'Kids',
             131 => 'Pet',
             139 => 'Candlelight',
+            144 => 'SCN', # (Q)
+            160 => 'Program', # (Q)
+            # 142 - seen for Pentax Q in Program mode
             147 => 'Museum',
             184 => 'Shallow DOF Program', # (K-5)
+            216 => 'HDR', # (Q)
         },
     },
     7 => {
         Name => 'AEFlags',
-        Unknown => 1,
         Writable => 0,
+        Hook => '$size > 20 and $varSize += 1',
+        Notes => 'indices after this are incremented by 1 for some models',
+        # (this tag can't be unknown because the Hook must be evaluated
+        #  to shift the following offsets if necessary.  Instead, ignore
+        #  the return value unless Unknown option used)
+        RawConv => '$$self{OPTIONS}{Unknown} ? $val : undef',
         PrintConv => { #19
             # (seems to be the warnings displayed in the viewfinder for several bits)
@@ -2808 +3745 @@
         },
     },
-    8 => {
-        Name => 'AEUnknown',
-        Notes => 'indices after this are incremented by 1 for some models',
-        Format => 'var_int8u[$size > 20 ? 2 : 1]',
-        Writable => 0,
-        # (this tag can't be unknown because the Format must be evaluated
-        #  to shift the following offsets if necessary.  Instead, ignore
-        #  the return value unless Unknown > 1)
-        RawConv => '$$self{OPTIONS}{Unknown} > 1 ? $val : undef',
-    },
     # Note: Offsets below shifted by 1 if record size is > 20 bytes
-    # (implemented by the var_int8u count above)
+    # (implemented by the Hook above)
+    8 => { #30
+        Name => 'AEApertureSteps',
+        Notes => q{
+            number of steps the aperture has been stopped down from wide open.  There
+            are roughly 8 steps per F-stop for most lenses, or 18 steps for 645D lenses,
+            but it varies slightly by lens
+        },
+        PrintConv => '$val == 255 ? "n/a" : $val',
+        PrintConvInv => '$val eq "n/a" ? 255 : $val',
+    },
     9 => { #19
         Name => 'AEMaxAperture',
@@ -2854 +3791 @@
         },
     },
-    # 13 - related to program mode somehow - PH
+    13 => { #30
+        Name => 'AEWhiteBalance',
+        Condition => '$$self{AEInfoSize} == 24', # (not thoroughly tested for other sizes)
+        Notes => 'K7 and Kx',
+        Mask => 0xf0,
+        PrintConv => {
+            0 => 'Standard',
+            1 => 'Daylight',
+            2 => 'Shade',
+            3 => 'Cloudy',
+            4 => 'Daylight Fluorescent',
+            5 => 'Day White Fluorescent',
+            6 => 'White Fluorescent',
+            7 => 'Tungsten',
+            8 => 'Unknown', #31 (or not set due to inadequate lighting)
+        },
+    },
+    13.1 => { #30
+        Name => 'AEMeteringMode2',
+        Condition => '$$self{AEInfoSize} == 24', # (not thoroughly tested for other sizes)
+        Notes => 'K7 and Kx, override for an incompatible metering mode setting',
+        Mask => 0x0f,
+        PrintConv => {
+            0 => 'Multi-segment',
+            BITMASK => {
+                0 => 'Center-weighted average',
+                1 => 'Spot',
+                # 2 - seen for K7 AVI movie
+            },
+        },
+    },
     14 => { #19
         Name => 'FlashExposureCompSet',
+        Description => 'Flash Exposure Comp. Setting',
         Format => 'int8s',
         Notes => q{
@@ -2868 +3836 @@
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
     },
+    21 => { #30
+        Name => 'LevelIndicator',
+        PrintConv => '$val == 90 ? "n/a" : $val',
+        PrintConvInv => '$val eq "n/a" ? 90 : $val',
+    },
+);
+
+# auto-exposure information for the K-01 (ref PH)
+%Image::ExifTool::Pentax::AEInfo2 = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Auto-exposure information for the K-01.',
+    # instead of /8, should these be PentaxEv(), as in CameraSettings? - PH
+    2 => {
+        Name => 'AEExposureTime',
+        Notes => 'val = 24 * 2**((32-raw)/8)',
+        ValueConv => '24*exp(-($val-32)*log(2)/8)',
+        ValueConvInv => '-log($val/24)*8/log(2)+32',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    3 => {
+        Name => 'AEAperture',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    4 => {
+        Name => 'AE_ISO',
+        Notes => 'val = 100 * 2**((raw-32)/8)',
+        ValueConv => '100*exp(($val-32)*log(2)/8)',
+        ValueConvInv => 'log($val/100)*8/log(2)+32',
+        PrintConv => 'int($val + 0.5)',
+        PrintConvInv => '$val',
+    },
+    5 => {
+        Name => 'AEXv',
+        # this is the negative of exposure compensation, not including bracketing
+        Notes => 'val = (raw-64)/8',
+        ValueConv => '($val-64)/8',
+        ValueConvInv => '$val * 8 + 64',
+    },
+    6 => {
+        Name => 'AEBXv',
+        # this is the negative of auto exposure bracketing compensation
+        Format => 'int8s',
+        Notes => 'val = raw / 8',
+        ValueConv => '$val / 8',
+        ValueConvInv => '$val * 8',
+    },
+    8 => {
+        Name => 'AEError',
+        Format => 'int8s',
+        # this is usually zero except in M exposure mode, but it can be non-zero
+        # in other modes (eg. if you hit an aperture limit in Tv mode)
+        ValueConv => '-($val-64)/8', # (negate to make overexposed positive)
+        ValueConvInv => '-$val * 8 + 64',
+    },
+    11 => {
+        Name => 'AEApertureSteps',
+        Notes => q{
+            number of steps the aperture has been stopped down from wide open.  There
+            are roughly 8 steps per F-stop, but it varies slightly by lens
+        },
+        PrintConv => '$val == 255 ? "n/a" : $val',
+        PrintConvInv => '$val eq "n/a" ? 255 : $val',
+    },
+    15 => {
+        Name => 'SceneMode',
+        PrintConvColumns => 2,
+        PrintConv => {
+            0 => 'Off',
+            1 => 'HDR',
+            4 => 'Auto PICT',
+            5 => 'Portrait',
+            6 => 'Landscape',
+            7 => 'Macro',
+            8 => 'Sport',
+            9 => 'Night Scene Portrait',
+            10 => 'No Flash',
+            11 => 'Night Scene',
+            12 => 'Surf & Snow',
+            14 => 'Sunset',
+            15 => 'Kids',
+            16 => 'Pet',
+            17 => 'Candlelight',
+            18 => 'Museum',
+            20 => 'Food',
+            21 => 'Stage Lighting',
+            22 => 'Night Snap',
+            25 => 'Night Scene HDR',
+            26 => 'Blue Sky',
+            27 => 'Forest',
+            29 => 'Backlight Silhouette',
+        },
+    },
+    16 => {
+        Name => 'AEMaxAperture',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    17 => {
+        Name => 'AEMaxAperture2',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    18 => {
+        Name => 'AEMinAperture',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.0f",$val)',
+        PrintConvInv => '$val',
+    },
+    19 => {
+        Name => 'AEMinExposureTime',
+        Notes => 'val = 24 * 2**((32-raw)/8)',
+        ValueConv => '24*exp(-($val-32)*log(2)/8)',
+        ValueConvInv => '-log($val/24)*8/log(2)+32',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+);
+
+# auto-exposure information for the K-30 (ref PH)
+%Image::ExifTool::Pentax::AEInfo3 = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Auto-exposure information for the K-3, K-30, K-50 and K-500.',
+    # instead of /8, should these be PentaxEv(), as in CameraSettings? - PH
+    16 => {
+        Name => 'AEExposureTime',
+        Notes => 'val = 24 * 2**((32-raw)/8)',
+        ValueConv => '24*exp(-($val-32)*log(2)/8)',
+        ValueConvInv => '-log($val/24)*8/log(2)+32',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    17 => {
+        Name => 'AEAperture',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    18 => {
+        Name => 'AE_ISO',
+        Notes => 'val = 100 * 2**((raw-32)/8)',
+        ValueConv => '100*exp(($val-32)*log(2)/8)',
+        ValueConvInv => 'log($val/100)*8/log(2)+32',
+        PrintConv => 'int($val + 0.5)',
+        PrintConvInv => '$val',
+    },
+    28 => {
+        Name => 'AEMaxAperture',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    29 => {
+        Name => 'AEMaxAperture2',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    30 => {
+        Name => 'AEMinAperture',
+        Notes => 'val = 2**((raw-68)/16)',
+        ValueConv => 'exp(($val-68)*log(2)/16)',
+        ValueConvInv => 'log($val)*16/log(2)+68',
+        PrintConv => 'sprintf("%.0f",$val)',
+        PrintConvInv => '$val',
+    },
+    31 => {
+        Name => 'AEMinExposureTime',
+        Notes => 'val = 24 * 2**((32-raw)/8)',
+        ValueConv => '24*exp(-($val-32)*log(2)/8)',
+        ValueConvInv => '-log($val/24)*8/log(2)+32',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+);
+
+# unknown auto-exposure information (Q, Q10)
+%Image::ExifTool::Pentax::AEInfoUnknown = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+);
+
+# lens type
+%Image::ExifTool::Pentax::LensRec = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => q{
+        This record stores the LensType, plus one or two unknown bytes for some
+        models.
+    },
+    0 => {
+        Name => 'LensType',
+        Format => 'int8u[2]',
+        Priority => 0,
+        ValueConvInv => '$val=~s/\.\d+$//; $val',
+        PrintConv => \%pentaxLensTypes,
+        SeparateTable => 1,
+    },
+    3 => { #PH
+        Name => 'ExtenderStatus',
+        Notes => 'not valid if a non-AF lens is used',
+        PrintConv => { 0 => 'Not attached', 1 => 'Attached' },
+    },
+    # this is a binaryData table because some cameras add an extra
+    # byte or two here (typically zeros)...
 );
 
@@ -2880 +4073 @@
         Format => 'int8u[2]',
         Priority => 0,
+        ValueConvInv => '$val=~s/\.\d+$//; $val',
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
@@ -2906 +4100 @@
             return "$v[0] $v[1]";
         },
+        # just fill in the missing bits/bytes with zeros...
+        ValueConvInv => q{
+            my @v = split(' ',$val);
+            return undef unless @v == 2;
+            $v[2] = ($v[1] >> 8) & 0xff;
+            $v[3] = $v[1] & 0xff;
+            $v[1] = 0;
+            return "@v";
+        },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
@@ -2932 +4135 @@
             return "$v[0] $v[1]";
         },
+        # just fill in the missing bits/bytes with zeros...
+        ValueConvInv => q{
+            my @v = split(' ',$val);
+            return undef unless @v == 2;
+            $v[2] = ($v[1] >> 8) & 0xff;
+            $v[3] = $v[1] & 0xff;
+            $v[1] = 0;
+            return "@v";
+        },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
@@ -2958 +4170 @@
             return "$v[0] $v[1]";
         },
+        # just fill in the missing bits/bytes with zeros...
+        ValueConvInv => q{
+            my @v = split(' ',$val);
+            return undef unless @v == 2;
+            $v[2] = ($v[1] >> 8) & 0xff;
+            $v[3] = $v[1] & 0xff;
+            $v[1] = 0;
+            return "@v";
+        },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
     },
     12 => {
+        Name => 'LensData',
+        Format => 'undef[18]',
+        Condition => '$$self{NewLensData} = 1', # not really a condition, just used to set flag
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensData' },
+    },
+);
+
+# lens information for K-01, K-30, K-50, K-500, K-3, K-3II, K-S1 (ref PH)
+%Image::ExifTool::Pentax::LensInfo5 = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    IS_SUBDIR => [ 15 ],
+    NOTES => 'Pentax lens information structure for the K-01 and newer models.',
+    1 => {
+        Name => 'LensType',
+        Format => 'int8u[5]',
+        Priority => 0,
+        ValueConv => q{
+            my @v = split(' ',$val);
+            $v[0] &= 0x0f;
+            $v[1] = $v[3] * 256 + $v[4]; # (always high byte first)
+            return "$v[0] $v[1]";
+        },
+        # just fill in the missing bits/bytes with zeros...
+        ValueConvInv => q{
+            my @v = split(' ',$val);
+            return undef unless @v == 2;
+            $v[3] = ($v[1] >> 8) & 0xff;
+            $v[4] = $v[1] & 0xff;
+            $v[1] = $v[2] = 0;
+            return "@v";
+        },
+        PrintConv => \%pentaxLensTypes,
+        SeparateTable => 1,
+    },
+    15 => {
         Name => 'LensData',
         Format => 'undef[17]',
@@ -2972 +4229 @@
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 12.1 ],
     NOTES => q{
         Pentax lens data information.  Some of these tags require interesting binary
@@ -2980 +4238 @@
     0.1 => { #JD
         Name => 'AutoAperture',
+        Condition => 'not $$self{NewLensData}',
+        Notes => 'not valid for the K-r, K-5 or K-5II', #29
         Mask => 0x01,
-        PrintConv => {
-            0 => 'On',
-            1 => 'Off',
-        },
+        PrintConv => { 0 => 'On', 1 => 'Off' },
     },
     0.2 => { #JD
         Name => 'MinAperture',
+        Condition => 'not $$self{NewLensData}',
+        Notes => 'not valid for the K-r, K-5 or K-5II', #29
         Mask => 0x06,
         PrintConv => {
-            0x00 => 22,
-            0x02 => 32,
-            0x04 => 45,
-            0x06 => 16,
+            0 => 22,
+            1 => 32,
+            2 => 45,
+            3 => 16,
         },
     },
     0.3 => { #JD
         Name => 'LensFStops',
+        Condition => 'not $$self{NewLensData}',
+        Notes => 'not valid for the K-r, K-5 or K-5II', #29
         Mask => 0x70,
-        ValueConv => '5 + (($val >> 4) ^ 0x07) / 2',
-        ValueConvInv => '((($val - 5) * 2) ^ 0x07) << 4',
+        ValueConv => '5 + ($val ^ 0x07) / 2',
+        ValueConvInv => '(($val - 5) * 2) ^ 0x07',
     },
     # 1-16 look like Lens Codes LC0-LC15, ref patent 5617173 and 5999753 [+notes by PH]
@@ -3011 +4272 @@
         %lensCode,
     },
-    3 => { # LC2 = distance data
-        Name => 'LC2',
-        %lensCode,
-        # FocusRange decoding needs more testing with various lenses - PH
-        TestName => 'FocusRange',
-        TestPrintConv => q{
-            my @v;
-            my $lsb = $val & 0x07;
-            my $msb = $val >> 3;
-            my $ls2 = $lsb ^ 0x07;
-            $ls2 ^= 0x01 if $ls2 & 0x02;
-            $ls2 ^= 0x03 if $ls2 & 0x04;
-            foreach ($ls2, $ls2+1) {
-                push(@v,'inf'), next if $_ > 7;
-                push @v, sprintf("%.2f m", 2 ** ($msb / 4) * 0.18 * ($_ + 4) / 16);
-            }
-            return join ' - ', @v;
+    # LC2 = distance data
+    3 => { #29
+        Name => 'MinFocusDistance',
+        Notes => 'minimum focus distance for the lens',
+        Mask => 0xf8,
+        PrintConv => {
+            0 => '0.13-0.19 m', # (plus K or M lenses)
+            1 => '0.20-0.24 m',
+            2 => '0.25-0.28 m',
+            3 => '0.28-0.30 m',
+            4 => '0.35-0.38 m',
+            5 => '0.40-0.45 m',
+            6 => '0.49-0.50 m', # (plus many Sigma lenses)
+            7 => '0.6 m',       #PH (NC)
+            8 => '0.7 m',       # (plus Sigma 55-200)
+            9 => '0.8-0.9 m',   #PH (NC) Tokina 28-70/2.6-2.8
+            10 => '1.0 m',      # (plus Sigma 70 macro)
+            11 => '1.1-1.2 m',
+            12 => '1.4-1.5 m',
+            13 => '1.5 m',      # Sigma 70-300/4-5.6 macro
+            14 => '2.0 m',
+            15 => '2.0-2.1 m',  #PH (NC)
+            16 => '2.1 m',      # Sigma 135-400 APO & DG: 2.0-2.2m
+            17 => '2.2-2.9 m',  #PH (NC)
+            18 => '3.0 m',      # Sigma 50-500 : 1.0-3.0m depending on the focal length
+                                 ## 50mm, 100mm => 1.0m
+                                 ## 200mm       => 1.1m
+                                 ## 300mm       => 1.5m
+                                 ## 400mm       => 2.2m
+                                 ## 500mm       => 3.0m
+            19 => '4-5 m',      #PH (NC)
+            20 => '5.6 m',      # Pentax DA 560
+            # To check: Sigma 120-400 OS: MFD 1.5m
+            # To check: Sigma 150-500 OS: MFD 2.2m
+            # To check: Sigma 50-500 has MFD 50-180cm
+            # 0xd0 - seen for the Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye (ref PH)
+        },
+    },
+    3.1 => { #29
+        Name => 'FocusRangeIndex',
+        Mask => 0x07,
+        PrintConv => {
+            7 => '0 (very close)',
+            6 => '1 (close)',
+            4 => '2',
+            5 => '3',
+            1 => '4',
+            0 => '5',
+            2 => '6 (far)',
+            3 => '7 (very far)',
         },
     },
@@ -3034 +4328 @@
         %lensCode,
     },
-    5 => { # LC4 = abberation correction, near distance data
+    5 => { # LC4 = aberration correction, near distance data
         Name => 'LC4',
         %lensCode,
     },
-    6 => { # LC5 = light color abberation correction data
+    6 => { # LC5 = light color aberration correction data
         Name => 'LC5',
         %lensCode,
     },
-    7 => { # LC6 = open abberation data
+    7 => { # LC6 = open aberration data
         Name => 'LC6',
         %lensCode,
@@ -3050 +4344 @@
         %lensCode,
     },
-    9 => { # LC8 = focal length data
-        Name => 'FocalLength',
+    9 => [{ # LC8 = focal length data
+        Name => 'LensFocalLength',
+        Notes => 'focal length of lens alone, without adapter', #PH
         Priority => 0,
+        Condition => '$$self{Model} !~ /645Z/', #PH (doesn't work for 645Z)
         ValueConv => '10*($val>>2) * 4**(($val&0x03)-2)', #JD
         ValueConvInv => q{
@@ -3061 +4357 @@
         PrintConv => 'sprintf("%.1f mm", $val)',
         PrintConvInv => '$val=~s/\s*mm//; $val',
-    },
+    },{
+        Name => 'LC8',
+        %lensCode,
+    }],
     # the following aperture values change with focal length
     10 => { # LC9 = nominal AVmin/AVmax data (open/closed aperture values)
         Name => 'NominalMaxAperture',
         Mask => 0xf0,
-        ValueConv => '2**(($val>>4)/4)', #JD
-        ValueConvInv => '4*log($val)/log(2) << 4',
+        ValueConv => '2**($val/4)', #JD
+        ValueConvInv => '4*log($val)/log(2)',
         PrintConv => 'sprintf("%.1f", $val)',
         PrintConvInv => '$val',
@@ -3087 +4386 @@
         %lensCode,
     },
+    12.1 => {
+        Name => 'NewLensDataHook',
+        Hidden => 1,
+        Hook => '$varSize += 1 if $$self{NewLensData}',
+        RawConv => 'undef',
+    },
     13 => { # LC12 = mv1 AVminsif data
         Name => 'LC12',
+        Notes => "ID's 13-16 are offset by 1 for the K-r, K-5 and K-5II", #29
         %lensCode,
     },
+    # 14 - related to live view for K-5 (normally 3, but 1 or 5 in LV mode)
     14.1 => { # LC13 = AVmin (open aperture value) [MaxAperture=(2**((AVmin-1)/32))]
         Name => 'MaxAperture',
+        Condition => '$$self{Model} ne "K-5"',
         Notes => 'effective wide open aperture for current focal length',
         Mask => 0x7f, # (not sure what the high bit indicates)
@@ -3307 +4615 @@
         # I've also seen: 0x42 (K2000), 0xf2 (K-7,K-r,K-5), 0x12,0x22 (K-x) - PH
         PrintConv => {
+            1 => 'Camera Battery', #PH (NC, GR III)
             2 => 'Body Battery',
             3 => 'Grip Battery',
@@ -3315 +4624 @@
         {
             Name => 'BodyBatteryState',
-            Condition => '$$self{Model} =~ /(\*ist|K100D|K200D|K10D|GX10|K20D|GX20)\b/',
+            Condition => '$$self{Model} =~ /(\*ist|K100D|K200D|K10D|GX10|K20D|GX20|GX-1[LS]?)\b/',
             Notes => '*istD, K100D, K200D, K10D and K20D',
             Mask => 0xf0,
             PrintConv => { #19
-                 0x10 => 'Empty or Missing',
-                 0x20 => 'Almost Empty',
-                 0x30 => 'Running Low',
-                 0x40 => 'Full',
+                 1 => 'Empty or Missing',
+                 2 => 'Almost Empty',
+                 3 => 'Running Low',
+                 4 => 'Full',
             },
         },{
             Name => 'BodyBatteryState',
-            Condition => '$$self{Model} =~ /(K-5|K-7|K-r|K-x|645D)\b/',
-            Notes => 'K-5, K-7, K-r, K-x and 645D',
+            Condition => '$$self{Model} !~ /(K110D|K2000|K-m)\b/',
+            Notes => 'other models except the K110D, K2000 and K-m',
             Mask => 0xf0,
             PrintConv => {
-                 0x10 => 'Empty or Missing',
-                 0x20 => 'Almost Empty',
-                 0x30 => 'Running Low',
-                 0x40 => 'Close to Full',
-                 0x50 => 'Full',
+                 1 => 'Empty or Missing',
+                 2 => 'Almost Empty',
+                 3 => 'Running Low',
+                 4 => 'Close to Full',
+                 5 => 'Full',
             },
         },{
@@ -3340 +4649 @@
             Notes => 'decoding unknown for other models',
             Mask => 0xf0,
-            ValueConv => '$val >> 4',
-            ValueConvInv => '$val << 4',
         },
     ],
@@ -3351 +4658 @@
             Mask => 0x0f,
             PrintConv => { #19
-                 0x01 => 'Empty or Missing',
-                 0x02 => 'Almost Empty',
-                 0x03 => 'Running Low',
-                 0x04 => 'Full',
+                 1 => 'Empty or Missing',
+                 2 => 'Almost Empty',
+                 3 => 'Running Low',
+                 4 => 'Full',
             },
         },{
@@ -3379 +4686 @@
             Name => 'BodyBatteryADNoLoad',
             Description => 'Body Battery A/D No Load',
-            Condition => '$$self{Model} =~ /(\*ist|K100D|K200D)\b/',
+            Condition => '$$self{Model} =~ /(\*ist|K100D|K200D|GX-1[LS]?)\b/',
         },
         {
             Name => 'BodyBatteryVoltage1', # (static?)
-            Condition => '$$self{Model} =~ /(K-5|K-7|K-r|K-x|645D)\b/',
+            Condition => '$$self{Model} !~ /(K100D|K110D|K2000|K-m|Q\d*)\b/',
             Format => 'int16u',
             ValueConv => '$val / 100',
@@ -3389 +4696 @@
             PrintConv => 'sprintf("%.2f V", $val)',
             PrintConvInv => '$val =~ s/\s*V$//',
-            # For my K-5:          Min (0%) Max (100%) Meas
+            # For my K-5:          Min (0%) Max (100%) At Meas
             # BodyBatteryVoltage1  6.24 V   7.75 V     7.66 V
             # BodyBatteryVoltage2  5.98 V   7.43 V     7.34 V
@@ -3418 +4725 @@
             Name => 'GripBatteryADNoLoad',
             Description => 'Grip Battery A/D No Load',
-            Condition => '$$self{Model} =~ /(\*ist|K10D|GX10|K20D|GX20)\b/',
+            Condition => '$$self{Model} =~ /(\*ist|K10D|GX10|K20D|GX20|GX-1[LS]?)\b/',
         },
         {
             Name => 'BodyBatteryVoltage2', # (less than BodyBatteryVoltage1 -- under load?)
-            Condition => '$$self{Model} =~ /(K-5|K-7|K-r|K-x|645D)\b/',
+            Condition => '$$self{Model} !~ /(K100D|K110D|K2000|K-m|Q\d*)\b/',
             Format => 'int16u',
             ValueConv => '$val / 100',
@@ -3472 +4779 @@
         PrintConvColumns => 2,
         PrintConv => {
+            0 => '(none)',
             0x07ff => 'All',
             0x0777 => 'Central 9 points',
@@ -3533 +4841 @@
     0x0b => { #JD
         Name => 'AFPointsInFocus',
+        Condition => '$$self{Model} !~ /K-[13]\b/',
         Notes => q{
-            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 and K-3.  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,
@@ -3562 +4872 @@
         },
     },
+    0x1fd => {
+        Name => 'AFHold',
+        Notes => 'decoded only for the K-3 II',
+        Condition => '$$self{Model} eq "PENTAX K-3 II"',
+        PrintConv => { 0 => 'Off', 1 => 'Short', 2 => 'Medium', 3 => 'Long' },
+    },
+);
+
+# Kelvin white balance information (ref 28, topic 4834)
+%Image::ExifTool::Pentax::KelvinWB = (
+    %binaryDataAttrs,
+    FORMAT => 'int16u',
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'White balance Blue/Red gains as a function of color temperature.',
+    1  => { Name => 'KelvinWB_Daylight', %kelvinWB },
+    5  => { Name => 'KelvinWB_01', %kelvinWB },
+    9  => { Name => 'KelvinWB_02', %kelvinWB },
+    13 => { Name => 'KelvinWB_03', %kelvinWB },
+    17 => { Name => 'KelvinWB_04', %kelvinWB },
+    21 => { Name => 'KelvinWB_05', %kelvinWB },
+    25 => { Name => 'KelvinWB_06', %kelvinWB },
+    29 => { Name => 'KelvinWB_07', %kelvinWB },
+    33 => { Name => 'KelvinWB_08', %kelvinWB },
+    37 => { Name => 'KelvinWB_09', %kelvinWB },
+    41 => { Name => 'KelvinWB_10', %kelvinWB },
+    45 => { Name => 'KelvinWB_11', %kelvinWB },
+    49 => { Name => 'KelvinWB_12', %kelvinWB },
+    53 => { Name => 'KelvinWB_13', %kelvinWB },
+    57 => { Name => 'KelvinWB_14', %kelvinWB },
+    61 => { Name => 'KelvinWB_15', %kelvinWB },
+    65 => { Name => 'KelvinWB_16', %kelvinWB },
 );
 
@@ -3574 +4915 @@
     },
     17 => {
-        Name => 'WBShiftMG',
+        Name => 'WBShiftGM',
         Notes => 'positive is a shift toward green',
     },
@@ -3606 +4947 @@
     1 => { # (presumably this is from an orientation sensor)
         Name => 'CameraOrientation',
-        Condition => '$$self{Model} =~ /K-[^m]/',
+        Condition => '$$self{Model} =~ /K-(5|7|r|x)\b/',
         Notes => 'K-5, K-7, K-r and K-x',
         PrintHex => 1,
@@ -3970 +5311 @@
         The parameters associated with each type of digital filter are unique, and
         these settings are also extracted with the DigitalFilter tag.  Information
-        is not extracted for filters that are "Off" unless the Unknown option is
+        is not extracted for filters that are "Off" unless the L<Unknown|../ExifTool.html#Unknown> option is
         used.
     },
@@ -4008 +5349 @@
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     FORMAT => 'int8s',
-    NOTES => 'Tags decoded from the electronic level information.',
+    NOTES => q{
+        Tags decoded from the electronic level information for the K-5.  May not be
+        valid for other models.
+    },
     0 => {
         Name => 'LevelOrientation',
@@ -4014 +5358 @@
         PrintHex => 0,
         PrintConv => {
+            0 => 'n/a', #PH (NC, GR III)
             1 => 'Horizontal (normal)',
             2 => 'Rotate 180',
@@ -4030 +5375 @@
         Mask => 0xf0,
         PrintConv => {
-            0x00 => 'Off',
-            0x20 => 'Composition Adjust',
-            0xa0 => 'Composition Adjust + Horizon Correction',
-            0xc0 => 'Horizon Correction',
+            0 => 'Off',
+            2 => 'Composition Adjust',
+            10 => 'Composition Adjust + Horizon Correction',
+            12 => 'Horizon Correction',
         },
     },
     1 => {
         Name => 'RollAngle',
-        Notes => 'degrees of clockwise camera rotation',
+        Notes => 'converted to degrees of clockwise camera rotation',
         ValueConv => '-$val / 2',
         ValueConvInv => '-$val * 2',
@@ -4044 +5389 @@
     2 => {
         Name => 'PitchAngle',
-        Notes => 'degrees of upward camera tilt',
+        Notes => 'converted to degrees of upward camera tilt',
         ValueConv => '-$val / 2',
         ValueConvInv => '-$val * 2',
@@ -4070 +5415 @@
 );
 
-# temperature information for the K5 - PH
-%Image::ExifTool::Pentax::TempInfoK5 = (
+# white balance RGGB levels (ref 28)
+%Image::ExifTool::Pentax::WBLevels = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    # 0 - 11 (number of entries in this table)
+    # 1 - 0
+    2 => {
+        Name => 'WB_RGGBLevelsDaylight',
+        Format => 'int16u[4]',
+    },
+    # 10 - 1
+    11 => {
+        Name => 'WB_RGGBLevelsShade',
+        Format => 'int16u[4]',
+    },
+    # 19 - 2
+    20 => {
+        Name => 'WB_RGGBLevelsCloudy',
+        Format => 'int16u[4]',
+    },
+    # 28 - 3
+    29 => {
+        Name => 'WB_RGGBLevelsTungsten',
+        Format => 'int16u[4]',
+    },
+    # 37 - 4
+    38 => {
+        Name => 'WB_RGGBLevelsFluorescentD',
+        Format => 'int16u[4]',
+    },
+    # 46 - 5
+    47 => {
+        Name => 'WB_RGGBLevelsFluorescentN',
+        Format => 'int16u[4]',
+    },
+    # 55 - 6
+    56 => {
+        Name => 'WB_RGGBLevelsFluorescentW',
+        Format => 'int16u[4]',
+    },
+    # 64 - 7
+    65 => {
+        Name => 'WB_RGGBLevelsFlash',
+        Format => 'int16u[4]',
+    },
+    # 73 - 8
+    74 => {
+        Name => 'WB_RGGBLevelsFluorescentL',
+        Format => 'int16u[4]',
+    },
+    # 82 - 0xfe
+    83 => {
+        Name => 'WB_RGGBLevelsUnknown',
+        Format => 'int16u[4]',
+        Unknown => 1,
+    },
+    # 91 - 0xff
+    92 => {
+        Name => 'WB_RGGBLevelsUserSelected',
+        Format => 'int16u[4]',
+    },
+);
+
+# lens information for Penax Q (ref PH)
+# (306 bytes long, I wonder if this contains vignetting information too?)
+%Image::ExifTool::Pentax::LensInfoQ = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'More lens information stored by the Pentax Q.',
+    0x0c => {
+        Name => 'LensModel',
+        Format => 'string[30]',
+    },
+    0x2a => {
+        Name => 'LensInfo',
+        Format => 'string[20]',
+        ValueConv => '$val=~s/mm/mm /; $val',
+        ValueConvInv => '$val=~tr/ //d; $val',
+    }
+);
+
+# Pixel shift information for the K-3II (ref PH)
+%Image::ExifTool::Pentax::PixelShiftInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Pixel shift information stored by the K-3 II.',
+    0x00 => {
+        Name => 'PixelShiftResolution',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
+);
+
+# AF point information for the K-1 (ref 29)
+%Image::ExifTool::Pentax::AFPointInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'AF point information written by the K-1.',
+    # 0 - int16u: 1 (version?)
+    2 => {
+        Name => 'NumAFPoints',
+        Format => 'int16u',
+    },
+    4 => {
+        Name => 'AFPointsInFocus',
+        Condition => '$$self{Model} =~ /K-1\b/',
+        Format => 'int8u[9]',
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x02)',
+    },
+    4.1 => {
+        Name => 'AFPointsSelected',
+        Condition => '$$self{Model} =~ /K-1\b/',
+        Format => 'int8u[9]',
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03)',
+    },
+    4.2 => {
+        Name => 'AFPointsSpecial',
+        Condition => '$$self{Model} =~ /K-1\b/',
+        Format => 'int8u[9]',
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03,0x03)',
+    },
+);
+
+# temperature information for some models - PH
+%Image::ExifTool::Pentax::TempInfo = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     NOTES => q{
         A number of additional temperature readings are extracted from this 256-byte
-        binary-data block in images from the K-5.  It is not currently known where
-        the corresponding temperature sensors are located in the camera.
+        binary-data block in images from models such as the K-01, K-3, K-5, K-50 and
+        K-500.  It is currently not known where the corresponding temperature
+        sensors are located in the camera.
     },
     # (it would be nice to know where these temperature sensors are located,
@@ -4085 +5553 @@
     #  more quickly than CameraTemperature when shooting video.)
     0x0c => {
-        Name => 'CameraTemperature2',
+        Name => 'SensorTemperature', #forum6677 (was CameraTemperature2)
         Format => 'int16s',
         ValueConv => '$val / 10',
@@ -4093 +5561 @@
     },
     0x0e => {
-        Name => 'CameraTemperature3',
+        Name => 'SensorTemperature2', #forum6677 (was CameraTemperature3)
         Format => 'int16s',
         ValueConv => '$val / 10',
@@ -4102 +5570 @@
     0x14 => {
         Name => 'CameraTemperature4',
+        Condition => '$$self{Model} =~ /K-5\b/',
         Format => 'int16s',
         PrintConv => '"$val C"',
@@ -4108 +5577 @@
     0x16 => { # usually the same as CameraTemperature4, but not always
         Name => 'CameraTemperature5',
+        Condition => '$$self{Model} =~ /K-5\b/',
         Format => 'int16s',
         PrintConv => '"$val C"',
         PrintConvInv => '$val=~s/ ?c$//i; $val',
     },
+    # 0x18,0x1a,0x1c,0x1e = int16u[4] BlackPoint - PH
 );
 
@@ -4221 +5692 @@
             1600 => 1600, #PH
             3200 => 3200, #PH
+            65534 => 'Auto 2', #PH (Q-S1 MOV) [how is this different from 65535?]
+            65535 => 'Auto', #PH (K-S1 MOV)
         },
     },
@@ -4271 +5744 @@
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     FIRST_ENTRY => 0,
-    NOTES => 'This information is found in Pentax MOV videos.',
+    NOTES => 'This information is found in MOV videos from cameras such as the Optio WP.',
     0x00 => {
         Name => 'Make',
@@ -4326 +5799 @@
             Start => 10,
             Base => '$start',
-            ByteOrder => 'BigEndian',
-        },
+            ByteOrder => 'Unknown', # K-70 is little-endian, K-x is big-endian
+        },
+    },
+    mknt => { # (Q-S1)
+        Name => 'MakerNotes',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Pentax::Main',
+            Start => 10,
+            Base => '$start',
+            ByteOrder => 'Unknown',
+        },
+    },
+);
+
+# Pentax metadata in S1 AVI maker notes (PH)
+%Image::ExifTool::Pentax::S1 = (
+    NOTES => 'Tags extracted from the maker notes of AVI videos from the Optio S1.',
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    0x0000 => { #5
+        Name => 'MakerNoteVersion',
+        Writable => 'undef',
+        Count => 4,
     },
 );
@@ -4338 +5831 @@
     0x0c => {
         Name => 'Model',
+        Description => 'Camera Model Name',
         Format => 'string[32]',
+    },
+);
+
+# PreviewImage information found in PXTH atom of K-01 MOV videos
+%Image::ExifTool::Pentax::PXTH = (
+    NOTES => 'Tags found in the PXTH atom of MOV videos from the K-01.',
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    0x00 => {
+        Name => 'PreviewImageLength',
+        Format => 'int32u',
+    },
+    0x04 => {
+        Name => 'PreviewImage',
+        Groups => { 2 => 'Preview' },
+        Format => 'undef[$val{0}]',
+        Notes => '640-pixel-wide JPEG preview', # (360 pixels high, may depend on aspect ratio)
+        RawConv => '$self->ValidateImage(\$val,$tag)',
+    },
+);
+
+# information in PENT atom of MOV videos from the Optio WG-2 GPS
+%Image::ExifTool::Pentax::PENT = (
+    NOTES => 'Tags found in the PENT atom of MOV videos from the Optio WG-2 GPS.',
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    0 => {
+        Name => 'Make',
+        Format => 'string[24]',
+    },
+    0x1a => {
+        Name => 'Model',
+        Description => 'Camera Model Name',
+        Format => 'string[24]',
+    },
+    0x38 => { #(NC)
+        Name => 'ExposureTime',
+        Format => 'int32u',
+        ValueConv => '$val ? 10 / $val : 0',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    0x3c => {
+        Name => 'FNumber',
+        Format => 'rational64u',
+        PrintConv => 'sprintf("%.1f",$val)',
+    },
+    0x44 => { #(NC)
+        Name => 'ExposureCompensation',
+        Format => 'rational64s',
+        PrintConv => '$val ? sprintf("%+.1f", $val) : 0',
+    },
+    0x54 => { #(NC)
+        Name => 'FocalLength',
+        Format => 'int32u',
+        PrintConv => '"$val mm"',
+    },
+    0x71 => {
+        Name => 'DateTime1',
+        Format => 'string[24]',
+        Groups => { 2 => 'Time' },
+    },
+    0x8b => {
+        Name => 'DateTime2',
+        Format => 'string[24]',
+        Groups => { 2 => 'Time' },
+    },
+    0xa7 => { #(NC)
+        Name => 'ISO',
+        Format => 'int32u',
+    },
+    0xc7 => {
+        Name => 'GPSVersionID',
+        Format => 'undef[8]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        DataMember => 'GPSVersionID',
+        RawConv => '$$self{GPSVersionID} = ($val=~s/GPS_// ? join(" ",unpack("C*",$val)) : undef)',
+        PrintConv => '$val =~ tr/ /./; $val',
+    },
+    0xcf => {
+        Name => 'GPSLatitudeRef',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'string[2]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        PrintConv => {
+            N => 'North',
+            S => 'South',
+        },
+    },
+    0xd1 => {
+        Name => 'GPSLatitude',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'rational64u[3]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
+        PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1)',
+    },
+    0xe9 => {
+        Name => 'GPSLongitudeRef',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'string[2]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        PrintConv => {
+            E => 'East',
+            W => 'West',
+        },
+    },
+    0xeb => {
+        Name => 'GPSLongitude',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'rational64u[3]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
+        PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1)',
+    },
+    0x103 => {
+        Name => 'GPSAltitudeRef',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'int8u',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        PrintConv => {
+            0 => 'Above Sea Level',
+            1 => 'Below Sea Level',
+        },
+    },
+    0x104 => {
+        Name => 'GPSAltitude',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'rational64u',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        PrintConv => '$val =~ /^(inf|undef)$/ ? $val : "$val m"',
+    },
+    0x11c => {
+        Name => 'GPSTimeStamp',
+        Condition => '$$self{GPSVersionID}',
+        Groups => { 1 => 'GPS', 2 => 'Time' },
+        Format => 'rational64u[3]',
+        ValueConv => 'Image::ExifTool::GPS::ConvertTimeStamp($val)',
+        PrintConv => 'Image::ExifTool::GPS::PrintTimeStamp($val)',
+    },
+    0x134 => {
+        Name => 'GPSSatellites',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'string[3]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+    },
+    0x137 => {
+        Name => 'GPSStatus',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'string[2]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        PrintConv => {
+            A => 'Measurement Active',
+            V => 'Measurement Void',
+        },
+    },
+    0x139 => {
+        Name => 'GPSMeasureMode',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'string[2]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+        PrintConv => {
+            2 => '2-Dimensional Measurement',
+            3 => '3-Dimensional Measurement',
+        },
+    },
+    0x13b => {
+        Name => 'GPSMapDatum',
+        Condition => '$$self{GPSVersionID}',
+        Format => 'string[7]',
+        Groups => { 1 => 'GPS', 2 => 'Location' },
+    },
+    0x142 => {
+        Name => 'GPSDateStamp',
+        Condition => '$$self{GPSVersionID}',
+        Groups => { 1 => 'GPS', 2 => 'Time' },
+        Format => 'string[11]',
+        ValueConv => 'Image::ExifTool::Exif::ExifDate($val)',
+    },
+    0x173 => { #(NC)
+        Name => 'AudioCodecID',
+        Format => 'string[4]',
+    },
+    0x7d3 => {
+        Name => 'PreviewImage',
+        Groups => { 2 => 'Preview' },
+        Format => 'undef[$size-0x7d3]',
+        Notes => '640x480 JPEG preview image', # (black borders pad to 480 pixels high)
+        RawConv => '$self->ValidateImage(\$val,$tag)',
+    },
+);
+
+# tags in Pentax Optio RZ18 AVI videos (ref PH)
+# (very similar to Olympus::AVI tags)
+%Image::ExifTool::Pentax::Junk2 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FIRST_ENTRY => 0,
+    NOTES => 'This information is found in AVI videos from the Optio RZ18.',
+    0x12 => {
+        Name => 'Make',
+        Format => 'string[24]',
+    },
+    0x2c => {
+        Name => 'Model',
+        Description => 'Camera Model Name',
+        Format => 'string[24]',
+    },
+    0x5e => {
+        Name => 'FNumber',
+        Format => 'rational64u',
+        PrintConv => 'sprintf("%.1f",$val)',
+    },
+    0x83 => {
+        Name => 'DateTime1',
+        Format => 'string[24]',
+        Groups => { 2 => 'Time' },
+    },
+    0x9d => {
+        Name => 'DateTime2',
+        Format => 'string[24]',
+        Groups => { 2 => 'Time' },
+    },
+    0x12b => {
+        Name => 'ThumbnailWidth',
+        Format => 'int16u',
+    },
+    0x12d => {
+        Name => 'ThumbnailHeight',
+        Format => 'int16u',
+    },
+    0x12f => {
+        Name => 'ThumbnailLength',
+        Format => 'int32u',
+    },
+    0x133 => {
+        Name => 'ThumbnailImage',
+        Groups => { 2 => 'Preview' },
+        Format => 'undef[$val{0x12f}]',
+        Notes => '160x120 JPEG thumbnail image',
+        RawConv => '$self->ValidateImage(\$val,$tag)',
     },
 );
@@ -4409 +6143 @@
 
 #------------------------------------------------------------------------------
+# Decode AF bit mask (ref 29)
+# Inputs: 0) raw binary value, 1) number of AF points, 2) number of bits per AF point,
+#         3) bit mask, 4) bit value (undef for any bit set)
+sub DecodeAFPoints($$$$;$)
+{
+    my ($val, $num, $bits, $mask, $bitVal) = @_;
+    my @bytes = split ' ', $val;
+    my $i = 1;  # (starts at AF point number 1)
+    my $shift = 8 - $bits;
+    my $byte = shift @bytes;
+    my @bitList;
+    for (;;) {
+        if ($bitVal) {
+            push @bitList, $i if (($byte >> $shift) & $mask) == $bitVal;
+        } else {
+            push @bitList, $i if ($byte >> $shift) & $mask;
+        }
+        last if ++$i > $num;
+        $shift -= $bits;
+        if ($shift < 0) {
+            last unless @bytes;
+            $byte = shift @bytes;
+            $shift += 8;
+        }
+    }
+    return join(',', @bitList);
+}
+
+#------------------------------------------------------------------------------
 # Convert Pentax hex-based EV (modulo 8) to real number
 # Inputs: 0) value to convert
-# ie) 0x00 -> 0
+# eg) 0x00 -> 0
 #     0x03 -> 0.33333
 #     0x04 -> 0.5
@@ -4456 +6219 @@
 sub CryptShutterCount($$)
 {
-    my ($val, $exifTool) = @_;
+    my ($val, $et) = @_;
     # Pentax Date and Time values are used in the encryption
-    return undef unless $$exifTool{PentaxDate} and $$exifTool{PentaxTime} and
-        length($$exifTool{PentaxDate})==4 and length($$exifTool{PentaxTime})>=3;
+    return undef unless $$et{PentaxDate} and $$et{PentaxTime} and
+        length($$et{PentaxDate})==4 and length($$et{PentaxTime})>=3;
     # get Date and Time as integers (after padding Time with a null byte)
-    my $date = unpack('N', $$exifTool{PentaxDate});
-    my $time = unpack('N', $$exifTool{PentaxTime} . "\0");
+    my $date = unpack('N', $$et{PentaxDate});
+    my $time = unpack('N', $$et{PentaxTime} . "\0");
     return $val ^ $date ^ (0xffffffff - $time);
 }
@@ -4488 +6251 @@
 I couldn't find a good source for Pentax maker notes information, but I've
 managed to discover a fair bit of information by analyzing sample images
-downloaded from the internet, and through tests with my own Optio WP,
-K10D, and K-5, and with help provided by other ExifTool users (see
+downloaded from the internet, and through tests with my own Optio S, Optio
+WP, K10D, K-01 and K-5, and with help provided by other ExifTool users (see
 L</ACKNOWLEDGEMENTS>).
 
@@ -4521 +6284 @@
 =head1 ACKNOWLEDGEMENTS
 
-Thanks to Wayne Smith, John Francis, Douglas O'Brien Cvetan Ivanov, Jens
-Duttke and Dave Nicholson for help figuring out some Pentax tags, Ger
-Vermeulen and Niels Kristian Bech Jensen for contributing print conversion
-values for some tags, and everyone who helped contribute to the LensType
-values.
+Thanks to Wayne Smith, John Francis, Douglas O'Brien, Cvetan Ivanov, Jens
+Duttke, Dave Nicholson, Iliah Borg, Klaus Homeister, Louis Granboulan and
+Andras Salamon for help figuring out some Pentax tags, Ger Vermeulen and
+Niels Kristian Bech Jensen for contributing print conversion values for some
+tags, and everyone who helped contribute to the LensType values.
 
 =head1 AUTHOR
 
-Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it