exiftool-vendored.pl 12.41.0 → 12.42.0

package/bin/Changes

@@ -4,9 +4,29 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.30. (Other versions are
+Note: The most recent production release is Version 12.42. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+June 1, 2022 - Version 12.42 (production release)
+
+  - Added support for reading maker notes from Panasonic DC-GH6 videos
+  - Added conversion for Samsung MCCData
+  - Added a new Nikon LensID (thanks Chris)
+  - Added a few new Canon LensType values
+  - Added a couple of new Olympus StackedImage values (thanks Eberhard)
+  - Added a few new values for some Nikon Settings tags (thanks Warren Hatch)
+  - Added a "lang:" element to the -json output for alternate language tags when
+    -D, -H or -t is used
+  - Update DNG writer to not issue an error when writing DNG 1.6 files
+  - Decode information from DJI "ae_dbg_info" maker notes
+  - Decode Olympus AISubjectTrackingMode
+  - Changed ExifTool FileSize print conversion to use kB/MB/GB units instead of
+    KiB/MiB/GiB
+  - Changed "is not shiftable" warning to appear in -v (instead of just -v3)
+    output
+  - Patched to allow PDF Encrypt object to be "null"
+  - Fixed bug reading ICC_Profile 'meta' tags
+
 Apr. 7, 2022 - Version 12.41
 
   - Added support for "OM SYSTEM" maker notes

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.41",
+   "version" : "12.42",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.41
+version: 12.42
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -107,8 +107,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.41.tar.gz | tar -xf -
-  cd Image-ExifTool-12.41
+  gzip -dc Image-ExifTool-12.42.tar.gz | tar -xf -
+  cd Image-ExifTool-12.42
   ./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.41';
+my $version = '12.42';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -2554,8 +2554,9 @@ TAG:    foreach $tag (@foundTags) {
                 if ($showTagID or $outFormat < 0) {
                     $val = { val => $val };
                     if ($showTagID) {
-                        my $id = $et->GetTagID($tag);
+                        my ($id, $lang) = $et->GetTagID($tag);
                         $id = sprintf('0x%.4x', $id) if $showTagID eq 'H' and $id =~ /^\d+$/;
+                        $$val{lang} = $lang if $lang;
                         $$val{id} = $id;
                     }
                     if ($tabFormat) {
@@ -5466,7 +5467,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.41 --
+    -- Generated by ExifTool 12.42 --
     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.57';
+$VERSION = '4.58';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -197,6 +197,7 @@ $VERSION = '4.57';
     44 => 'Canon EF 90-300mm f/4.5-5.6', #32
     45 => 'Canon EF-S 18-55mm f/3.5-5.6 [II]', #PH (same ID for version II, ref 20)
     46 => 'Canon EF 28-90mm f/4-5.6', #32
+  # 46 => 'Tamron 28-300mm f/3.5-6.3 Di VC PZD (A010)', # (also possibly?)
     47 => 'Zeiss Milvus 35mm f/2 or 50mm f/2', #IB
     47.1 => 'Zeiss Milvus 50mm f/2 Makro', #IB
     47.2 => 'Zeiss Milvus 135mm f/2 ZE', #IB
@@ -571,7 +572,9 @@ $VERSION = '4.57';
     61494 => 'Canon CN-E 85mm T1.3 L F', #PH
     61495 => 'Canon CN-E 135mm T2.2 L F', #PH
     61496 => 'Canon CN-E 35mm T1.5 L F', #PH
-    # see RFLensType tag for master list of 61182 RF lenses
+#
+# see RFLensType tag for master list of 61182 RF lenses
+#
     61182 => 'Canon RF 50mm F1.2L USM or other Canon RF Lens',
     61182.1 => 'Canon RF 24-105mm F4L IS USM',
     61182.2 => 'Canon RF 28-70mm F2L USM',
@@ -603,7 +606,12 @@ $VERSION = '4.57';
    '61182.28' => 'Canon RF 400mm F2.8L IS USM', #IB
    '61182.29' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
    '61182.30' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
-  #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
+   '61182.31' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+   # we need the RFLensType values for the following...
+   '61182.32' => 'Canon RF 800mm F5.6L IS USM', #PH (NC)
+   '61182.33' => 'Canon RF 1200mm F8L IS USM', #PH (NC)
+   '61182.34' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.35' => 'Canon RF 100mm F2.8L MACRO IS USM', #(NC)
     65535 => 'n/a',
 );
 
@@ -6804,6 +6812,7 @@ my %ciMaxFocal = (
             289 => 'Canon RF 400mm F2.8L IS USM', #IB
             290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
             291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
+            292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
            #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },

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

@@ -11,11 +11,14 @@ package Image::ExifTool::DJI;
 
 use strict;
 use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.04';
+$VERSION = '1.05';
+
+sub ProcessDJIInfo($$$);
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -44,6 +47,29 @@ my %convFloat2 = (
     0x0b => { Name => 'CameraRoll', Writable => 'float', %convFloat2 },
 );
 
+# DJI debug maker notes
+%Image::ExifTool::DJI::Info = (
+    PROCESS_PROC => \&ProcessDJIInfo,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Tags written by some DJI drones.',
+    VARS => { LONG_TAGS => 2 },
+    ae_dbg_info         => { Name => 'AEDebugInfo' },
+    ae_histogram_info   => { Name => 'AEHistogramInfo' },
+    ae_local_histogram  => { Name => 'AELocalHistogram' },
+    ae_liveview_histogram_info  => { Name => 'AELiveViewHistogramInfo' },
+    ae_liveview_local_histogram => { Name => 'AELiveViewLocalHistogram' },
+    awb_dbg_info        => { Name => 'AWBDebugInfo' },
+    af_dbg_info         => { Name => 'AFDebugInfo' },
+    hiso                => { Name => 'Histogram' },
+    xidiri              => { Name => 'Xidiri' },
+   'GimbalDegree(Y,P,R)'=> { Name => 'GimbalDegree' },
+   'FlightDegree(Y,P,R)'=> { Name => 'FlightDegree' },
+    adj_dbg_info        => { Name => 'ADJDebugInfo' },
+    sensor_id           => { Name => 'SensorID' },
+   'FlightSpeed(X,Y,Z)' => { Name => 'FlightSpeed' },
+    hyperlapse_dbg_info => { Name => 'HyperlapsDebugInfo' },
+);
+
 # thermal parameters in APP4 of DJI ZH20T images (ref forum11401)
 %Image::ExifTool::DJI::ThermalParams = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -134,6 +160,38 @@ my %convFloat2 = (
     },
 );
 
+#------------------------------------------------------------------------------
+# Process DJI infor (ref PH)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessDJIInfo($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dirStart = $$dirInfo{DirStart} || 0;
+    my $dirLen = $$dirInfo{DirLen} || (length($$dataPt) - $dirStart);
+    if ($dirStart) {
+        my $buff = substr($$dataPt, $dirStart, $dirLen);
+        $dataPt = \$buff;
+    }
+    while ($$dataPt =~ /\G\[(.*?)\](?=(\[|$))/sg) {
+        my ($tag, $val) = split /:/, $1, 2;
+        if ($val =~ /^([\x20-\x7f]+)\0*$/) {
+            $val = $1;
+        } else {
+            my $buff = $val;
+            $val = \$buff;
+        }
+        if (not $$tagTbl{$tag} and $tag=~ /^[-_a-zA-Z0-9]+$/) {
+            my $name = $tag;
+            $name =~ s/_([a-z])/_\U$1/g;
+            AddTagToTable($tagTbl, $tag, { Name => Image::ExifTool::MakeTagName($name) });
+        }
+        $et->HandleTag($tagTbl, $tag, $val);
+    }
+    return 1;
+}
+
 __END__
 
 =head1 NAME

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

@@ -680,8 +680,14 @@ sub ProcessAdobeMakN($$$)
     my $dataPos = $$dirInfo{DataPos};
     my $hdrLen = 6;
 
-    # hack for extra 12 bytes in MakN header of JPEG converted to DNG by Adobe Camera Raw
-    # (4 bytes "00 00 00 01" followed by 8 unknown bytes)
+    # 2018-09-27: hack for extra 12 bytes in MakN header of JPEG converted to DNG
+    # by Adobe Camera Raw (4 bytes "00 00 00 01" followed by 8 unknown bytes)
+    # - this is because CameraRaw copies the maker notes from the wrong location
+    #   in a JPG image (off by 12 bytes presumably due to the JPEG headers)
+    # - this hack won't work in most cases because the extra bytes are not consistent
+    #   since they are just the data that existed in the JPG before the maker notes
+    # - also, the last 12 bytes of the maker notes will be missing
+    # - 2022-04-26: this bug still exists in Camera Raw 14.3
     $hdrLen += 12 if $len >= 18 and substr($$dataPt, $start+6, 4) eq "\0\0\0\x01";
 
     my $dirStart = $start + $hdrLen;    # pointer to maker note directory

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

@@ -3397,6 +3397,15 @@ my %opcodeInfo = (
         },
         # the DJI FC2103 writes some interesting stuff here (with sections labelled
         # awb_dbg_info, ae_dbg_info, ae_histogram_info, af_dbg_info, hiso, xidiri) - PH
+        {
+            Name => 'MakerNoteDJIInfo',
+            Condition => '$$valPt =~ /^\[ae_dbg_info:/',
+            MakerNotes => 1,
+            Binary => 1,
+            WriteGroup => 'IFD0', # (for Validate)
+            SubDirectory => { TagTable => 'Image::ExifTool::DJI::Info' },
+            Format => 'undef',
+        },
         {
             Name => 'DNGPrivateData',
             Flags => [ 'Binary', 'Protected' ],

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/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/Nikon.pm

@@ -63,7 +63,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.05';
+$VERSION = '4.06';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -667,6 +667,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
@@ -8586,6 +8587,8 @@ my %nikonFocalConversions = (
             4 => 'Wide (L)',
             5 => '3D',
             6 => 'Auto',
+            12 => 'Wide (C1)',
+            13 => 'Wide (C2)',
         },
     },
     530 => { Name => 'VRMode',   PrintConv => \%vRModeZ9},
@@ -8656,6 +8659,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 => {

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 => 'Airplnes',
+            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

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

@@ -171,7 +171,7 @@ sub DecodeAFPoints($$$$;$);
     '3 255.4' => 'Sigma DF EX Aspherical 28-70mm F2.8', #12
     '3 255.5' => 'Sigma AF Tele 400mm F5.6 Multi-coated', #JD
     '3 255.6' => 'Sigma 24-60mm F2.8 EX DG', #PH
-    '3 255.7' => 'Sigma 70-300mm F4-5.6 Macro', #JD
+    '3 255.7' => 'Sigma 70-300mm F4-5.6 Macro', #JD (also DG Macro, ref 27)
     '3 255.8' => 'Sigma 55-200mm F4-5.6 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',

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

@@ -248,11 +248,12 @@ my %unicodeString = (
         Protected => 1,
         Notes => q{
             this tag indicates provides a way for XMP-aware applications to indicate
-            that the XMP is synchronized with the IPTC.  When writing, special values of
-            "new" and "old" represent the digests of the IPTC from the edited and
-            original files respectively, and are undefined if the IPTC does not exist in
-            the respective file.  Set this to "new" as an indication that the XMP is
-            synchronized with the IPTC
+            that the XMP is synchronized with the IPTC.  The MWG recommendation is to
+            ignore the XMP if IPTCDigest exists and doesn't match the CurrentIPTCDigest.
+            When writing, special values of "new" and "old" represent the digests of the
+            IPTC from the edited and original files respectively, and are undefined if
+            the IPTC does not exist in the respective file.  Set this to "new" as an
+            indication that the XMP is synchronized with the IPTC
         },
         # also note the 'new' feature requires that the IPTC comes before this tag is written
         ValueConv => 'unpack("H*", $val)',

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

@@ -22,7 +22,7 @@ use vars qw($VERSION %samsungLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.51';
+$VERSION = '1.52';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
@@ -1000,7 +1000,238 @@ my %formatMinMax = (
     '0x0a30' => { Name => 'EmbeddedVideoFile', Groups => { 2 => 'Video' }, Binary => 1 }, #forum7161
    # 0x0aa1-name - seen 'MCC_Data'
    # 0x0aa1 - seen '204','222','234','302','429'
-    '0x0aa1' => 'MCCData', # (unknown meaning)
+    '0x0aa1' => {
+        Name => 'MCCData',
+        Groups => { 2 => 'Location' },
+        PrintConv => {
+            202 => 'Greece',
+            204 => 'Netherlands',
+            206 => 'Belgium',
+            208 => 'France',
+            212 => 'Monaco',
+            213 => 'Andorra',
+            214 => 'Spain',
+            216 => 'Hungary',
+            218 => 'Bosnia & Herzegov.',
+            219 => 'Croatia',
+            220 => 'Serbia',
+            221 => 'Kosovo',
+            222 => 'Italy',
+            226 => 'Romania',
+            228 => 'Switzerland',
+            230 => 'Czech Rep.',
+            231 => 'Slovakia',
+            232 => 'Austria',
+            234 => 'United Kingdom',
+            235 => 'United Kingdom',
+            238 => 'Denmark',
+            240 => 'Sweden',
+            242 => 'Norway',
+            244 => 'Finland',
+            246 => 'Lithuania',
+            247 => 'Latvia',
+            248 => 'Estonia',
+            250 => 'Russian Federation',
+            255 => 'Ukraine',
+            257 => 'Belarus',
+            259 => 'Moldova',
+            260 => 'Poland',
+            262 => 'Germany',
+            266 => 'Gibraltar',
+            268 => 'Portugal',
+            270 => 'Luxembourg',
+            272 => 'Ireland',
+            274 => 'Iceland',
+            276 => 'Albania',
+            278 => 'Malta',
+            280 => 'Cyprus',
+            282 => 'Georgia',
+            283 => 'Armenia',
+            284 => 'Bulgaria',
+            286 => 'Turkey',
+            288 => 'Faroe Islands',
+            289 => 'Abkhazia',
+            290 => 'Greenland',
+            292 => 'San Marino',
+            293 => 'Slovenia',
+            294 => 'Macedonia',
+            295 => 'Liechtenstein',
+            297 => 'Montenegro',
+            302 => 'Canada',
+            308 => 'St. Pierre & Miquelon',
+            310 => 'United States / Guam',
+            311 => 'United States / Guam',
+            312 => 'United States',
+            316 => 'United States',
+            330 => 'Puerto Rico',
+            334 => 'Mexico',
+            338 => 'Jamaica',
+            340 => 'French Guiana / Guadeloupe / Martinique',
+            342 => 'Barbados',
+            344 => 'Antigua and Barbuda',
+            346 => 'Cayman Islands',
+            348 => 'British Virgin Islands',
+            350 => 'Bermuda',
+            352 => 'Grenada',
+            354 => 'Montserrat',
+            356 => 'Saint Kitts and Nevis',
+            358 => 'Saint Lucia',
+            360 => 'St. Vincent & Gren.',
+            362 => 'Bonaire, Sint Eustatius and Saba / Curacao / Netherlands Antilles',
+            363 => 'Aruba',
+            364 => 'Bahamas',
+            365 => 'Anguilla',
+            366 => 'Dominica',
+            368 => 'Cuba',
+            370 => 'Dominican Republic',
+            372 => 'Haiti',
+            374 => 'Trinidad and Tobago',
+            376 => 'Turks and Caicos Islands / US Virgin Islands',
+            400 => 'Azerbaijan',
+            401 => 'Kazakhstan',
+            402 => 'Bhutan',
+            404 => 'India',
+            405 => 'India',
+            410 => 'Pakistan',
+            412 => 'Afghanistan',
+            413 => 'Sri Lanka',
+            414 => 'Myanmar (Burma)',
+            415 => 'Lebanon',
+            416 => 'Jordan',
+            417 => 'Syrian Arab Republic',
+            418 => 'Iraq',
+            419 => 'Kuwait',
+            420 => 'Saudi Arabia',
+            421 => 'Yemen',
+            422 => 'Oman',
+            424 => 'United Arab Emirates',
+            425 => 'Israel / Palestinian Territory',
+            426 => 'Bahrain',
+            427 => 'Qatar',
+            428 => 'Mongolia',
+            429 => 'Nepal',
+            430 => 'United Arab Emirates',
+            431 => 'United Arab Emirates',
+            432 => 'Iran',
+            434 => 'Uzbekistan',
+            436 => 'Tajikistan',
+            437 => 'Kyrgyzstan',
+            438 => 'Turkmenistan',
+            440 => 'Japan',
+            441 => 'Japan',
+            450 => 'South Korea',
+            452 => 'Viet Nam',
+            454 => 'Hongkong, China',
+            455 => 'Macao, China',
+            456 => 'Cambodia',
+            457 => 'Laos P.D.R.',
+            460 => 'China',
+            466 => 'Taiwan',
+            467 => 'North Korea',
+            470 => 'Bangladesh',
+            472 => 'Maldives',
+            502 => 'Malaysia',
+            505 => 'Australia',
+            510 => 'Indonesia',
+            514 => 'Timor-Leste',
+            515 => 'Philippines',
+            520 => 'Thailand',
+            525 => 'Singapore',
+            528 => 'Brunei Darussalam',
+            530 => 'New Zealand',
+            537 => 'Papua New Guinea',
+            539 => 'Tonga',
+            540 => 'Solomon Islands',
+            541 => 'Vanuatu',
+            542 => 'Fiji',
+            544 => 'American Samoa',
+            545 => 'Kiribati',
+            546 => 'New Caledonia',
+            547 => 'French Polynesia',
+            548 => 'Cook Islands',
+            549 => 'Samoa',
+            550 => 'Micronesia',
+            552 => 'Palau',
+            553 => 'Tuvalu',
+            555 => 'Niue',
+            602 => 'Egypt',
+            603 => 'Algeria',
+            604 => 'Morocco',
+            605 => 'Tunisia',
+            606 => 'Libya',
+            607 => 'Gambia',
+            608 => 'Senegal',
+            609 => 'Mauritania',
+            610 => 'Mali',
+            611 => 'Guinea',
+            612 => 'Ivory Coast',
+            613 => 'Burkina Faso',
+            614 => 'Niger',
+            615 => 'Togo',
+            616 => 'Benin',
+            617 => 'Mauritius',
+            618 => 'Liberia',
+            619 => 'Sierra Leone',
+            620 => 'Ghana',
+            621 => 'Nigeria',
+            622 => 'Chad',
+            623 => 'Central African Rep.',
+            624 => 'Cameroon',
+            625 => 'Cape Verde',
+            626 => 'Sao Tome & Principe',
+            627 => 'Equatorial Guinea',
+            628 => 'Gabon',
+            629 => 'Congo, Republic',
+            630 => 'Congo, Dem. Rep.',
+            631 => 'Angola',
+            632 => 'Guinea-Bissau',
+            633 => 'Seychelles',
+            634 => 'Sudan',
+            635 => 'Rwanda',
+            636 => 'Ethiopia',
+            637 => 'Somalia',
+            638 => 'Djibouti',
+            639 => 'Kenya',
+            640 => 'Tanzania',
+            641 => 'Uganda',
+            642 => 'Burundi',
+            643 => 'Mozambique',
+            645 => 'Zambia',
+            646 => 'Madagascar',
+            647 => 'Reunion',
+            648 => 'Zimbabwe',
+            649 => 'Namibia',
+            650 => 'Malawi',
+            651 => 'Lesotho',
+            652 => 'Botswana',
+            653 => 'Swaziland',
+            654 => 'Comoros',
+            655 => 'South Africa',
+            657 => 'Eritrea',
+            659 => 'South Sudan',
+            702 => 'Belize',
+            704 => 'Guatemala',
+            706 => 'El Salvador',
+            708 => 'Honduras',
+            710 => 'Nicaragua',
+            712 => 'Costa Rica',
+            714 => 'Panama',
+            716 => 'Peru',
+            722 => 'Argentina Republic',
+            724 => 'Brazil',
+            730 => 'Chile',
+            732 => 'Colombia',
+            734 => 'Venezuela',
+            736 => 'Bolivia',
+            738 => 'Guyana',
+            740 => 'Ecuador',
+            744 => 'Paraguay',
+            746 => 'Suriname',
+            748 => 'Uruguay',
+            750 => 'Falkland Islands (Malvinas)',
+            901 => 'International Networks / Satellite Networks',
+        },
+    },
    # 0x0ab0-name - seen 'DualShot_Meta_Info'
     '0x0ab1-name' => {
         Name => 'DepthMapName',

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

@@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.66';
+$VERSION = '1.67';
 
 # this is a special table used to define command-line shortcuts
 # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm)
@@ -118,6 +118,7 @@ $VERSION = '1.66';
         'MakerNoteCasio',
         'MakerNoteCasio2',
         'MakerNoteDJI',
+        'MakerNoteDJIInfo',
         'MakerNoteFLIR',
         'MakerNoteFujiFilm',
         'MakerNoteGE',

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

@@ -894,6 +894,7 @@ my %tagLookup = (
 	'aiservosecondimagepriority' => { 84 => 0x51a },
 	'aiservotrackingmethod' => { 84 => 0x504 },
 	'aiservotrackingsensitivity' => { 83 => 0x14, 84 => 0x502 },
+	'aisubjecttrackingmode' => { 297 => 0x309 },
 	'album' => { 372 => ['albm',"\xa9alb"], 374 => 'album', 380 => ['albm',"\xa9alb"], 503 => 'album' },
 	'albumartist' => { 179 => 'WM/AlbumArtist', 372 => 'aART', 380 => 'albr' },
 	'albumcoverurl' => { 179 => 'WM/AlbumCoverURL' },
@@ -4024,6 +4025,7 @@ my %tagLookup = (
 	'makernotecasio' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotecasio2' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotedji' => { 117 => 'MakN', 119 => 0x927c },
+	'makernotedjiinfo' => { 117 => 'MakN', 119 => 0x927c },
 	'makernoteflir' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotefujifilm' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotege' => { 117 => 'MakN', 119 => 0x927c },
@@ -7123,6 +7125,7 @@ my %tagExists = (
 	'actualsoftpostpadding' => 1,
 	'actualsoftprepadding' => 1,
 	'additionalinfo' => 1,
+	'adjdebuginfo' => 1,
 	'adjustedtbnimageheight' => 1,
 	'adjustedtbnimagewidth' => 1,
 	'adobe_cm' => 1,
@@ -7142,11 +7145,16 @@ my %tagExists = (
 	'advancedscenemode' => 1,
 	'adventrevision' => 1,
 	'adventscale' => 1,
+	'aedebuginfo' => 1,
 	'aeflags' => 1,
+	'aehistograminfo' => 1,
 	'aeinfo' => 1,
 	'aeinfo2' => 1,
 	'aeinfo3' => 1,
 	'aeinfounknown' => 1,
+	'aeliveviewhistograminfo' => 1,
+	'aeliveviewlocalhistogram' => 1,
+	'aelocalhistogram' => 1,
 	'af-cprioritysel' => 1,
 	'af-sprioritysel' => 1,
 	'afarea' => 1,
@@ -7158,6 +7166,7 @@ my %tagExists = (
 	'afcp' => 1,
 	'afcp_iptc' => 1,
 	'afcsettings' => 1,
+	'afdebuginfo' => 1,
 	'aff1' => 1,
 	'aff5' => 1,
 	'affheader' => 1,
@@ -7400,6 +7409,7 @@ my %tagExists = (
 	'avi1' => 1,
 	'avif' => 1,
 	'aviheader' => 1,
+	'awbdebuginfo' => 1,
 	'awbinfo' => 1,
 	'axisdistancex' => 1,
 	'axisdistancey' => 1,
@@ -8100,6 +8110,7 @@ my %tagExists = (
 	'creatingapplication' => 1,
 	'creatingtransform' => 1,
 	'creationpathvector' => 1,
+	'creatorapp' => 1,
 	'creatorapplication' => 1,
 	'creatorappversion' => 1,
 	'creatoratom' => 1,
@@ -8817,6 +8828,8 @@ my %tagExists = (
 	'flashused' => 1,
 	'flashversion' => 1,
 	'flavor' => 1,
+	'flightdegree' => 1,
+	'flightspeed' => 1,
 	'flipstatus' => 1,
 	'flir' => 1,
 	'flir_gps' => 1,
@@ -8986,6 +8999,7 @@ my %tagExists = (
 	'gifplaintextextension' => 1,
 	'gifversion' => 1,
 	'gimage' => 1,
+	'gimbaldegree' => 1,
 	'gimbalpitch' => 1,
 	'gimbalroll' => 1,
 	'gimbalyaw' => 1,
@@ -9159,6 +9173,7 @@ my %tagExists = (
 	'huffmantablelength' => 1,
 	'huffmantablevalue' => 1,
 	'hyperfocaldistance' => 1,
+	'hyperlapsdebuginfo' => 1,
 	'hyperlinkbase' => 1,
 	'hyperlinks' => 1,
 	'hyperlinkschanged' => 1,
@@ -12093,6 +12108,7 @@ my %tagExists = (
 	'xcfversion' => 1,
 	'xclippathunits' => 1,
 	'xheight' => 1,
+	'xidiri' => 1,
 	'xmag' => 1,
 	'xmethod' => 1,
 	'xmldata' => 1,

package/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 25775 tags, with 16465 unique tag names.
+They contain a total of 25792 tags, with 16480 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -629,6 +629,7 @@ for the official EXIF 2.32 specification.
            MakerNoteCanon            ExifIFD    Canon
            MakerNoteCasio            ExifIFD    Casio
            MakerNoteCasio2           ExifIFD    Casio Type2
+           MakerNoteDJIInfo          ExifIFD    DJI Info
            MakerNoteDJI              ExifIFD    DJI
            MakerNoteFLIR             ExifIFD    FLIR
            MakerNoteFujiFilm         ExifIFD    FujiFilm
@@ -854,6 +855,7 @@ for the official EXIF 2.32 specification.
            MakerNotePentax           IFD0       Pentax
            MakerNotePentax5          IFD0       Pentax
            MakerNoteRicohPentax      IFD0       Pentax
+           MakerNoteDJIInfo          IFD0       DJI Info
            DNGPrivateData            IFD0       int8u!
   0xc635   MakerNoteSafety           IFD0       int16u
   0xc640   RawImageSegmentation      -          no
@@ -6755,6 +6757,7 @@ Metadata tags that exist.
 
   Tag Name                                      Writable
   --------                                      --------
+  CreatorApp                                    no
   ManufacturerName                              no
   MediaColor                                    no
   MediaWeight                                   no
@@ -10651,6 +10654,30 @@ These tags belong to the ExifTool XMP-drone-dji family 1 group.
   RtkStdLon                                     real
   SelfData                                      string
 
+=head3 DJI Info Tags
+
+Tags written by some DJI drones.
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'FlightDegree(Y,P,R)' FlightDegree            no
+  'FlightSpeed(X,Y,Z)' FlightSpeed              no
+  'GimbalDegree(Y,P,R)' GimbalDegree            no
+  'adj_dbg_info'       ADJDebugInfo             no
+  'ae_dbg_info'        AEDebugInfo              no
+  'ae_histogram_info'  AEHistogramInfo          no
+  'ae_liveview_histogram_info'
+                       AELiveViewHistogramInfo  no
+  'ae_liveview_local_histogram'
+                       AELiveViewLocalHistogram no
+  'ae_local_histogram' AELocalHistogram         no
+  'af_dbg_info'        AFDebugInfo              no
+  'awb_dbg_info'       AWBDebugInfo             no
+  'hiso'               Histogram                no
+  'hyperlapse_dbg_info' HyperlapsDebugInfo      no
+  'sensor_id'          SensorID                 no
+  'xidiri'             Xidiri                   no
+
 =head3 DJI ThermalParams Tags
 
 Thermal parameters extracted from APP4 of DJI RJPEG files from the ZH20T.
@@ -16641,6 +16668,7 @@ any information found here will be extracted, even if the tag is not listed.
   0x0306   AFFineTune                           int8u
   0x0307   AFFineTuneAdj                        int16s[3]
   0x0308   FocusBracketStepSize                 int8u
+  0x0309   AISubjectTrackingMode                int16u
   0x0400   FlashMode                            int16u
   0x0401   FlashExposureComp                    rational64s
   0x0403   FlashRemoteControl                   int16u
@@ -17432,29 +17460,30 @@ iPalm.
 Tags extracted from the PANA and LEIC user data found in MP4 videos from
 various Panasonic and Leica models.
 
-  Index1   Tag Name                             Writable
-  ------   --------                             --------
-      0    Make                                 no
-      4    Model                                no
-     12    Model                                no
-     16    JPEG-likeData                        EXIF
-     22    Model                                no
-     52    Version1                             no
-     62    Version2                             no
-     80    MakerNoteLeica5                      Panasonic Leica5
-     88    ThumbnailWidth                       no
-     90    ThumbnailHeight                      no
-     92    ThumbnailImage                       no
-   1334    ThumbnailWidth                       no
-   1338    ThumbnailHeight                      no
-   1342    ThumbnailLength                      no
-   1350    ThumbnailImage                       no
-   1358    ThumbnailWidth                       no
-   1362    ThumbnailHeight                      no
-   1366    ThumbnailLength                      no
-   1374    ThumbnailImage                       no
-  16488    ExifData                             EXIF
-  16512    ExifData                             EXIF
+  Index1       Tag Name                         Writable
+  ------       --------                         --------
+          0    Make                             no
+          4    Model                            no
+         12    Model                            no
+         16    JPEG-likeData                    EXIF
+         22    Model                            no
+         52    Version1                         no
+         62    Version2                         no
+         80    MakerNoteLeica5                  Panasonic Leica5
+         88    ThumbnailWidth                   no
+         90    ThumbnailHeight                  no
+         92    ThumbnailImage                   no
+       1334    ThumbnailWidth                   no
+       1338    ThumbnailHeight                  no
+       1342    ThumbnailLength                  no
+       1350    ThumbnailImage                   no
+       1358    ThumbnailWidth                   no
+       1362    ThumbnailHeight                  no
+       1366    ThumbnailLength                  no
+       1374    ThumbnailImage                   no
+      16488    ExifData                         EXIF
+      16512    ExifData                         EXIF
+  0x00200080   ExifData                         EXIF
 
 =head2 Pentax Tags
 
@@ -20955,6 +20984,7 @@ still proprietary) Adobe format.
            MakerNoteCanon                       Canon
            MakerNoteCasio                       Casio
            MakerNoteCasio2                      Casio Type2
+           MakerNoteDJIInfo                     DJI Info
            MakerNoteDJI                         DJI
            MakerNoteFLIR                        FLIR
            MakerNoteFujiFilm                    FujiFilm
@@ -26755,9 +26785,9 @@ ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, AIFF,
 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.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -37496,6 +37526,7 @@ for more details.
                        MakerNoteCasio
                        MakerNoteCasio2
                        MakerNoteDJI
+                       MakerNoteDJIInfo
                        MakerNoteFLIR
                        MakerNoteFujiFilm
                        MakerNoteGE

package/bin/lib/Image/ExifTool/Writer.pl

@@ -858,7 +858,7 @@ TAG: foreach $tagInfo (@matchingTags) {
                 ($shift or ($shiftable eq '0' and $options{DelValue})))
             {
                 $err = "$wgrp1:$tag is not shiftable";
-                $verbose > 2 and print $out "$err\n";
+                $verbose and print $out "$err\n";
                 next;
             }
         }

package/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars);
 
-$VERSION = '12.41';
+$VERSION = '12.42';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -5896,13 +5896,13 @@ sub GetUnixTime($;$)
 sub ConvertFileSize($)
 {
     my $val = shift;
-    $val < 2048 and return "$val bytes";
-    $val < 10240 and return sprintf('%.1f KiB', $val / 1024);
-    $val < 2097152 and return sprintf('%.0f KiB', $val / 1024);
-    $val < 10485760 and return sprintf('%.1f MiB', $val / 1048576);
-    $val < 2147483648 and return sprintf('%.0f MiB', $val / 1048576);
-    $val < 10737418240 and return sprintf('%.1f GiB', $val / 1073741824);
-    return sprintf('%.0f GiB', $val / 1073741824);
+    $val < 2000 and return "$val bytes";
+    $val < 10000 and return sprintf('%.1f kB', $val / 1000);
+    $val < 2000000 and return sprintf('%.0f kB', $val / 1000);
+    $val < 10000000 and return sprintf('%.1f MB', $val / 1000000);
+    $val < 2000000000 and return sprintf('%.0f MB', $val / 1000000);
+    $val < 10000000000 and return sprintf('%.1f GB', $val / 1000000000);
+    return sprintf('%.0f GB', $val / 1000000000);
 }
 
 #------------------------------------------------------------------------------
@@ -7686,8 +7686,8 @@ sub DoProcessTIFF($$;$)
     # check DNG version
     if ($$self{DNGVersion}) {
         my $ver = $$self{DNGVersion};
-        # currently support up to DNG version 1.5
-        unless ($ver =~ /^(\d+) (\d+)/ and "$1.$2" <= 1.5) {
+        # currently support up to DNG version 1.6
+        unless ($ver =~ /^(\d+) (\d+)/ and "$1.$2" <= 1.6) {
             $ver =~ tr/ /./;
             $self->Error("DNG Version $ver not yet tested", 1);
         }

package/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.41
+Version: 12.42
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

package/bin/pp_build_exe.args

@@ -21,10 +21,10 @@
 #           10) Copy zip archive to web servers.
 #           11) Update zip file version in link and text of html/index.html.
 #------------------------------------------------------------------------------
--T exiftool-12.41
-#--info=FileVersion=12.4.1.0
-#--info=ProductVersion=12.4.1.0
-##"--info=Build Date=2022:04:07 11:32:41-04:00"
+-T exiftool-12.42
+#--info=FileVersion=12.4.2.0
+#--info=ProductVersion=12.4.2.0
+##"--info=Build Date=2022:06:01 14:21:21-04:00"
 ##"--info=Bundled Perl Version=ActivePerl 5.24.0"
 ##"--info=LegalCopyright=Copyright (c) 2003-2022, Phil Harvey"
 ##"--info=ProductName=ExifTool"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiftool-vendored.pl",
-  "version": "12.41.0",
+  "version": "12.42.0",
   "description": "Vendored perl ExifTool for Node.js",
   "main": "./index.js",
   "homepage": "https://github.com/mceachen/exiftool-vendored.pl#readme",
@@ -42,8 +42,8 @@
     }
   },
   "devDependencies": {
-    "mocha": "^9.2.2",
-    "prettier": "^2.6.2",
+    "mocha": "^10.0.0",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2"
   }
 }