exiftool-vendored.pl 12.41.0 → 12.44.0

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

@@ -14,6 +14,7 @@
 #               2019/07/02 - PH Added ability to read IMU CSV files
 #               2019/11/10 - PH Also write pitch to CameraElevationAngle
 #               2020/12/01 - PH Added ability to read DJI CSV log files
+#               2022/06/21 - PH Added ability to read Google Takeout JSON files
 #
 # References:   1) http://www.topografix.com/GPX/1/1/
 #               2) http://www.gpsinformation.org/dale/nmea.htm#GSA
@@ -28,7 +29,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.66';
+$VERSION = '1.68';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -133,7 +134,7 @@ sub LoadTrackLog($$;$)
     local ($_, $/, *EXIFTOOL_TRKFILE);
     my ($et, $val) = @_;
     my ($raf, $from, $time, $isDate, $noDate, $noDateChanged, $lastDate, $dateFlarm);
-    my ($nmeaStart, $fixSecs, @fixTimes, $lastFix, %nmea, @csvHeadings);
+    my ($nmeaStart, $fixSecs, @fixTimes, $lastFix, %nmea, @csvHeadings, $sortFixes);
     my ($canCut, $cutPDOP, $cutHDOP, $cutSats, $e0, $e1, @tmp, $trackFile, $trackTime);
 
     unless (eval { require Time::Local }) {
@@ -285,6 +286,10 @@ sub LoadTrackLog($$;$)
                     }
                 }
                 next;
+            } elsif (/"(timelineObjects|placeVisit|activitySegment|latitudeE7)":/) {
+                # Google Takeout JSON format
+                $format = 'JSON';
+                $sortFixes = 1; # (fixes are not all in order for this format)
             } else {
                 # search only first 50 lines of file for a valid fix
                 last if ++$skipped > 50;
@@ -506,6 +511,19 @@ DoneFix:    $isDate = 1;
                 goto DoneFix;
             }
             next;
+        } elsif ($format eq 'JSON') {
+            # Google Takeout JSON format
+            if (/"(latitudeE7|longitudeE7|latE7|lngE7|timestamp)":\s*"?(.*?)"?,?\s*[\x0d\x0a]/) {
+                if ($1 eq 'timestamp') {
+                    $time = GetTime($2);
+                    goto DoneFix if $time and $$fix{lat} and $$fix{lon};
+                } elsif ($1 eq 'latitudeE7' or $1 eq 'latE7') {
+                    $$fix{lat} = $2 * 1e-7;
+                } else {
+                    $$fix{lon} = $2 * 1e-7;
+                }
+            }
+            next;
         }
         my (%fix, $secs, $date, $nmea);
         if ($format eq 'NMEA') {
@@ -751,6 +769,8 @@ DoneFix:    $isDate = 1;
         $numPoints -= $cutHDOP;
         $numPoints -= $cutSats;
     }
+    # sort fixes if necessary
+    @fixTimes = sort { $a <=> $b } @fixTimes if $sortFixes;
     # mark first fix of the track
     while (@fixTimes) {
         $fix = $$points{$fixTimes[0]} or shift(@fixTimes), next;
@@ -1409,8 +1429,8 @@ This module is used by Image::ExifTool
 This module loads GPS track logs, interpolates to determine position based
 on time, and sets new GPS values for geotagging images.  Currently supported
 formats are GPX, NMEA RMC/GGA/GLL, KML, IGC, Garmin XML and TCX, Magellan
-PMGNTRK, Honeywell PTNTHPR, Winplus Beacon text, IMU CSV, DJI CSV, and
-Bramor gEO log files.
+PMGNTRK, Honeywell PTNTHPR, Bramor gEO, Winplus Beacon text, Google Takeout
+JSON, GPS/IMU CSV, DJI CSV, ExifTool CSV log files.
 
 Methods in this module should not be called directly.  Instead, the Geotag
 feature is accessed by writing the values of the ExifTool Geotag, Geosync

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

@@ -25,7 +25,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.38';
+$VERSION = '1.39';
 
 sub ProcessICC($$);
 sub ProcessICC_Profile($$$);
@@ -522,11 +522,11 @@ my %manuSig = ( #6
             prmg => 'Perceptual Reference Medium Gamut',
         },
     },
