exiftool_vendored 12.41.0 → 12.50.0

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.57';
+$VERSION = '4.63';
 
 # 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
@@ -479,6 +480,7 @@ $VERSION = '4.57';
     255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
     255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
+    255.3 => 'Yongnuo YN 50mm f/1.8', #50
     368 => 'Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens', #IB (A018)
     368.1 => 'Sigma 20mm f/1.4 DG HSM | A', #50 (newer firmware)
     368.2 => 'Sigma 50mm f/1.4 DG HSM | A', #50
@@ -492,6 +494,7 @@ $VERSION = '4.57';
    '368.10' => 'Sigma 35mm f/1.4 DG HSM | A', #PH (012)
    '368.11' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
    '368.12' => 'Sigma 18-35mm f/1.8 DC HSM | A', #50
+   '368.13' => 'Sigma 24-105mm f/4 DG OS HSM | A', #forum3833
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek
@@ -571,7 +574,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',
@@ -594,16 +599,30 @@ $VERSION = '4.57';
    '61182.19' => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
    '61182.20' => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
    '61182.21' => 'Canon RF 70-200mm F4L IS USM', #42
-   '61182.22' => 'Canon RF 50mm F1.8 STM', #42
-   '61182.23' => 'Canon RF 14-35mm F4L IS USM', #IB
-   '61182.24' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-   '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.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.22' => 'Canon RF 100mm F2.8L MACRO IS USM', #42
+   '61182.23' => 'Canon RF 50mm F1.8 STM', #42
+   '61182.24' => 'Canon RF 14-35mm F4L IS USM', #IB
+   '61182.25' => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
+   '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
+   '61182.27' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42
+   '61182.28' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42
+   '61182.29' => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
+   '61182.30' => 'Canon RF 24mm F1.8 MACRO IS STM', #42
+   '61182.31' => 'Canon RF 16mm F2.8 STM', #42
+   '61182.32' => 'Canon RF 400mm F2.8L IS USM', #IB
+   '61182.33' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+   '61182.34' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
+   '61182.35' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+   '61182.36' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+   '61182.37' => 'Canon RF 800mm F5.6L IS USM', #42
+   '61182.38' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+   '61182.39' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+   '61182.40' => 'Canon RF 1200mm F8L IS USM', #42
+   '61182.41' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+   '61182.42' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+   '61182.43' => 'Canon RF 135mm F1.8 L IS USM', #42
+    # we need the RFLensType values for the following...
+   '61182.44' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -960,8 +979,11 @@ $VERSION = '4.57';
     0x80000437 => 'EOS 90D', #IB
     0x80000450 => 'EOS R3', #42
     0x80000453 => 'EOS R6', #PH
+    0x80000464 => 'EOS R7', #42
+    0x80000465 => 'EOS R10', #42
     0x80000467 => 'PowerShot ZOOM',
     0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
+    0x80000481 => 'EOS R6 Mark II', #42
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -1924,7 +1946,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData10' },
         },
         {   # (int16u[3973]) - R3 ref IB
-            Condition => '$count == 3973',
+            Condition => '$count == 3973 or $count == 3778',
             Name => 'ColorData11',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData11' },
         },
