exiftool-vendored.pl 12.91.0 → 12.96.0

package/bin/Changes

@@ -7,10 +7,52 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.76. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Sept. 1, 2024 - Version 12.96
+
+  - More improvements to handling of trailers on video files (and add ability to
+    write videos which have an unknown trailer)
+  - Fixed problem geotagging from some newer Google Takeout files
+
+Aug. 30, 2024 - Version 12.95
+
+  - Added a couple of new CanonModelID values
+  - Decode ColorData for a couple of new Canon models
+  - Fixed problem writing video files which have some known trailer types
+
+Aug. 29, 2024 - Version 12.94
+
+  - Added ability to geotag from new-format Google Takeout JSON files
+  - Added a few new Android and Xiaomi QuickTime Keys tags
+  - Added ability to read C2PA JUMBF metadata from TTF/OTF files
+  - Internal changes to code for creating new directories
+  - Changed Windows packages to have the application help text file in the
+    exiftool_files folder instead of writing it to a temporary directory
+  - Removed new QuickTime Keys tags added in 12.93 because these aren't used in
+    top-level metadata (written to the video track by Apple devices)
+  - Fixed the group names for synthesized default-language QuickTime tags and
+    added a verbose message when generating these tags
+  - Fixed warning in Geolocation.t self test
+
+Aug. 20, 2024 - Version 12.93
+
+  - Added a new Nikon LensID
+  - Added a couple of new OpenEXR Compression types
+  - Added a couple of new QuickTime Keys tags
+  - Decode timed metadata from E-ACE B44 dashcam videos
+  - Made "Unrecognized" Samsung Meta warnings minor
+  - Fixed bug in -listg6 option which resulted in "uninitialized value" warnings
+  - Fixed decoding of Func1Button and Func2Button for the Nikon Z6/Z7
+  - Fixed bug reading JUMB metadata from JXL images
+
+July 24, 2024 - Version 12.92
+
+  - Removed -w from exiftool shebang due to compatibility issues on some systems
+
 July 24, 2024 - Version 12.91
 
-  - Fixed 2 test files that were causing failed tests (ExifTool itself is
-unchanged)
+  - Added a couple of new OpenEXR Compression values (github#276)
+  - Updated 2 test files that were causing failed tests (ExifTool itself is
+    unchanged)
 
 July 24, 2024 - Version 12.90
 
@@ -21,7 +63,7 @@ July 24, 2024 - Version 12.90
   - Drop Nikon ShotInfo record when copying MakerNotes from NEF to JPG if it is
     larger than 50000 bytes (then MakerNotes would be too large for a single
     JPEG segment)
-  - Changed exiftool shebang from "#!/usr/bin/perl" to "#!/usr/bin/env perl"
+  - Changed exiftool shebang to use env: "#!/usr/bin/env perl -w"
   - Revert change of 12.84 to iterate through sub-documents with the -p option
     only if -ee is used
 

package/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.91"
+   "version" : "12.96"
 }

package/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '12.91'
+version: '12.96'

package/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.91.tar.gz | tar -xf -
-  cd Image-ExifTool-12.91
+  gzip -dc Image-ExifTool-12.96.tar.gz | tar -xf -
+  cd Image-ExifTool-12.96
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.91';
+my $version = '12.96';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -232,10 +232,6 @@ my $stayOpen = 0;
 my $rtnValApp = 0;  # app return value (0=success)
 my $curTitle = '';  # current window title
 
-# lookup for O/S names which may use a backslash as a directory separator
-# (ref File::Spec of PathTools-3.2701)
-my %hasBackslash = ( MSWin32 => 1, os2 => 1, dos => 1, NetWare => 1, symbian => 1, cygwin => 1 );
-
 # lookup for O/S names which use CR/LF newlines
 my $isCRLF = { MSWin32 => 1, os2 => 1, dos => 1 }->{$^O};
 
@@ -1615,7 +1611,7 @@ if ($argFormat) {
 }
 
 # change to forward slashes if necessary in all filenames (like CleanFilename)