-    meta => { #5 (EVENTUALLY DECODE THIS ONCE WE HAVE A SAMPLE!!)
+    meta => { #5
         Name => 'Metadata',
         SubDirectory => {
             TagTable => 'Image::ExifTool::ICC_Profile::Metadata',
-            Validate => '$type eq "meta"',
+            Validate => '$type eq "dict"',
         },
     },
 
@@ -891,6 +891,7 @@ my %manuSig = ( #6
     ManufacturerName => { },
     MediaColor       => { },
     MediaWeight      => { },
+    CreatorApp       => { },
 );
 
 #------------------------------------------------------------------------------
@@ -1000,7 +1001,7 @@ sub FormatICCTag($$$)
 }
 
 #------------------------------------------------------------------------------
-# Process ICC metadata record (ref 5) (UNTESTED!)
+# Process ICC metadata record (ref 5)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessMetadata($$$)
@@ -1032,7 +1033,7 @@ sub ProcessMetadata($$$)
         my $namePtr = Get32u($dataPt, $entry);
         my $nameLen = Get32u($dataPt, $entry + 4);
         my $valuePtr = Get32u($dataPt, $entry + 8);
-        my $valueLen = Get32u($dataPt, $entry + 16);
+        my $valueLen = Get32u($dataPt, $entry + 12);
         next unless $namePtr and $valuePtr;   # ignore if offsets are zero
         if ($namePtr < $minPtr or $namePtr + $nameLen > $dirLen or
             $valuePtr < $minPtr or $valuePtr + $valueLen > $dirLen)
@@ -1040,8 +1041,8 @@ sub ProcessMetadata($$$)
             $et->Warn('Corrupted ICC meta dictionary');
             last;
         }
-        my $tag = substr($dataPt, $dirStart + $namePtr, $nameLen);
-        my $val = substr($dataPt, $dirStart + $valuePtr, $valueLen);
+        my $tag = substr($$dataPt, $dirStart + $namePtr, $nameLen);
+        my $val = substr($$dataPt, $dirStart + $valuePtr, $valueLen);
         $tag = $et->Decode($tag, 'UTF16', 'MM', 'UTF8');
         $val = $et->Decode($val, 'UTF16', 'MM');
         # generate tagInfo if it doesn't exist
@@ -1050,6 +1051,7 @@ sub ProcessMetadata($$$)
             $name =~ s/\s+(.)/\u$1/g;
             $name =~ tr/-_a-zA-Z0-9//dc;
             next unless length $name;
+            $et->VPrint(0, $$et{INDENT}, "[adding $tag]\n");
             AddTagToTable($tagTablePtr, $tag, { Name => $name });
         }
         $et->HandleTag($tagTablePtr, $tag, $val);
@@ -1312,7 +1314,7 @@ sub ProcessICC_Profile($$$)
                 DirName  => $name,
                 Parent   => $$dirInfo{DirName},
             );
-            my $type = substr($$dataPt, $valuePtr, 4);
+            my $type = $fmt;
             #### eval Validate ($type)
             if (defined $$subdir{Validate} and not eval $$subdir{Validate}) {
                 $et->Warn("Invalid ICC $name data");

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

@@ -6,7 +6,7 @@
 # Revisions:    09/12/2005 - P. Harvey Created
 #               09/08/2020 - PH Added Lyrics3 support
 #
-# References:   1) http://www.id3.org/
+# References:   1) http://www.id3.org/ (now https://id3.org)
 #               2) http://www.mp3-tech.org/
 #               3) http://www.fortunecity.com/underworld/sonic/3/id3tag.html
 #               4) https://id3.org/Lyrics3
@@ -76,9 +76,9 @@ my %dateTimeConv = (
         OGG, FLAC, APE, MPC and RealAudio files.  ID3v2 tags which support multiple
         languages (eg. Comment and Lyrics) are extracted by specifying the tag name,
         followed by a dash ('-'), then a 3-character ISO 639-2 language code (eg.
-        "Comment-spa"). See L<http://www.id3.org/> for the official ID3
-        specification and L<http://www.loc.gov/standards/iso639-2/php/code_list.php>
-        for a list of ISO 639-2 language codes.
+        "Comment-spa"). See L<https://id3.org/> for the official ID3 specification
+        and L<http://www.loc.gov/standards/iso639-2/php/code_list.php> for a list of
+        ISO 639-2 language codes.
     },
     ID3v1 => {
         Name => 'ID3v1',
@@ -1661,7 +1661,7 @@ under the same terms as Perl itself.
 
 =over 4
 
-=item L<http://www.id3.org/>
+=item L<https://id3.org/>
 
 =item L<http://www.mp3-tech.org/>
 

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -273,7 +273,9 @@ sub ProcessLinkInfo($$$);
             6 => 'Ram Disk',
         },
     },