@@ -6357,10 +6379,11 @@ my %ciMaxFocal = (
     1 => {
         Name => 'TimeZone',
         PrintConv => 'Image::ExifTool::TimeZoneString($val)',
-        PrintConvInv => sub {
-            my $val = shift;
-            $val =~ /^([-+]?)(\d{1,2}):?(\d{2})$/ or return undef;
-            return(($1 eq '-' ? -1 : 1) * ($2 * 60 + $3));
+        PrintConvInv => q{
+            $val =~ /Z$/ and return 0;
+            $val =~ /([-+])(\d{1,2}):?(\d{2})$/ and return $1 . ($2 * 60 + $3);
+            $val =~ /^(\d{2})(\d{2})$/ and return $1 * 60 + $2;
+            return undef;
         },
     },
     2 => {
@@ -6522,23 +6545,23 @@ my %ciMaxFocal = (
     0x02 => 'FacesDetected',
 );
 
-# G9 white balance information (MakerNotes tag 0x29) (ref IB)
+# G9 white balance information (MakerNotes tag 0x29) (ref IB, changed ref forum13640)
 %Image::ExifTool::Canon::WBInfo = (
     %binaryDataAttrs,
     NOTES => 'WB tags for the Canon G9.',
     FORMAT => 'int32u',
     FIRST_ENTRY => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    0x02 => { Name => 'WB_GRGBLevelsAuto',        Format => 'int32s[4]' },
-    0x0a => { Name => 'WB_GRGBLevelsDaylight',    Format => 'int32s[4]' },
-    0x12 => { Name => 'WB_GRGBLevelsCloudy',      Format => 'int32s[4]' },
-    0x1a => { Name => 'WB_GRGBLevelsTungsten',    Format => 'int32s[4]' },
-    0x22 => { Name => 'WB_GRGBLevelsFluorescent', Format => 'int32s[4]' },
-    0x2a => { Name => 'WB_GRGBLevelsFluorHigh',   Format => 'int32s[4]' },
-    0x32 => { Name => 'WB_GRGBLevelsFlash',       Format => 'int32s[4]' },
-    0x3a => { Name => 'WB_GRGBLevelsUnderwater',  Format => 'int32s[4]' },
-    0x42 => { Name => 'WB_GRGBLevelsCustom1',     Format => 'int32s[4]' },
-    0x4a => { Name => 'WB_GRGBLevelsCustom2',     Format => 'int32s[4]' },
+    0x02 => { Name => 'WB_GRBGLevelsAuto',        Format => 'int32s[4]' },
+    0x0a => { Name => 'WB_GRBGLevelsDaylight',    Format => 'int32s[4]' },
+    0x12 => { Name => 'WB_GRBGLevelsCloudy',      Format => 'int32s[4]' },
+    0x1a => { Name => 'WB_GRBGLevelsTungsten',    Format => 'int32s[4]' },
+    0x22 => { Name => 'WB_GRBGLevelsFluorescent', Format => 'int32s[4]' },
+    0x2a => { Name => 'WB_GRBGLevelsFluorHigh',   Format => 'int32s[4]' },
+    0x32 => { Name => 'WB_GRBGLevelsFlash',       Format => 'int32s[4]' },
+    0x3a => { Name => 'WB_GRBGLevelsUnderwater',  Format => 'int32s[4]' },
+    0x42 => { Name => 'WB_GRBGLevelsCustom1',     Format => 'int32s[4]' },
+    0x4a => { Name => 'WB_GRBGLevelsCustom2',     Format => 'int32s[4]' },
 );
 
 # yet more face detect information (MakerNotes tag 0x2f) - PH (G12)
@@ -6795,16 +6818,28 @@ my %ciMaxFocal = (
             276 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x',
             277 => 'Canon RF 100-500mm F4.5-7.1L IS USM + RF2x',
             278 => 'Canon RF 70-200mm F4L IS USM', #42
+            279 => 'Canon RF 100mm F2.8L MACRO IS USM', #42
             280 => 'Canon RF 50mm F1.8 STM', #42
             281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
+            282 => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
             283 => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-            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)
+            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42
+            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42
+            286 => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
+            287 => 'Canon RF 24mm F1.8 MACRO IS STM', #42
             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
-           #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
+            292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+            295 => 'Canon RF 800mm F5.6L IS USM', #42
+            296 => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+            297 => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+            298 => 'Canon RF 1200mm F8L IS USM', #42
+            299 => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+            300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+            302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+            303 => 'Canon RF 135mm F1.8 L IS USM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -6849,6 +6884,7 @@ my %ciMaxFocal = (
             8 => '4:5',
             12 => '3:2 (APS-H crop)', #IB
             13 => '3:2 (APS-C crop)', #IB
+            258 => '4:3 crop', #PH (NC)
         },
     },
     # (could use better names for these, or the Crop tags above, or both)
@@ -8301,7 +8337,7 @@ my %ciMaxFocal = (
 # Color data (MakerNotes tag 0x4001, count=3973, ref IB)
 %Image::ExifTool::Canon::ColorData11 = (
     %binaryDataAttrs,
-    NOTES => 'These tags are used by the EOS R3',
+    NOTES => 'These tags are used by the EOS R3, R7 and R6mkII',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8313,6 +8349,7 @@ my %ciMaxFocal = (
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
             34 => '34 (R3)', #IB
+            48 => '48 (R7, R10, R6 Mark II)', #IB
         },
     },
     0x69 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
@@ -9378,8 +9415,9 @@ my %filterConv = (
             #  numbers from the previous image, so we need special logic
             #  to handle the FileIndex wrap properly)
             $val[1] == 10000 and $val[1] = 1, ++$val[0];
-            return sprintf("%.3d-%.4d",@val);
+            return sprintf("%.3d%.4d",@val);
         },
+        PrintConv => '$_=$val;s/(\d+)(\d{4})/$1-$2/;$_',
     },
 );
 