-if ($hasBackslash{$^O}) {
+if (Image::ExifTool::IsPC()) {
     tr/\\/\// foreach @files;
 }
 
@@ -3774,7 +3770,7 @@ sub DoSetFromFile($$$)
 # Returns: nothing, but changes filename if necessary
 sub CleanFilename($)
 {
-    $_[0] =~ tr/\\/\// if $hasBackslash{$^O};
+    $_[0] =~ tr/\\/\// if Image::ExifTool::IsPC();
 }
 
 #------------------------------------------------------------------------------
@@ -4097,7 +4093,7 @@ sub AbsPath($)
         $path = eval { Cwd::abs_path($file) };
         # make the delimiters and case consistent
         # (abs_path is very inconsistent about what it returns in Windows)
-        if (defined $path and $hasBackslash{$^O}) {
+        if (defined $path and Image::ExifTool::IsPC()) {
             $path =~ tr/\\/\//;
             $path = lc $path;
         }
@@ -4353,46 +4349,21 @@ sub NextUnusedFilename($;$)
 # Create directory for specified file
 # Inputs: 0) complete file name including path
 # Returns: true if a directory was created
-my $k32CreateDir;
 sub CreateDirectory($)
 {
     my $file = shift;
-    my ($dir, $created);
-    ($dir = $file) =~ s/[^\/]*$//;  # remove filename from path specification
-    if ($dir and not $mt->IsDirectory($dir)) {
-        my @parts = split /\//, $dir;
-        $dir = '';
-        foreach (@parts) {
-            $dir .= $_;
-            if (length $dir and not $mt->IsDirectory($dir) and
-                # don't try to create a network drive root directory
-                not ($hasBackslash{$^O} and $dir =~ m{^//[^/]*$}))
-            {
-                my $success;
-                # create directory since it doesn't exist
-                my $d2 = $dir; # (must make a copy in case EncodeFileName recodes it)
-                if ($mt->EncodeFileName($d2)) {
-                    # handle Windows Unicode directory names
-                    unless (eval { require Win32::API }) {
-                        Error('Install Win32::API to create directories with Unicode names');
-                        return 0;
-                    }
-                    unless ($k32CreateDir) {
-                        $k32CreateDir = Win32::API->new('KERNEL32', 'CreateDirectoryW', 'PP', 'I');
-                    }
-                    $success = $k32CreateDir->Call($d2, 0) if $k32CreateDir;
-                } else {
-                    $success = mkdir($d2, 0777);
-                }
-                $success or Error("Error creating directory $dir\n"), return 0;
-                $verbose and print $vout "Created directory $dir\n";
-                $created = 1;
-            }
-            $dir .= '/';
+    my $err = $mt->CreateDirectory($file);
+    if (defined $err) {
+        $err and Error("$err\n"), return 0;
+        if ($verbose) {
+            my $dir;
+            ($dir = $file) =~ s(/[^/]*$)();
+            print $vout "Created directory $dir\n";
         }
-        ++$countNewDir if $created;
+        ++$countNewDir;
+        return 1;
     }
-    return $created;
+    return 0;
 }
 
 #------------------------------------------------------------------------------
@@ -5684,7 +5655,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.91 --
+    -- Generated by ExifTool 12.96 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.79';
+$VERSION = '4.81';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -995,6 +995,8 @@ $VERSION = '4.79';
     0x80000481 => 'EOS R6 Mark II', #42
     0x80000487 => 'EOS R8', #42
     0x80000491 => 'PowerShot V10', #25
+    0x80000495 => 'EOS R1', #PH
+    0x80000496 => 'R5 Mark II', #forum16406
     0x80000498 => 'EOS R100', #25
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
@@ -1978,6 +1980,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Name => 'ColorData11',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData11' },
         },
+        {   # (int16u[4528]) - R1/R5mkII ref forum16406
+            Condition => '$count == 4528',
+            Name => 'ColorData12',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData12' },
+        },
         {
             Name => 'ColorDataUnknown',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorDataUnknown' },
@@ -8613,6 +8620,126 @@ my %ciMaxFocal = (
     },
 );
 
+# Color data (MakerNotes tag 0x4001, count=4528, ref PH)
+%Image::ExifTool::Canon::ColorData12 = (
+    %binaryDataAttrs,
+    NOTES => 'These tags are used by the EOS R1 and R5mkII',
+    FORMAT => 'int16s',
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 0 ],
+    IS_SUBDIR => [ 0x140 ],
+    0x00 => {
+        Name => 'ColorDataVersion',
+        DataMember => 'ColorDataVersion',
+        RawConv => '$$self{ColorDataVersion} = $val',
+        PrintConv => {
+            64 => '64 (R1, R5 Mark II)',
+        },
+    },
+    0x69 => { Name => 'WB_RGGBLevelsAsShot',    Format => 'int16s[4]' }, # (NC)
+    0x6d => 'ColorTempAsShot', # (NC)
+    0x6e => { Name => 'WB_RGGBLevelsDaylight',  Format => 'int16s[4]' },
+    0x72 => 'ColorTempDaylight',
+    0x73 => { Name => 'WB_RGGBLevelsShade',     Format => 'int16s[4]' },
+    0x77 => 'ColorTempShade',
+    0x78 => { Name => 'WB_RGGBLevelsCloudy',    Format => 'int16s[4]' },
+    0x7c => 'ColorTempCloudy',
+    0x7d => { Name => 'WB_RGGBLevelsTungsten',  Format => 'int16s[4]' },
+    0x81 => 'ColorTempTungsten',
+    0x82 => { Name => 'WB_RGGBLevelsFluorescent',Format=> 'int16s[4]' },
+    0x86 => 'ColorTempFluorescent' ,
+    0x87 => { Name => 'WB_RGGBLevelsFlash',     Format => 'int16s[4]' },
+    0x8b => 'ColorTempFlash',
+    0x8c => { Name => 'WB_RGGBLevelsUnknown2',  Format => 'int16s[4]', Unknown => 1 },
+    0x90 => { Name => 'ColorTempUnknown2', Unknown => 1 },
+    0x91 => { Name => 'WB_RGGBLevelsUnknown3',  Format => 'int16s[4]', Unknown => 1 },
+    0x95 => { Name => 'ColorTempUnknown3', Unknown => 1 },
+    0x96 => { Name => 'WB_RGGBLevelsUnknown4',  Format => 'int16s[4]', Unknown => 1 },
+    0x9a => { Name => 'ColorTempUnknown4', Unknown => 1 },
+    0x9b => { Name => 'WB_RGGBLevelsUnknown5',  Format => 'int16s[4]', Unknown => 1 },
+    0x9f => { Name => 'ColorTempUnknown5', Unknown => 1 },
+    0xa0 => { Name => 'WB_RGGBLevelsUnknown6',  Format => 'int16s[4]', Unknown => 1 },
+    0xa4 => { Name => 'ColorTempUnknown6', Unknown => 1 },
+    0xa5 => { Name => 'WB_RGGBLevelsUnknown7',  Format => 'int16s[4]', Unknown => 1 },
+    0xa9 => { Name => 'ColorTempUnknown7', Unknown => 1 },
+    0xaa => { Name => 'WB_RGGBLevelsUnknown8',  Format => 'int16s[4]', Unknown => 1 },
+    0xae => { Name => 'ColorTempUnknown8', Unknown => 1 },
+    0xaf => { Name => 'WB_RGGBLevelsUnknown9',  Format => 'int16s[4]', Unknown => 1 },
+    0xb3 => { Name => 'ColorTempUnknown9', Unknown => 1 },
+    0xb4 => { Name => 'WB_RGGBLevelsUnknown10', Format => 'int16s[4]', Unknown => 1 },
+    0xb8 => { Name => 'ColorTempUnknown10', Unknown => 1 },
+    0xb9 => { Name => 'WB_RGGBLevelsUnknown11', Format => 'int16s[4]', Unknown => 1 },
+    0xbd => { Name => 'ColorTempUnknown11', Unknown => 1 },
+    0xbe => { Name => 'WB_RGGBLevelsUnknown12', Format => 'int16s[4]', Unknown => 1 },
+    0xc2 => { Name => 'ColorTempUnknown12', Unknown => 1 },
+    0xc3 => { Name => 'WB_RGGBLevelsUnknown13', Format => 'int16s[4]', Unknown => 1 },
+    0xc7 => { Name => 'ColorTempUnknown13', Unknown => 1 },
+    0xc8 => { Name => 'WB_RGGBLevelsUnknown14', Format => 'int16s[4]', Unknown => 1 },
+    0xcc => { Name => 'ColorTempUnknown14', Unknown => 1 },
+    0xcd => { Name => 'WB_RGGBLevelsUnknown15', Format => 'int16s[4]', Unknown => 1 },
+    0xd1 => { Name => 'ColorTempUnknown15', Unknown => 1 },
+    0xd2 => { Name => 'WB_RGGBLevelsUnknown16', Format => 'int16s[4]', Unknown => 1 },
+    0xd6 => { Name => 'ColorTempUnknown16', Unknown => 1 },
+    0xd7 => { Name => 'WB_RGGBLevelsUnknown17', Format => 'int16s[4]', Unknown => 1 },
+    0xdb => { Name => 'ColorTempUnknown17', Unknown => 1 },
+    0xdc => { Name => 'WB_RGGBLevelsUnknown18', Format => 'int16s[4]', Unknown => 1 },
+    0xe0 => { Name => 'ColorTempUnknown18', Unknown => 1 },
+    0xe1 => { Name => 'WB_RGGBLevelsUnknown19', Format => 'int16s[4]', Unknown => 1 },
+    0xe5 => { Name => 'ColorTempUnknown19', Unknown => 1 },
+    0xe6 => { Name => 'WB_RGGBLevelsUnknown20', Format => 'int16s[4]', Unknown => 1 },
+    0xea => { Name => 'ColorTempUnknown20', Unknown => 1 },
+    0xeb => { Name => 'WB_RGGBLevelsUnknown21', Format => 'int16s[4]', Unknown => 1 },
+    0xef => { Name => 'ColorTempUnknown21', Unknown => 1 },
+    0xf0 => { Name => 'WB_RGGBLevelsUnknown22', Format => 'int16s[4]', Unknown => 1 },
+    0xf4 => { Name => 'ColorTempUnknown22', Unknown => 1 },
+    0xf5 => { Name => 'WB_RGGBLevelsUnknown23', Format => 'int16s[4]', Unknown => 1 },
+    0xf9 => { Name => 'ColorTempUnknown23', Unknown => 1 },
+    0xfa => { Name => 'WB_RGGBLevelsUnknown24', Format => 'int16s[4]', Unknown => 1 },
+    0xfe => { Name => 'ColorTempUnknown24', Unknown => 1 },
+    0xff => { Name => 'WB_RGGBLevelsUnknown25', Format => 'int16s[4]', Unknown => 1 },
+    0x103 => { Name => 'ColorTempUnknown25', Unknown => 1 },
+    0x104 => { Name => 'WB_RGGBLevelsUnknown26',Format => 'int16s[4]', Unknown => 1 },
+    0x108 => { Name => 'ColorTempUnknown26', Unknown => 1 },
+    0x109 => { Name => 'WB_RGGBLevelsUnknown27',Format => 'int16s[4]', Unknown => 1 },
+    0x10d => { Name => 'ColorTempUnknown27', Unknown => 1 },
+    0x10e => { Name => 'WB_RGGBLevelsUnknown28',Format => 'int16s[4]', Unknown => 1 },
+    0x112 => { Name => 'ColorTempUnknown28', Unknown => 1 },
+    0x113 => { Name => 'WB_RGGBLevelsUnknown29',Format => 'int16s[4]', Unknown => 1 },
+    0x117 => { Name => 'ColorTempUnknown29', Unknown => 1 },
+    0x118 => { Name => 'WB_RGGBLevelsUnknown30',Format => 'int16s[4]', Unknown => 1 },
+    0x11c => { Name => 'ColorTempUnknown30', Unknown => 1 },
+    0x11d => { Name => 'WB_RGGBLevelsUnknown31',Format => 'int16s[4]', Unknown => 1 },
+    0x121 => { Name => 'ColorTempUnknown31', Unknown => 1 },
+    0x122 => { Name => 'WB_RGGBLevelsUnknown32',Format => 'int16s[4]', Unknown => 1 },
+    0x126 => { Name => 'ColorTempUnknown32', Unknown => 1 },
+    0x127 => { Name => 'WB_RGGBLevelsUnknown33',Format => 'int16s[4]', Unknown => 1 },
+    0x12b => { Name => 'ColorTempUnknown33', Unknown => 1 },
+    0x140 => {
+        Name => 'ColorCalib',
+        Format => 'undef[120]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorCalib' }
+    },
+    0x17f => {
+        Name => 'PerChannelBlackLevel',
+        Format => 'int16u[4]',
+    },
+    0x294 => {
+        Name => 'NormalWhiteLevel',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+    },
+    0x295 => {
+        Name => 'SpecularWhiteLevel',
+        Format => 'int16u',
+    },
+    0x296 => {
+        Name => 'LinearityUpperMargin',
+        Format => 'int16u',
+    },
+);
+
 # Unknown color data (MakerNotes tag 0x4001)
 %Image::ExifTool::Canon::ColorDataUnknown = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -9199,14 +9326,19 @@ my %filterConv = (
         PrintConvInv => '$val=~s/\s*mm//;$val',
     },
     8 => {
-        Name => 'MinFocalLength',
+        Name => 'MinFocalLength2',
+        Notes => q{
+            these seem to be min/max focal length without teleconverter, as opposed to
+            MinFocalLength and MaxFocalLength which include the effect of a
+            teleconverter
+        }, #forum16309
         ValueConv => '$val / 10',
         ValueConvInv => 'int($val * 10 + 0.5)',
         PrintConv => '"$val mm"',
         PrintConvInv => '$val=~s/\s*mm//;$val',
     },
     9 => {
-        Name => 'MaxFocalLength',
+        Name => 'MaxFocalLength2',
         ValueConv => '$val / 10',
         ValueConvInv => 'int($val * 10 + 0.5)',
         PrintConv => '"$val mm"',

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %ttLang);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ProcessOTF($$);
 
@@ -189,6 +189,9 @@ my %ttCharset = (
     name => {
         SubDirectory => { TagTable => 'Image::ExifTool::Font::Name' },
     },
+    C2PA => {
+        SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main', Start => 20 },
+    },
     PFM  => {
         Name => 'PFMHeader',
         SubDirectory => { TagTable => 'Image::ExifTool::Font::PFM' },
@@ -389,10 +392,12 @@ sub ProcessOTF($$)
     $$et{INDENT} .= '| ';
     $et->VerboseDir('TrueType', $numTables) if $verbose;
 
+    my %processTag = ( name => 1, C2PA => 1 );  # tags to process (skip all others)
+
     for ($pos=0; $pos<$len; $pos+=16) {
-        # look for 'name' table
+        # look for tags to process
         my $tag = substr($tbl, $pos, 4);
-        next unless $tag eq 'name' or $verbose;
+        next unless $processTag{$tag} or $verbose;
         my $offset = Get32u(\$tbl, $pos + 8);
         my $size   = Get32u(\$tbl, $pos + 12);
         unless ($raf->Seek($offset+$base, 0) and $raf->Read($buff, $size) == $size) {
@@ -405,9 +410,15 @@ sub ProcessOTF($$)
                               $$et{INDENT}, $pos/16, $tag, $offset, $size);
             $et->VPrint(0, $str);
             $et->VerboseDump(\$buff, Addr => $offset) if $verbose > 2;
-            next unless $tag eq 'name';
+            next unless $processTag{$tag};
         }
         next unless $size >= 8;
+        unless ($tag eq 'name') {
+            my $tagTablePtr = GetTagTable('Image::ExifTool::Font::Main');
+            $et->HandleTag($tagTablePtr, $tag, undef, DataPt => \$buff, Size => length($buff));
+            next;
+        }
+        # process the 'name' tag
         my $entries = Get16u(\$buff, 2);
         my $recEnd = 6 + $entries * 12;
         if ($recEnd > $size) {

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

@@ -16,6 +16,7 @@
 #               2020/12/01 - PH Added ability to read DJI CSV log files
 #               2022/06/21 - PH Added ability to read Google Takeout JSON files
 #               2024/04/23 - PH Added ability to read more OpenTracks GPS tags
+#               2024/08/28 - PH Added support for new Google Takeout JSON format
 #
 # References:   1) http://www.topografix.com/GPX/1/1/
 #               2) http://www.gpsinformation.org/dale/nmea.htm#GSA
@@ -30,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.76';
+$VERSION = '1.78';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -151,7 +152,7 @@ sub LoadTrackLog($$;$)
     my ($raf, $from, $time, $isDate, $noDate, $noDateChanged, $lastDate, $dateFlarm);
     my ($nmeaStart, $fixSecs, @fixTimes, $lastFix, %nmea, @csvHeadings, $sortFixes);
     my ($canCut, $cutPDOP, $cutHDOP, $cutSats, $e0, $e1, @tmp, $trackFile, $trackTime);
-    my $scaleSpeed;
+    my ($scaleSpeed, $startTime);
 
     unless (eval { require Time::Local }) {
         return 'Geotag feature requires Time::Local installed';
@@ -318,10 +319,13 @@ sub LoadTrackLog($$;$)
                     }
                 }
                 next;
-            } elsif (/"(timelineObjects|placeVisit|activitySegment|latitudeE7)":/) {
+            } elsif (/"(timelineObjects|placeVisit|activitySegment|latitudeE7)"\s*:/) {
                 # Google Takeout JSON format
                 $format = 'JSON';
                 $sortFixes = 1; # (fixes are not all in order for this format)
+            } elsif (/"(durationMinutesOffsetFromStartTime|startTime)"\s*:/) {
+                $format = 'JSON';   # new Google Takeout JSON format (fixes seem to be in order)
+                $raf->Seek(0,0);    # rewind to start of file
             } else {
                 # search only first 50 lines of file for a valid fix
                 last if ++$skipped > 50;
@@ -558,14 +562,24 @@ DoneFix:    $isDate = 1;
             next;
         } elsif ($format eq 'JSON') {
             # Google Takeout JSON format
-            if (/"(latitudeE7|longitudeE7|latE7|lngE7|timestamp)":\s*"?(.*?)"?,?\s*[\x0d\x0a]/) {
+            if (/"(latitudeE7|longitudeE7|latE7|lngE7|timestamp|startTime|point|durationMinutesOffsetFromStartTime)"\s*:\s*"?(.*?)"?,?\s*[\x0d\x0a]/) {
                 if ($1 eq 'timestamp') {
                     $time = GetTime($2);
                     goto DoneFix if $time and $$fix{lat} and $$fix{lon};
+                } elsif ($1 eq 'startTime') { # (new format)
+                    $startTime = GetTime($2);
                 } elsif ($1 eq 'latitudeE7' or $1 eq 'latE7') {
                     $$fix{lat} = $2 * 1e-7;
-                } else {
+                } elsif ($1 eq 'longitudeE7' or $1 eq 'lngE7') {
                     $$fix{lon} = $2 * 1e-7;
+                } elsif ($1 eq 'point') { # (new format)
+                    my $point = $2;
+                    my @coords = $point =~ /[-+]?\d+\.\d+/g;
+                    @$fix{'lat','lon'} = @coords[0,1] if @coords == 2;
+                } elsif ($1 eq 'durationMinutesOffsetFromStartTime' and defined $startTime) { # (new format)
+                    $time = $startTime + $2 * 60;
+                    # note: this assumes that "point" comes first, which it does in my sample
+                    goto DoneFix if $time and $$fix{lat} and $$fix{lon};
                 }
             }
             next;

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.39';
+$VERSION = '1.40';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -1442,7 +1442,7 @@ sub ProcessBrotli($$$)
             }
         } elsif ($type eq 'jumb') {
             return undef if $isWriting; # (can't yet write JUMBF)
-            Image::ExifTool::ProcessJUMB($et, \%dirInfo, $tagTablePtr); # (untested)
+            Image::ExifTool::Jpeg2000::ProcessJUMB($et, \%dirInfo, $tagTablePtr); # (untested)
         }
         if ($isWriting) {
             return undef unless defined $dat;

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.36';
+$VERSION = '4.37';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -367,6 +367,7 @@ sub GetAFPointGrid($$;$);
     '02 46 37 37 25 25 02 00' => 'Sigma 24mm F2.8 Super Wide II Macro',
     '7E 54 37 37 0C 0C 4B 06' => 'Sigma 24mm F1.4 DG HSM | A', #30
     '26 58 3C 3C 14 14 1C 02' => 'Sigma 28mm F1.8 EX DG Aspherical Macro',
+    'BC 54 3C 3C 0C 0C 4B 46' => 'Sigma 28mm F1.4 DG HSM | A', #30
     '48 54 3E 3E 0C 0C 4B 06' => 'Sigma 30mm F1.4 EX DC HSM',
     'F8 54 3E 3E 0C 0C 4B 06' => 'Sigma 30mm F1.4 EX DC HSM', #JD
     '91 54 44 44 0C 0C 4B 06' => 'Sigma 35mm F1.4 DG HSM', #30

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

@@ -17,12 +17,57 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub ProcessNikonSettings($$$);
 
 my %enableDisable = ( 1 => 'Enable', 2 => 'Disable' );
 
+my %funcButtonZ6 = ( #forum16316
+    1 => 'AF-On or Subject Tracking', # (bug in 3.xx firmware?)
+    2 => 'AF Lock Only',
+    3 => 'AE Lock (hold)',
+    4 => 'AE Lock (reset on release)',
+    5 => 'AE Lock Only',
+    6 => 'AE/AF Lock',
+    7 => 'FV Lock',
+    8 => 'Flash Disable/Enable',
+    9 => 'Preview',
+    10 => 'Matrix Metering',
+    11 => 'Center-weighted Metering',
+    12 => 'Spot Metering',
+    13 => 'Highlight-weighted Metering',
+    14 => 'Bracketing Burst',
+    15 => 'Synchronized Release (Master)',
+    16 => 'Synchronized Release (Remote)',    # no settings map to 17 or 18
+    19 => '+NEF(RAW)',
+    20 => 'Framing Grid Display',
+  # 21 - missing
+    22 => 'Zoom On/Off',
+  # 23 - missing
+    24 => 'My Menu',
+    25 => 'My Menu Top Item',
+    26 => 'Playback',
+    27 => 'Protect',
+    28 => 'Image Area',
+    29 => 'Image Quality',
+    30 => 'White Balance',
+    31 => 'Picture Control',
+    32 => 'Active D-Lighting',
+    33 => 'Metering',
+    34 => 'Flash Mode',
+    35 => 'Focus Mode',
+    36 => 'Auto Bracketing',
+    37 => 'Multiple Exposure',
+    38 => 'HDR',
+    39 => 'Exposure Delay Mode',
+    40 => 'Shutter/Aperture Lock',
+    41 => 'Focus Peaking',
+    42 => 'Rating',
+    43 => 'Non-CPU Lens',
+    44 => 'None',
+);
+
 my %funcButtonZ7m2 = (
     1 => 'AF-On',
     2 => 'AF Lock Only',
@@ -1117,6 +1162,11 @@ my %infoZSeries = (
         Name => 'Func1Button',
         PrintConv => \%previewButtonD6,
         %infoD6,
+    },{ # CSf2-a (Z6)
+        Name => 'Func1Button',
+        Condition => '$$self{Model} =~ /^NIKON Z [67]\b/',
+        Notes => 'Z6 and Z7',
+        PrintConv => \%funcButtonZ6,
     },{ # CSf2-a (Z7_2)
         Name => 'Func1Button',
         PrintConv => \%funcButtonZ7m2,
@@ -1126,6 +1176,11 @@ my %infoZSeries = (
         Name => 'Func2Button',
         PrintConv => \%previewButtonD6,
         %infoD6,
+    },{ # CSf2-b (Z6)
+        Name => 'Func2Button',
+        Condition => '$$self{Model} =~ /^NIKON Z [67]\b/',
+        Notes => 'Z6 and Z7',
+        PrintConv => \%funcButtonZ6,
     },{ # CSf2-b (Z7_2)
         Name => 'Func2Button',
         PrintConv => \%funcButtonZ7m2,

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -91,6 +91,8 @@ my %formatType = (
             5 => 'PXR24',
             6 => 'B44',
             7 => 'B44A',
+            8 => 'DWAA', #github276
+            9 => 'DWAB', #github276
         },
     },
     dataWindow          => { },