exiftool-vendored.pl 12.39.0 → 12.42.0

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.55';
+$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.55';
     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
@@ -208,6 +209,7 @@ $VERSION = '4.55';
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
     54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
     60 => 'Irix 11mm f/4', #50
+    63 => 'Irix 30mm F1.4 Dragonfly', #IB
     80 => 'Canon TS-E 50mm f/2.8L Macro', #42
     81 => 'Canon TS-E 90mm f/2.8L Macro', #42
     82 => 'Canon TS-E 135mm f/4L Macro', #42
@@ -570,7 +572,9 @@ $VERSION = '4.55';
     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',
@@ -599,7 +603,15 @@ $VERSION = '4.55';
    '61182.25' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
    '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
    '61182.27' => 'Canon RF 16mm F2.8 STM', #42
-  #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
+   '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.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',
 );
 
@@ -970,8 +982,8 @@ my %canonQuality = (
     4 => 'RAW',
     5 => 'Superfine',
     7 => 'CRAW', #42
-    130 => 'Normal Movie', #22
-    131 => 'Movie (2)', #PH (7DmkII 1920x1080)
+    130 => 'Light (RAW)', #github#119
+    131 => 'Standard (RAW)', #github#119
 );
 my %canonImageSize = (
    -1 => 'n/a',
@@ -1018,7 +1030,7 @@ my %canonWhiteBalance = (
     20 => 'PC Set4', #PH
     21 => 'PC Set5', #PH
     # 22 - Custom 2?
-    23 => 'Auto (ambience priority)', #PH (5DS)
+    23 => 'Auto (ambience priority)', #PH (5DS) (perhaps this needs re-thinking?: forum13295)
     # 30 - Click White Balance?
     # 31 - Shot Settings?
     # 137 - Tungsten?
@@ -2053,6 +2065,13 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             TagTable => 'Image::ExifTool::Canon::HDRInfo',
         }
     },