data/bin/lib/Image/ExifTool/CanonRaw.pm

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Canon;
 
-$VERSION = '1.58';
+$VERSION = '1.59';
 
 sub WriteCRW($$);
 sub ProcessCanonRaw($$$);
@@ -625,6 +625,13 @@ sub ProcessCanonRaw($$$)
     $raf->Seek($blockStart+$blockSize-4, 0) or return 0;
     $raf->Read($buff, 4) == 4 or return 0;
     my $dirOffset = Get32u(\$buff,0) + $blockStart;
+    # avoid infinite recursion
+    $$et{ProcessedCanonRaw} or $$et{ProcessedCanonRaw} = { };
+    if ($$et{ProcessedCanonRaw}{$dirOffset}) {
+        $et->Warn("Not processing double-referenced $$dirInfo{DirName} directory");
+        return 0;
+    }
+    $$et{ProcessedCanonRaw}{$dirOffset} = 1;
     $raf->Seek($dirOffset, 0) or return 0;
     $raf->Read($buff, 2) == 2 or return 0;
     my $entries = Get16u(\$buff,0);         # get number of entries in directory

data/bin/lib/Image/ExifTool/CanonVRD.pm

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.33';
+$VERSION = '1.34';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -2046,17 +2046,16 @@ sub ProcessCanonVRD($$;$)
             return 0;
         }
     }
-    # exit quickly if writing and no CanonVRD tags are being edited
-    if ($outfile and not exists $$et{EDIT_DIRS}{CanonVRD}) {
-        print $out "$$et{INDENT}  [nothing changed]\n" if $verbose;
-        return 1 if $outfile eq $dataPt;
-        return Write($outfile, $$dataPt) ? 1 : -1;
-    }
-
     my $vrdType = 'VRD';
 
     if ($outfile) {
         $verbose and not $created and print $out "  Rewriting CanonVRD trailer\n";
+        # exit quickly if writing and no CanonVRD tags are being edited
+        unless (exists $$et{EDIT_DIRS}{CanonVRD}) {
+            print $out "$$et{INDENT}  [nothing changed in CanonVRD]\n" if $verbose;
+            return 1 if $outfile eq $dataPt;
+            return Write($outfile, $$dataPt) ? 1 : -1;
+        }
         # delete CanonVRD information if specified
         my $doDel = $$et{DEL_GROUP}{CanonVRD};
         unless ($doDel) {

data/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.06';
+
+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,39 @@ 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;
+        next unless defined $tag and defined $val;
+        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

data/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

data/bin/lib/Image/ExifTool/DarwinCore.pm

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 my %dateTimeInfo = (
     # NOTE: Do NOT put "Groups" here because Groups hash must not be common!
@@ -138,6 +138,9 @@ my %event = (
             identificationVerificationStatus => { },
             identifiedBy                => { },
             typeStatus                  => { },
+            # new, ref forum13707
+            identifiedByID              => { },
+            verbatimIdentification      => { },
         },
     },
     LivingSpecimen      => { Struct => \%materialSample },
@@ -189,6 +192,11 @@ my %event = (
             recordNumber                => { },
             reproductiveCondition       => { },
             sex                         => { },
+            # new, ref forum13707
+            degreeOfEstablishment       => { },
+            georeferenceVerificationStatus => { },
+            pathway                     => { },
+            recordedByID                => { },
         },
     },
     OccurrenceOccurrenceDetails => { Name => 'OccurrenceDetails', Flat => 1 },
@@ -242,6 +250,7 @@ my %event = (
             relationshipRemarks         => { },
             resourceID                  => { },
             resourceRelationshipID      => { },
+            relationshipOfResourceID    => { }, # new, ref forum13707
         },
     },
     Taxon => {
@@ -255,6 +264,7 @@ my %event = (
             genus                       => { },
             higherClassification        => { },
             infraspecificEpithet        => { },
+            cultivarEpithet             => { }, # new, ref forum13707
             kingdom                     => { },
             nameAccordingTo             => { },
             nameAccordingToID           => { },
@@ -338,6 +348,8 @@ my %event = (
             verbatimLongitude           => { },
             verbatimSRS                 => { },
             waterBody                   => { },
+            # new, ref forum13707
+            verticalDatum               => { },
         },
     },
 );

data/bin/lib/Image/ExifTool/EXE.pm