-    DriveSerialNumber => { },
+    DriveSerialNumber => {
+        PrintConv => 'join("-", unpack("A4 A4", sprintf("%08X", $val)))',
+    },
     VolumeLabel => { },
     LocalBasePath => { },
     CommonNetworkRelLink => { },
@@ -508,6 +510,7 @@ sub ProcessLinkInfo($$$)
         if ($off + 0x20 <= $dataLen) {
             # my $len = Get32u($dataPt, $off);
             $et->HandleTag($tagTablePtr, 'DriveType', undef, %opts, Start=>$off+4);
+            $et->HandleTag($tagTablePtr, 'DriveSerialNumber', undef, %opts, Start=>$off+8);
             $pos = Get32u($dataPt, $off + 0x0c);
             if ($pos == 0x14) {
                 # use VolumeLabelOffsetUnicode instead

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

@@ -89,6 +89,11 @@ my $debug;          # set to 1 to enable debugging code
             FixBase => 1, # necessary for AVI and MOV videos
         },
     },
+    {
+        Name => 'MakerNoteDJIInfo',
+        Condition => '$$valPt =~ /^\[ae_dbg_info:/',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::Info' },
+    },
     {
         Name => 'MakerNoteDJI',
         Condition => '$$self{Make} eq "DJI" and $$valPt !~ /^...\@AMBA/s',

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 # Motorola makernotes tags (ref PH)
 %Image::ExifTool::Motorola::Main = (
@@ -54,7 +54,12 @@ $VERSION = '1.01';
     # 0x6400 - string: 'AUTO','ON','OFF'
     # 0x6401 - string: 'HDR'
     # 0x6410 - string: 'NO','YES'
-    # 0x6420 - int32s: 0 (only exists in HDR images?)
+    # 0x6420 - int32s for some models: 0 (only exists in HDR images?)
+    0x6420 => { #forum13731
+        Condition => '$format eq "string"',
+        Name => 'CustomRendered',
+        Writable => 'string',
+    },
     # 0x6430 - float
     # 0x6431 - int8u: 0,1
     # 0x6432 - int8u: 0,79,100
@@ -89,6 +94,7 @@ $VERSION = '1.01';
     # 0x64c2,0x64c3 - int32s
     # 0x64c4 - int32s
     # 0x64c5 - int32u
+    0x64d0 => { Name => 'DriveMode', Writable => 'string' }, #forum13731
     # 0x6500 - int8u: 1
     # 0x6501 - string: 'Luma-Chroma Plane','Chroma only' or int8u: 0
     # 0x6502 - string: 'Luma-Chroma Plane','Chroma only','' or int8u: 1,255

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

@@ -63,7 +63,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.05';
+$VERSION = '4.08';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -606,6 +606,7 @@ sub GetAFPointGrid($$;$);
     'CC 44 68 98 34 41 DF 0E' => 'Tamron 100-400mm f/4.5-6.3 Di VC USD', #30
     'EB 40 76 A6 38 40 DF 0E' => 'Tamron SP AF 150-600mm f/5-6.3 VC USD (A011)',
     'E3 40 76 A6 38 40 DF 4E' => 'Tamron SP 150-600mm f/5-6.3 Di VC USD G2', #30
+    'E3 40 76 A6 38 40 DF 0E' => 'Tamron SP 150-600mm f/5-6.3 Di VC USD G2 (A022)', #forum3833
     '20 3C 80 98 3D 3D 1E 02' => 'Tamron AF 200-400mm f/5.6 LD IF (75D)',
     '00 3E 80 A0 38 3F 00 02' => 'Tamron SP AF 200-500mm f/5-6.3 Di LD (IF) (A08)',
     '00 3F 80 A0 38 3F 00 02' => 'Tamron SP AF 200-500mm f/5-6.3 Di (A08)',
@@ -667,6 +668,7 @@ sub GetAFPointGrid($$;$);
     '00 54 55 55 0C 0C 00 00' => 'Voigtlander Nokton 58mm F1.4 SLII',
     '00 40 64 64 2C 2C 00 00' => 'Voigtlander APO-Lanthar 90mm F3.5 SLII Close Focus',
     '07 40 30 45 2D 35 03 02.2' => 'Voigtlander Ultragon 19-35mm F3.5-4.5 VMV', #NJ
+    '71 48 64 64 24 24 00 00' => 'Voigtlander APO-Skopar 90mm F2.8 SL IIs', #30
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
@@ -2079,7 +2081,7 @@ my %base64coord = (
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ9',
                 DecryptStart => 4,
                 # TODO: eventually set the length dynamically according to actual offsets!
-                DecryptLen => 0xec4b + 1646,  # decoded thru end of CustomSettingZ9 in Offset26 (+MenuSettingsZ9Offset)
+                DecryptLen => 0xec4b + 1907,  # decoded thru end of Offset26 
                 ByteOrder => 'LittleEndian',
             },
         },
@@ -4025,7 +4027,7 @@ my %base64coord = (
         },
         Format => 'int16u',
     },