+    0x4026 => { #github#119
+        Name => 'LogInfo',
+        SubDirectory => {
+            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart,$size)',
+            TagTable => 'Image::ExifTool::Canon::LogInfo',
+        }
+    },
     0x4028 => { #PH
         Name => 'AFConfig', # (AFTabInfo)
         SubDirectory => {
@@ -2126,6 +2145,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             4 => 'Continuous, Low', #PH
             5 => 'Continuous, High', #PH
             6 => 'Silent Single', #PH
+            8 => 'Continuous, High+', #WolfgangGulcker
             # ref A: https://exiftool.org/forum/index.php/topic,5701.msg27843.html#msg27843
             9 => 'Single, Silent', #A
             10 => 'Continuous, Silent', #A
@@ -6789,6 +6809,10 @@ my %ciMaxFocal = (
             284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
             285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
             288 => 'Canon RF 16mm F2.8 STM', #42
+            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
         },
@@ -8701,6 +8725,65 @@ my %filterConv = (
     # 3 - maybe related to AutoImageAlign?
 );
 
+# More color information (MakerNotes tag 0x4026) (ref github issue #119)
+%Image::ExifTool::Canon::LogInfo = (
+    %binaryDataAttrs,
+    FORMAT => 'int32s',
+    FIRST_ENTRY => 1,
+    PRIORITY => 0,
+    4 => {
+        Name => 'CompressionFormat',
+        PrintConv => {
+             0 => 'Editing (ALL-I)',
+             1 => 'Standard (IPB)',
+             2 => 'Light (IPB)',
+             3 => 'Motion JPEG',
+             4 => 'RAW', # either Standard or Light, depending on Quality
+        },
+    },
+    6 => {  # 0 to 7
+        Name => 'Sharpness',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+    },
+    7 => {  # -4 to 4
+        Name => 'Saturation', 
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        %Image::ExifTool::Exif::printParameter,
+    },
+    8 => {  # -4 to 4
+        Name => 'ColorTone',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        %Image::ExifTool::Exif::printParameter,
+    },
+    9 => {
+        Name => 'ColorSpace2',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        PrintConv => {
+            0 => 'BT.709',
+            1 => 'BT.2020',
+            2 => 'CinemaGamut',
+        },
+    },
+    10 => {
+        Name => 'ColorMatrix',
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        PrintConv => {
+            0 => 'EOS Original',
+            1 => 'Neutral',
+        },
+    },
+    11 => {
+        Name => 'CanonLogVersion', # (increases dynamic range of sensor data)
+        RawConv => '$val == 0x7fffffff ? undef : $val',
+        PrintConv => {
+            0 => 'OFF',
+            1 => 'CLogV1',
+            2 => 'CLogV2', # (NC)
+            3 => 'CLogV3',
+        },
+    },
+);
+
 # AF configuration info (MakerNotes tag 0x4028) (ref PH)
 %Image::ExifTool::Canon::AFConfig = (
     %binaryDataAttrs,

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

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.38';
+$VERSION = '4.40';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -415,7 +415,14 @@ my %opcodeInfo = (
         WriteGroup => 'IFD0',
         # set priority directory if this is the full resolution image
         DataMember => 'SubfileType',
-        RawConv => '$self->SetPriorityDir() if $val eq "0"; $$self{SubfileType} = $val',
+        RawConv => q{
+            if ($val == ($val & 0x02)) {
+                $self->SetPriorityDir() if $val == 0;
+                $$self{PageCount} = ($$self{PageCount} || 0) + 1;
+                $$self{MultiPage} = 1 if $val == 2 or $$self{PageCount} > 1;
+            }
+            $$self{SubfileType} = $val;
+        },
         PrintConv => \%subfileType,
     },
     0xff => {
@@ -425,7 +432,14 @@ my %opcodeInfo = (
         Writable => 'int16u',
         WriteGroup => 'IFD0',
         # set priority directory if this is the full resolution image
-        RawConv => '$self->SetPriorityDir() if $val eq "1"; $val',
+        RawConv => q{
+            if ($val == 1 or $val == 3) {
+                $self->SetPriorityDir() if $val == 1;
+                $$self{PageCount} = ($$self{PageCount} || 0) + 1;
+                $$self{MultiPage} = 1 if $val == 3 or $$self{PageCount} > 1;
+            }
+            $val;
+        },
         PrintConv => {
             1 => 'Full-resolution image',
             2 => 'Reduced-resolution image',
@@ -2144,7 +2158,7 @@ my %opcodeInfo = (
         Notes => 'displayed in seconds, but stored as an APEX value',
         Format => 'rational64s', # Leica M8 patch (incorrectly written as rational64u)
         Writable => 'rational64s',
-        ValueConv => 'abs($val)<100 ? 2**(-$val) : 0',
+        ValueConv => 'IsFloat($val) && abs($val)<100 ? 2**(-$val) : 0',
         ValueConvInv => '$val>0 ? -log($val)/log(2) : -100',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
@@ -3383,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' ],
@@ -4827,6 +4850,7 @@ my %subSecConv = (
         PrintConvInv => q{
             return undef unless $val =~ /(.*? ?[NS]?), ?(.*? ?[EW]?)$/;
             my ($lat, $lon) = ($1, $2);
+            require Image::ExifTool::GPS;
             $lat = Image::ExifTool::GPS::ToDegrees($lat, 1, "lat");
             $lon = Image::ExifTool::GPS::ToDegrees($lon, 1, "lon");
             return "$lat, $lon";
@@ -5248,6 +5272,7 @@ sub RedBlueBalance($@)
 sub PrintExposureTime($)
 {
     my $secs = shift;
+    return $secs unless Image::ExifTool::IsFloat($secs);
     if ($secs < 0.25001 and $secs > 0) {
         return sprintf("1/%d",int(0.5 + 1/$secs));
     }
@@ -5853,7 +5878,7 @@ sub ProcessExif($$$)
         unless ($path =~ /^(JPEG-APP1-IFD0|TIFF-IFD0|PSD-EXIFInfo-IFD0)$/) {
             if ($Image::ExifTool::MWG::strict) {
                 $et->Warn("Ignored non-standard EXIF at $path");
-                return 1;
+                return 0;
             } else {
                 $et->Warn("Non-standard EXIF at $path", 1);
             }
@@ -5896,10 +5921,6 @@ sub ProcessExif($$$)
                 # also read next IFD pointer if available
                 if ($raf->Read($buf2, $len+4) >= $len) {
                     $buff .= $buf2;
-                    # make copy of dirInfo since we're going to modify it
-                    my %newDirInfo = %$dirInfo;
-                    $dirInfo = \%newDirInfo;
-                    # update directory parameters for the newly loaded IFD
                     $dataPt = $$dirInfo{DataPt} = \$buff;
                     $dataPos = $$dirInfo{DataPos} = $offset;
                     $dataLen = $$dirInfo{DataLen} = length $buff;
@@ -6593,7 +6614,7 @@ sub ProcessExif($$$)
                 #### eval Validate ($val, $dirData, $subdirStart, $size)
                 my $ok = 0;
                 if (defined $$subdir{Validate} and not eval $$subdir{Validate}) {
-                    $et->Warn("Invalid $tagStr data");
+                    $et->Warn("Invalid $tagStr data", $inMakerNotes);
                     $invalid = 1;
                 } else {
                     if (not $subdirInfo{DirName} and $inMakerNotes) {
@@ -6706,28 +6727,40 @@ sub ProcessExif($$$)
 
     # scan for subsequent IFD's if specified
     if ($$dirInfo{Multi} and $bytesFromEnd >= 4) {
-        my $offset = Get32u($dataPt, $dirEnd);
-        if ($offset) {
-            my $subdirStart = $offset - $dataPos;
-            # use same directory information for trailing directory,
-            # but change the start location (ProcessDirectory will
-            # test to make sure we don't reprocess the same dir twice)
-            my %newDirInfo = %$dirInfo;
-            $newDirInfo{DirStart} = $subdirStart;
+        # use same directory information for trailing directory,
+        # but change the start location (ProcessDirectory will
+        # test to make sure we don't reprocess the same dir twice)
+        my %newDirInfo = %$dirInfo;
+        $newDirInfo{Multi} = 0;  # prevent recursion
+        $newDirInfo{OffsetName} = $nextOffName;
+        $$et{INDENT} =~ s/..$//; # keep indent the same
+        for (;;) {
+            my $offset = Get32u($dataPt, $dirEnd) or last;
+            $newDirInfo{DirStart} = $offset - $dataPos;
             # increment IFD number
             my $ifdNum = $newDirInfo{DirName} =~ s/(\d+)$// ? $1 : 0;
             $newDirInfo{DirName} .= $ifdNum + 1;
-            $newDirInfo{OffsetName} = $nextOffName;
             # must validate SubIFD1 because the nextIFD pointer is invalid for some RAW formats
             if ($newDirInfo{DirName} ne 'SubIFD1' or ValidateIFD(\%newDirInfo)) {
-                $$et{INDENT} =~ s/..$//; # keep indent the same
                 my $cur = pop @{$$et{PATH}};
                 $et->ProcessDirectory(\%newDirInfo, $tagTablePtr) or $success = 0;
                 push @{$$et{PATH}}, $cur;
+                if ($success and $newDirInfo{BytesFromEnd} >= 4) {
+                    $dataPt = $newDirInfo{DataPt};
+                    $dataPos = $newDirInfo{DataPos};
+                    $dirEnd = $newDirInfo{DirEnd};
+                    next;
+                }
             } elsif ($verbose or $$et{TIFF_TYPE} eq 'TIFF') {
                 $et->Warn('Ignored bad IFD linked from SubIFD');
             }
+            last;
         }
+    } elsif (defined $$dirInfo{Multi}) {
+        # return necessary parameters for parsing next IFD
+        $$dirInfo{DirEnd} = $dirEnd;
+        $$dirInfo{OffsetName} = $nextOffName;
+        $$dirInfo{BytesFromEnd} = $bytesFromEnd;
     }
     return $success;
 }

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

@@ -28,7 +28,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.65';
+$VERSION = '1.66';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -210,13 +210,14 @@ sub LoadTrackLog($$;$)
         $raf->ReadLine($_) or last;
         # determine file format
         if (not $format) {
+            s/^\xef\xbb\xbf//;          # remove leading BOM if it exists
             if (/^<(\?xml|gpx)[\s>]/) { # look for XML or GPX header
                 $format = 'XML';
             # check for NMEA sentence
             # (must ONLY start with ones that have timestamps! eg. not GSA or PTNTHPR!)
             } elsif (/^.*\$([A-Z]{2}(RMC|GGA|GLL|ZDA)|PMGNTRK),/) {
                 $format = 'NMEA';
-                $nmeaStart = $2 || $1;    # save type of first sentence
+                $nmeaStart = $2 || $1;  # save type of first sentence
             } elsif (/^A(FLA|XSY|FIL)/) {
                 # (don't set format yet because we want to read HFDTE first)
                 $nmeaStart = 'B' ;

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub MDItemLocalTime($);
 sub ProcessATTR($$$);
@@ -381,7 +381,7 @@ sub SetMacOSTags($$$)
                 $val = Image::ExifTool::ConvertUnixTime($time, 1) if $time;
             }
             $val =~ s{(\d{4}):(\d{2}):(\d{2})}{$2/$3/$1};   # reformat for setfile
-            $cmd = "setfile -d '${val}' '${f}'";
+            $cmd = "/usr/bin/setfile -d '${val}' '${f}'";
         } elsif ($tag eq 'MDItemUserTags') {
             # (tested with "tag" version 0.9.0)
             ($f = $file) =~ s/'/'\\''/g;
@@ -391,7 +391,7 @@ sub SetMacOSTags($$$)
                 my @dels = @{$$nvHash{DelValue}};
                 s/'/'\\''/g foreach @dels;
                 my $del = join ',', @dels;
-                $err = system "tag -r '${del}' '${f}'>/dev/null 2>&1";
+                $err = system "/usr/local/bin/tag -r '${del}' '${f}'>/dev/null 2>&1";
                 unless ($err) {
                     $et->VerboseValue("- $tag", $del);
                     $result = 1;
@@ -403,13 +403,13 @@ sub SetMacOSTags($$$)
                 s/'/'\\''/g foreach @vals;
                 my $opt = $overwrite > 0 ? '-s' : '-a';
                 $val = @vals ? join(',', @vals) : '';
-                $cmd = "tag $opt '${val}' '${f}'";
+                $cmd = "/usr/local/bin/tag $opt '${val}' '${f}'";
                 $et->VPrint(1,"    - $tag = (all)\n") if $overwrite > 0;
                 undef $val if $val eq '';
             }
         } elsif ($tag eq 'XAttrQuarantine') {
             ($f = $file) =~ s/'/'\\''/g;
-            $cmd = "xattr -d com.apple.quarantine '${f}'";
+            $cmd = "/usr/bin/xattr -d com.apple.quarantine '${f}'";
             $silentErr = 256;   # (will get this error if attribute doesn't exist)
         } else {
             ($f = $file) =~ s/(["\\])/\\$1/g;   # escape necessary characters for script
@@ -426,7 +426,7 @@ sub SetMacOSTags($$$)
                 $v = $val ? 8 - $val : 0;       # convert from label to label index (0 for no label)
                 $attr = 'label index';
             }
-            $cmd = qq(osascript -e 'set fp to POSIX file "$f" as alias' -e \\
+            $cmd = qq(/usr/bin/osascript -e 'set fp to POSIX file "$f" as alias' -e \\
                 'tell application "Finder" to set $attr of file fp to "$v"');
         }
         if (defined $cmd) {
@@ -455,7 +455,7 @@ sub ExtractMDItemTags($$)
 
     ($fn = $file) =~ s/([`"\$\\])/\\$1/g;   # escape necessary characters
     $et->VPrint(0, '(running mdls)');
-    my @mdls = `mdls "$fn" 2> /dev/null`;   # get MacOS metadata
+    my @mdls = `/usr/bin/mdls "$fn" 2> /dev/null`;   # get MacOS metadata
     if ($? or not @mdls) {
         $et->Warn('Error running "mdls" to extract MDItem tags');
         return;
@@ -565,7 +565,7 @@ sub ExtractXAttrTags($$)
 
     ($fn = $file) =~ s/([`"\$\\])/\\$1/g;       # escape necessary characters
     $et->VPrint(0, '(running xattr)');
-    my @xattr = `xattr -lx "$fn" 2> /dev/null`; # get MacOS extended attributes
+    my @xattr = `/usr/bin/xattr -lx "$fn" 2> /dev/null`; # get MacOS extended attributes
     if ($? or not @xattr) {
         $? and $et->Warn('Error running "xattr" to extract XAttr tags');
         return;
@@ -611,7 +611,7 @@ sub GetFileCreateDate($$)
 
     ($fn = $file) =~ s/([`"\$\\])/\\$1/g;   # escape necessary characters
     $et->VPrint(0, '(running stat)');
-    my $time = `stat -f '%SB' -t '%Y:%m:%d %H:%M:%S%z' "$fn" 2> /dev/null`;
+    my $time = `/usr/bin/stat -f '%SB' -t '%Y:%m:%d %H:%M:%S%z' "$fn" 2> /dev/null`;
     if ($? or not $time or $time !~ s/([-+]\d{2})(\d{2})\s*$/$1:$2/) {
         $et->Warn('Error running "stat" to extract FileCreateDate');
         return;