@@ -21,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -1233,6 +1233,14 @@ sub ProcessEXE($$)
         $tagTablePtr = GetTagTable('Image::ExifTool::EXE::MachO');
         if ($1 eq "\xca\xfe\xba\xbe") {
             SetByteOrder('MM');
+            my $ver = Get32u(\$buff, 4);
+            # Java bytecode .class files have the same magic number, so we need to look deeper
+            # (ref https://github.com/file/file/blob/master/magic/Magdir/cafebabe#L6-L15)
+            if ($ver > 30) {
+                # this is Java bytecode
+                $et->SetFileType('Java bytecode', 'application/java-byte-code', 'class');
+                return 1;
+            }
             $et->SetFileType('Mach-O fat binary executable', undef, '');
             return 1 if $fast3;
             my $count = Get32u(\$buff, 4);  # get architecture count

data/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.40';
+$VERSION = '4.42';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1084,11 +1084,11 @@ my %opcodeInfo = (
         {
             Name => 'ThumbnailOffset',
             Notes => q{
-                ThumbnailOffset in IFD1 of JPEG and some TIFF-based images, IFD0 of MRW
-                images and AVI and MOV videos, and the SubIFD in IFD1 of SRW images;
-                PreviewImageStart in MakerNotes and IFD0 of ARW and SR2 images;
-                JpgFromRawStart in SubIFD of NEF images and IFD2 of PEF images; and
-                OtherImageStart in everything else
+                called JPEGInterchangeFormat in the specification, this is ThumbnailOffset
+                in IFD1 of JPEG and some TIFF-based images, IFD0 of MRW images and AVI and
+                MOV videos, and the SubIFD in IFD1 of SRW images; PreviewImageStart in
+                MakerNotes and IFD0 of ARW and SR2 images; JpgFromRawStart in SubIFD of NEF
+                images and IFD2 of PEF images; and OtherImageStart in everything else
             },
             # thumbnail is found in IFD1 of JPEG and TIFF images, and
             # IFD0 of EXIF information in FujiFilm AVI (RIFF) and MOV videos
@@ -1225,6 +1225,7 @@ my %opcodeInfo = (
         {
             Name => 'ThumbnailLength',
             Notes => q{
+                called JPEGInterchangeFormatLength in the specification, this is
                 ThumbnailLength in IFD1 of JPEG and some TIFF-based images, IFD0 of MRW
                 images and AVI and MOV videos, and the SubIFD in IFD1 of SRW images;
                 PreviewImageLength in MakerNotes and IFD0 of ARW and SR2 images;
@@ -2080,6 +2081,7 @@ my %opcodeInfo = (
         Groups => { 2 => 'Time' },
         Notes => 'time zone for ModifyDate',
         Writable => 'string',
+        Shift => 'Time',
         PrintConvInv => q{
             return "+00:00" if $val =~ /\d{2}Z$/;
             return sprintf("%s%.2d:%.2d",$1,$2,$3) if $val =~ /([-+])(\d{1,2}):(\d{2})/;
@@ -2091,6 +2093,7 @@ my %opcodeInfo = (
         Groups => { 2 => 'Time' },
         Notes => 'time zone for DateTimeOriginal',
         Writable => 'string',
+        Shift => 'Time',
         PrintConvInv => q{
             return "+00:00" if $val =~ /\d{2}Z$/;
             return sprintf("%s%.2d:%.2d",$1,$2,$3) if $val =~ /([-+])(\d{1,2}):(\d{2})/;
@@ -2102,6 +2105,7 @@ my %opcodeInfo = (
         Groups => { 2 => 'Time' },
         Notes => 'time zone for CreateDate',
         Writable => 'string',
+        Shift => 'Time',
         PrintConvInv => q{
             return "+00:00" if $val =~ /\d{2}Z$/;
             return sprintf("%s%.2d:%.2d",$1,$2,$3) if $val =~ /([-+])(\d{1,2}):(\d{2})/;
@@ -3397,6 +3401,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' ],
@@ -4071,7 +4084,7 @@ my %opcodeInfo = (
         WriteGroup => 'SubIFD' #? (NC) Semantic Mask IFD (only for Validate)
     },
     0xcd30 => { # DNG 1.6
-        Name => 'SemanticInstanceIFD',
+        Name => 'SemanticInstanceID',
       # Writable => 'string',
         WriteGroup => 'SubIFD' #? (NC) Semantic Mask IFD (only for Validate)
     },
@@ -4833,10 +4846,10 @@ my %subSecConv = (
         Writable => 1,
         Protected => 1,
         WriteAlso => {
-            GPSLatitude => '$val =~ /(.*?)( ?[NS])?,/ ? $1 : undef',
-            GPSLatitudeRef => '$val =~ /(-?)(.*?) ?([NS]?),/ ? ($3 || ($1 ? "S" : "N")) : undef',
-            GPSLongitude => '$val =~ /, ?(.*?)( ?[EW]?)$/ ? $1 : undef',
-            GPSLongitudeRef => '$val =~ /, ?(-?)(.*?) ?([EW]?)$/ ? ($3 || ($1 ? "W" : "E")) : undef',
+            GPSLatitude => '(defined $val and $val =~ /(.*?)( ?[NS])?,/) ? $1 : undef',
+            GPSLatitudeRef => '(defined $val and $val =~ /(-?)(.*?) ?([NS]?),/) ? ($3 || ($1 ? "S" : "N")) : undef',
+            GPSLongitude => '(defined $val and $val =~ /, ?(.*?)( ?[EW]?)$/) ? $1 : undef',
+            GPSLongitudeRef => '(defined $val and $val =~ /, ?(-?)(.*?) ?([EW]?)$/) ? ($3 || ($1 ? "W" : "E")) : undef',
         },
         PrintConvInv => q{
             return undef unless $val =~ /(.*? ?[NS]?), ?(.*? ?[EW]?)$/;
@@ -6003,7 +6016,8 @@ sub ProcessExif($$$)
         my $tagID = Get16u($dataPt, $entry);
         my $format = Get16u($dataPt, $entry+2);
         my $count = Get32u($dataPt, $entry+4);
-        if ($format < 1 or $format > 13) {
+        # (Apple uses the BigTIFF format code 16 in the maker notes of their ProRaw DNG files)
+        if (($format < 1 or $format > 13) and not ($format == 16 and $$et{Make} eq 'Apple' and $inMakerNotes)) {
             if ($mapFmt and $$mapFmt{$format}) {
                 $format = $$mapFmt{$format};
             } else {

data/bin/lib/Image/ExifTool/FLAC.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessBitStream($$$);
 
@@ -29,7 +29,19 @@ sub ProcessBitStream($$$);
         SubDirectory => { TagTable => 'Image::ExifTool::FLAC::StreamInfo' },
     },
     1 => { Name => 'Padding',     Binary => 1, Unknown => 1 },
-    2 => { Name => 'Application', Binary => 1, Unknown => 1 },
+    2 => [{ # (see forum14064)
+        Name => 'Application_riff',
+        Condition => '$$valPt =~ /^riff(?!RIFF)/', # (all "riff" blocks but header)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::RIFF::Main',
+            ByteOrder => 'LittleEndian',
+            Start => 4,
+        },
+    },{
+        Name => 'ApplicationUnknown',
+        Binary => 1,
+        Unknown => 1,
+    }],
     3 => { Name => 'SeekTable',   Binary => 1, Unknown => 1 },
     4 => {
         Name => 'VorbisComment',
@@ -255,9 +267,11 @@ sub ProcessFLAC($$)
             print $out "FLAC metadata block, type $tag:\n";
             $et->VerboseDump(\$buff, DataPos => $raf->Tell() - $size);
         }
-        $et->HandleTag($tagTablePtr, $tag, undef,
+        $et->HandleTag($tagTablePtr, $tag, $buff,
             DataPt  => \$buff,
             DataPos => $raf->Tell() - $size,
+            Start   => 0,
+            Size    => $size,
         );
         last if $last;   # all done if  is set
     }

data/bin/lib/Image/ExifTool/FLIR.pm

@@ -24,7 +24,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.20';
+$VERSION = '1.21';
 
 sub ProcessFLIR($$;$);
 sub ProcessFLIRText($$$);
@@ -99,7 +99,8 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     NOTES => q{
         Information extracted from FLIR FFF images and the APP1 FLIR segment of JPEG
         images.  These tags may also be extracted from the first frame of an FLIR
-        SEQ file, or all frames if the ExtractEmbedded option is used.
+        SEQ file, or all frames if the ExtractEmbedded option is used.  Setting
+        ExtractEmbedded to 2 also the raw thermal data from all frames.
     },
     "_header" => {
         Name => 'FFFHeader',
@@ -1551,7 +1552,7 @@ sub ProcessFLIR($$;$)
                                  $$et{INDENT}, $i, $recType, $recPos, $recLen;
 
         # skip RawData records for embedded documents
-        if ($recType == 1 and $$et{DOC_NUM}) {
+        if ($recType == 1 and $$et{DOC_NUM} and $et->Options('ExtractEmbedded') < 2) {
             $raf->Seek($base+$recPos+$recLen) or $success = 0, last;
             next;
         }