-    0x2f => { #28 (Z7)   Still photography range 1-17 for the 493 point Z7 (arranged in a 29x17 grid. Center at x=16, y=10).
+    0x2f => { #28 (Z7) Still photography range 1-17 for the 493 point Z7 (arranged in a 29x17 grid. Center at x=16, y=10).
         Name => 'AFFocusPointXPosition',
         Condition => q{
             $$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/ or
@@ -4193,11 +4195,19 @@ my %base64coord = (
     },
     0x43 => {
         Name => 'FocusPositionHorizontal',
-        PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 29 ); },    #493 focus points for Z9 fall in a 30x18 grid (some coordinates are not accessible)
+        Notes => q{
+            the focus points form a 29x17 grid, but the X,Y coordinate values run from 1,1
+            to 30,19.  The horizontal coordinate 11R (5) and the vertical coordinates 6U
+            (4) and 2D (12) are not used for some reason
+        },
+        # 493 focus points for Z9 fall in a 30x19 grid
+        # (the 11R (5) position is not used, for a total of 29 columns, ref AlbertShan email)
+        PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 29); },
     },
     0x45 => {
         Name => 'FocusPositionVertical',
-        PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 17 ); },
+        # (the 6U (4) and 2D (12) are not used, for a total of 17 rows, ref AlbertShan email)
+        PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 17); },
     },
     0x46 => {
         Name => 'AFAreaWidth',
@@ -4857,7 +4867,7 @@ my %nikonFocalConversions = (
     %binaryDataAttrs,
     NOTES => 'Tags found in the encrypted LensData from cameras such as the Z6 and Z7.',
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    DATAMEMBER => [ 0x03, 0x2f ],
+    DATAMEMBER => [ 0x03, 0x2f, 0x35, 0x4c, 0x56 ],
     0x00 => {
         Name => 'LensDataVersion',
         Format => 'string[4]',
@@ -4883,12 +4893,12 @@ my %nikonFocalConversions = (
         %nikonApertureConversions,
     },
     # --> another extra byte at position 0x08 in this version of LensData (PH)
-    0x09 => {
-        Name => 'FocusPosition',
-        Condition => '$$self{OldLensData}',
-        PrintConv => 'sprintf("0x%02x", $val)',
-        PrintConvInv => '$val',
-    },
+    #0x09 => {
+    #    Name => 'FocusPosition',                         #28 - this appears to be copied from an older version of LensData and is no longer valid.  Text with Z9 and Z7_2 with a variety of lenses
+    #    Condition => '$$self{OldLensData}',
+    #    PrintConv => 'sprintf("0x%02x", $val)',
+    #    PrintConvInv => '$val',
+    #},
     0x0b => {
         Notes => 'this focus distance is approximate, and not very accurate for some lenses',
         Name => 'FocusDistance',
@@ -4947,7 +4957,8 @@ my %nikonFocalConversions = (
         %nikonApertureConversions,
     },
 #
-# ---- new LensData tags used by Nikkor Z lenses ---- (ref PH)
+# ---- new LensData tags used by Nikkor Z cameras (ref PH/28). ----
+# (some fields are strictly for Z-series lenses, others apply to legacy F-mount as well, ref 28)
 #
     0x2f => { # look forward to see if new lens data exists...
         Name => 'NewLensData',
@@ -4955,7 +4966,7 @@ my %nikonFocalConversions = (
         RawConv => '$$self{NewLensData} = 1 unless $val =~ /^.\0+$/s; undef',
         Hidden => 1,
     },
-    0x30 => {
+    0x30 => { #PH
         Name => 'LensID',
         Condition => '$$self{NewLensData}',
         Notes => 'tags from here onward used for Nikkor Z lenses only',
@@ -4981,9 +4992,22 @@ my %nikonFocalConversions = (
             27 => 'Nikkor Z MC 50mm f/2.8', #IB
             28 => 'Nikkor Z 100-400mm f/4.5-5.6 VR S', #28
             29 => 'Nikkor Z 28mm f/2.8', #IB
+            30 => 'Nikkor Z 400mm f/2.8 TC VR S',   #28
+            31 => 'Nikkor Z 24-120 f/4',   #28     
+            32 => 'Nikkor Z 800mm f/6.3 VR S',  #28
         },
     },
-    0x36 => {
+    0x35 => { #28
+        Name => 'LensMountType',
+        RawConv => '$$self{LensMountType} = $val',   #  0=> DSLR lens via FTZ style adapter;   1=> Native Z lens;
+        Format => 'int8u',
+        Unknown => 1,
+        PrintConv => {
+             0 => 'F-mount Lens',
+             1 => 'Z-mount Lens',
+         },
+    },
+    0x36 => { #PH
         Name => 'MaxAperture',
         Condition => '$$self{NewLensData}',
         Format => 'int16u',
@@ -4993,7 +5017,7 @@ my %nikonFocalConversions = (
         PrintConv => 'sprintf("%.1f",$val)',
         PrintConvInv => '$val',
     },
-    0x38 => {
+    0x38 => { #PH
         Name => 'FNumber',
         Condition => '$$self{NewLensData}',
         Format => 'int16u',
@@ -5003,7 +5027,7 @@ my %nikonFocalConversions = (
         PrintConv => 'sprintf("%.1f",$val)',
         PrintConvInv => '$val',
     },
-    0x3c => {
+    0x3c => { #PH
         Name => 'FocalLength',
         Condition => '$$self{NewLensData}',
         Format => 'int16u',
@@ -5011,14 +5035,36 @@ my %nikonFocalConversions = (
         PrintConv => '"$val mm"',
         PrintConvInv => '$val=~s/\s*mm$//;$val',
     },
-    0x4f => {
-        Name => 'FocusDistance',
-        Condition => '$$self{NewLensData}',
-        # (perhaps int16u Format? -- although upper byte would always be zero)
+    0x4c => { #28
+        Name => 'FocusDistanceRangeWidth',     #reflects the number of discrete absolute lens positions that are mapped to the reported FocusDistance.  Will be 1 near CFD reflecting very narrow focus distance bands (i.e., quite accurate).  Near Infinity will be something like 32.  Note: 0 at infinity.
+        Format => 'int8u',
+        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',  
+        RawConv => '$$self{FocusDistanceRangeWidth} = $val',
+        Unknown => 1,
+    },
+    0x4e => { #28
+        Name => 'FocusDistance', 
+        Format => 'int16u',
+        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',  
+        RawConv => '$val = $val/256',  # 1st byte is the fractional component.  This byte was not previously considered in the legacy calculation (which only used the 2nd byte).  When 2nd byte < 80; distance is < 1 meter
         ValueConv => '0.01 * 10**($val/40)', # in m
         ValueConvInv => '$val>0 ? 40*log($val*100)/log(10) : 0',
-        PrintConv => '$val ? sprintf("%.2f m",$val) : "inf"',
-        PrintConvInv => '$val eq "inf" ? 0 : $val =~ s/\s*m$//, $val',
+        PrintConv => q{
+            $$self{FocusDistanceRangeWidth} == 0 ? "Inf" : $val < 1 ? $val < 0.35 ? sprintf("%.4f m", $val): sprintf("%.3f m", $val): sprintf("%.2f m", $val),    #distances less than 35mm are quite accurate with increasingly less precision past 1m       
+        },
+    },
+    0x56 => { #28
+        Name => 'LensDriveEnd',     # byte contains: 1 at CFD/MOD; 2 at Infinity; 0 otherwise
+        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',  
+        Format => 'int8u',
+        RawConv => 'unless ($$self{FocusDistanceRangeWidth} == 0 ) { if ($val == 0 ) {$$self{LensDriveEnd} = "No"} else { $$self{LensDriveEnd} = "CFD"}; } else{ $$self{LensDriveEnd} = "Inf"}',
+        Unknown => 1,
+    },
+    0x5a => { #28
+        Name => 'LensPositionAbsolute',    # <=0 at infinity.  Typical value at CFD might be 58000.   Only valid for Z-mount lenses.
+        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',      
+        Format => 'int32s',
+        Unknown => 1,
     },
 );
 
@@ -8586,6 +8632,8 @@ my %nikonFocalConversions = (
             4 => 'Wide (L)',
             5 => '3D',
             6 => 'Auto',
+            12 => 'Wide (C1)',
+            13 => 'Wide (C2)',
         },
     },
     530 => { Name => 'VRMode',   PrintConv => \%vRModeZ9},
@@ -8656,6 +8704,8 @@ my %nikonFocalConversions = (
             2 => 'H.265 8-bit (MOV)',
             3 => 'H.265 10-bit (MOV)',
             4 => 'ProRes 422 HQ 10-bit (MOV)',
+            5 => 'ProRes RAW HQ 12-bit (MOV)',
+            6 => 'NRAW 12-bit (NEV)'
         },
     },
     616 => {
@@ -8739,13 +8789,18 @@ my %nikonFocalConversions = (
             6 => '+08:00 (Beijing, Honk Kong, Sinapore)',
             10 => '+05:45 (Kathmandu)',
             11 => '+05:30 (New Dehli)',
+            12 => '+05:00 (Islamabad)',
+            13 => '+04:30 (Kabul)',
+            14 => '+04:00 (Abu Dhabi)',
+            15 => '+03:30 (Tehran)',
             16 => '+03:00 (Moscow, Nairobi)',
-            15 => '+02:00 (Athens)',
-            16 => '+01:00 (Madrid, Paris, Berlin)',
             17 => '+02:00 (Athens, Helsinki)',
-            18 => '+00:00 (London)',
-            19 => '+00:00', #PH (unknown city)
+            18 => '+01:00 (Madrid, Paris, Berlin)',
+            19 => '+00:00 (London)', 
+            20 => '-01:00 (Azores)', 
+            21 => '-02:00 (Fernando de Noronha)', 
             22 => '-03:00 (Buenos Aires, Sao Paulo)',
+            23 => '-03:30 (Newfoundland)',
             24 => '-04:00 (Manaus, Caracas)',
             25 => '-05:00 (New York, Toronto, Lima)',
             26 => '-06:00 (Chicago, Mexico City)',
@@ -11311,7 +11366,7 @@ sub PrintAFPointsGridInv($$$)
 #------------------------------------------------------------------------------
 # Print conversion for relative Left/Right AF points (ref 28)
 # Inputs: 0) column, 1) number of columns
-# Returns: AF point data as a string (e.g. '2L' or 'C' or '3R')
+# Returns: AF point data as a string (e.g. '2L of Center' or 'C' or '3R of Center')
 sub PrintAFPointsLeftRight($$)
 {
     my ($col, $ncol) = @_;
@@ -11324,7 +11379,7 @@ sub PrintAFPointsLeftRight($$)
 #------------------------------------------------------------------------------
 # Print conversion for relative Up/Down AF points (ref 28)
 # Inputs: 0) row, 1) number of rows
-# Returns: AF point data as a string (e.g. '2U' or 'C' or '3D')
+# Returns: AF point data as a string (e.g. '2U from Center' or 'C' or '3D from Center')
 sub PrintAFPointsUpDown($$)
 {
     my ($row, $nrow) = @_;

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

@@ -15,7 +15,7 @@ package Image::ExifTool::NikonCustom;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.19';
+$VERSION = '1.20';
 
 my %buttonsZ9= (
     0 => 'None',
@@ -74,6 +74,9 @@ my %buttonsZ9= (
     82 => 'Select To Send (PC)',
     83 => 'Select To Send (FTP)',
     85 => 'Control Lock',
+    86 => 'Save Focus Position',
+    87 => 'Recall Focus Position',
+    88 => 'Recall Shooting Functions (Hold)',
 );
 my %dialsZ9 = (
     0 => '1 Frame',

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.77';
+$VERSION = '2.78';
 
 sub PrintLensInfo($$$);
 
@@ -1911,6 +1911,23 @@ my %indexInfo = (
         Name => 'FocusBracketStepSize',
         Writable => 'int8u',
     },
+    0x309 => { #forum13341
+        Name => 'AISubjectTrackingMode',
+        Writable => 'int16u',
+        ValueConv => '($val >> 8) . " " . ($val & 0xff)',
+        ValueConvInv => 'my @a = split " ", $val; $val = $a[0]*256 + $a[1]',
+        PrintConv => [{
+            0 => 'Off',
+            1 => 'Motorsports',
+            2 => 'Airplanes',
+            3 => 'Trains',
+            4 => 'Birds',
+            5 => 'Dogs & Cats',
+        },{
+            0 => 'Object Not Found',
+            1 => 'Object Found',
+        }],
+    },
     0x400 => { #6
         Name => 'FlashMode',
         Writable => 'int16u',
@@ -2538,11 +2555,13 @@ my %indexInfo = (
             '3 8' => 'ND8 (3EV)', #IB
             '3 16' => 'ND16 (4EV)', #IB
             '3 32' => 'ND32 (5EV)', #IB
+            '3 64' => 'ND64 (6EV)', #forum13341
             '5 4' => 'HDR1', #forum8906
             '6 4' => 'HDR2', #forum8906
             '8 8' => 'Tripod high resolution', #IB
             '9 *' => 'Focus-stacked (* images)', #IB (* = 2-15)
-            '11 16' => 'Hand-held high resolution', #IB (perhaps '11 15' would be possible, ref 24)
+            '11 12' => 'Hand-held high resolution (11 12)', #forum13341 (OM-1)
+            '11 16' => 'Hand-held high resolution (11 16)', #IB (perhaps '11 15' would be possible, ref 24)
             OTHER => sub {
                 my ($val, $inv, $conv) = @_;
                 if ($inv) {

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.54';
+$VERSION = '1.55';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -2276,6 +2276,7 @@ XRef:
         # load XRef stream in hybrid file if it exists
         push @xrefOffsets, $$mainDict{XRefStm}, 'XRefStm' if $$mainDict{XRefStm};
         $encrypt = $$mainDict{Encrypt} if $$mainDict{Encrypt};
+        undef $encrypt if $encrypt and $encrypt eq 'null'; # (have seen "null")
         if ($$mainDict{ID} and ref $$mainDict{ID} eq 'ARRAY') {
             $id = ReadPDFValue($mainDict->{ID}->[0]);
         }

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

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.16';
+$VERSION = '2.17';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -2472,6 +2472,15 @@ my %shootingMode = (
             Start => 12,
         },
     },
+    0x200080 => { # (GH6)
+        Name => 'ExifData',
+        Condition => '$$valPt =~ /^\xff\xd8\xff\xe1..Exif\0\0/s',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+            Start => 12,
+        },
+    },
 );
 
 # Panasonic Composite tags