exiftool_vendored 12.42.0 → 12.50.0

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

@@ -2036,11 +2036,13 @@ sub ProcessNikonSettings($$$)
     for ($i=0; $i<$num; ++$i) {
         my $entry = $start + 0x18 + $i * 8;
         my $tag = Get16u($dataPt, $entry);
-        my $fmt = Get16u($dataPt, $entry + 2);
+        # this is odd, but either the format is 16-bit and always big-endian,
+        # or it is 8-bit and we have an unknown byte in the entry...
+        my $fmt = Get8u($dataPt,  $entry + 3);
         my $val = Get32u($dataPt, $entry + 4);
         # abort if the tag has a format that we haven't yet seen
-        # (assuming this is a size/format code.  So far we have only seen 0x400)
-        $fmt == 0x400 or $et->Warn(sprintf('Unknown format 0x%x for NikonSettings tag 0x%.4x',$fmt,$tag)), last;
+        # (assuming this is a size/format code.  So far we have only seen a code of 4)
+        $fmt == 4 or $et->Warn(sprintf('Unknown format $fmt for NikonSettings tag 0x%.4x',$tag)), last;
         $et->HandleTag($tagTablePtr, $tag, $val,
             DataPt  => $dataPt,
             DataPos => $$dirInfo{DataPos},

data/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.78';
+$VERSION = '2.79';
 
 sub PrintLensInfo($$$);
 
@@ -433,6 +433,7 @@ my %olympusCameraTypes = (
     S0092 => 'E-M1MarkIII', #IB
     S0093 => 'E-P7', #IB
     S0095 => 'OM-1', #IB
+    S0101 => 'OM-5', #IB
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',
@@ -1919,7 +1920,7 @@ my %indexInfo = (
         PrintConv => [{
             0 => 'Off',
             1 => 'Motorsports',
-            2 => 'Airplnes',
+            2 => 'Airplanes',
             3 => 'Trains',
             4 => 'Birds',
             5 => 'Dogs & Cats',

data/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.17';
+$VERSION = '2.18';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -543,7 +543,11 @@ my %shootingMode = (
     0x2c => [
         {
             Name => 'ContrastMode',
-            Condition => '$$self{Model} !~ /^DMC-(FX10|G1|L1|L10|LC80|GF\d+|G2|TZ10|ZS7)$/',
+            Condition => q{
+                $$self{Model} !~ /^DMC-(FX10|G1|L1|L10|LC80|GF\d+|G2|TZ10|ZS7)$/ and
+                # tested for DC-GH6, but rule out other DC- models just in case - PH
+                $$self{Model} !~ /^DC-/
+            },
             Flags => 'PrintHex',
             Writable => 'int16u',
             Notes => q{
@@ -1129,7 +1133,10 @@ my %shootingMode = (
             8 => 'Cinelike D', #forum11194
             9 => 'Cinelike V', #forum11194
             11 => 'L. Monochrome', #forum11194
+            12 => 'Like709', #forum14033
             15 => 'L. Monochrome D', #forum11194
+            17 => 'V-Log', #forum14033
+            18 => 'Cinelike D2', #forum14033
         },
     },
     0x8a => { #18
@@ -1255,8 +1262,9 @@ my %shootingMode = (
         Writable => 'rational64u',
         Format => 'int32u',
         PrintConv => {
-            '0 0' => 'Expressive',
-            # '0 1' => have seen this for XS1 (PH)
+            # '0 0' => 'Expressive', #forum11194
+            '0 0' => 'Off', #forum14033 (GH6)
+            '0 1' => 'Expressive', #forum14033 (GH6) (have also seen this for XS1)
             '0 2' => 'Retro',
             '0 4' => 'High Key',
             '0 8' => 'Sepia',
@@ -1435,6 +1443,15 @@ my %shootingMode = (
         ValueConv => '$_=sprintf("%.4x",$val); s/(..)(..)/$2 $1/; $_',
         ValueConvInv => '$val =~ s/(..) (..)/$2$1/; hex($val)',
     },
+    0xe8 => { #PH (DC-GH6)
+        Name => 'MinimumISO',
+        Writable => 'int32u',
+    },
+    0xee => { #PH (DC-GH6)
+        Name => 'DynamicRangeBoost',
+        Writable => 'int16u',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',

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

@@ -21,7 +21,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.25';
+$VERSION = '1.27';
 
 sub ProcessJpgFromRaw($$$);
 sub WriteJpgFromRaw($$$);
@@ -218,6 +218,7 @@ my %panasonicWhiteBalance = ( #forum9396
     0x30 => { Name => 'CropLeft',   Writable => 'int16u' },
     0x31 => { Name => 'CropBottom', Writable => 'int16u' },
     0x32 => { Name => 'CropRight',  Writable => 'int16u' },
+    # 0x44 - may contain another pointer to the raw data starting at byte 2 in this data (DC-GH6)
     0x10f => {
         Name => 'Make',
         Groups => { 2 => 'Camera' },
@@ -737,6 +738,8 @@ sub WriteDistortionInfo($$$)
 #  2 - value count
 #  3 - reference to list of original offset values
 #  4 - IFD format number
+#  5 - (pointer to StripOffsets value added by this PatchRawDataOffset routine)
+#  6 - flag set if this is a fixed offset (Panasonic GH6 fixed-offset hack)
 sub PatchRawDataOffset($$$)
 {
     my ($offsetInfo, $raf, $ifd) = @_;
@@ -745,15 +748,32 @@ sub PatchRawDataOffset($$$)
     my $rawDataOffset = $$offsetInfo{0x118};
     my $err;
     $err = 1 unless $ifd == 0;
-    $err = 1 unless $stripOffsets and $stripByteCounts and $$stripOffsets[2] == 1;
-    if ($rawDataOffset) {
+    if ($stripOffsets or $stripByteCounts) {
+        $err = 1 unless $stripOffsets and $stripByteCounts and $$stripOffsets[2] == 1;
+    } else {
+        # the DC-GH6 and DC-GH5M2 write RawDataOffset with no Strip tags, so we need
+        # to create fake StripByteCounts information for copying the data
+        if ($$offsetInfo{0x118}) { # (just to be safe)
+            $stripByteCounts = $$offsetInfo{0x117} = [ $PanasonicRaw::Main{0x117}, 0, 1, [ 0 ], 4 ];
+            # set flag so the offset will be fixed (GH6 hack, see https://exiftool.org/forum/index.php?topic=13861.0)
+            # (of course, fixing up the offset is now unnecessary, but continue to do this even
+            # though the fixup adjustment will be 0 because this allows us to delete the following
+            # line to remove the fix-offset restriction if Panasonic ever sees the light, but note
+            # that in this case we should investigate the purpose of the seemily-duplicate raw
+            # data offset contained within PanasonicRaw_0x0044)
+            $$offsetInfo{0x118}[6] = 1;
+        }
+    }
+    if ($rawDataOffset and not $err) {
         $err = 1 unless $$rawDataOffset[2] == 1;
-        $err = 1 unless $$stripOffsets[3][0] == 0xffffffff or $$stripByteCounts[3][0] == 0;
+        if ($stripOffsets) {
+            $err = 1 unless $$stripOffsets[3][0] == 0xffffffff or $$stripByteCounts[3][0] == 0;
+        }
     }
     $err and return 'Unsupported Panasonic/Leica RAW variant';
     if ($rawDataOffset) {
         # update StripOffsets along with this tag if it contains a reasonable value
-        unless ($$stripOffsets[3][0] == 0xffffffff) {
+        if ($stripOffsets and $$stripOffsets[3][0] != 0xffffffff) {
             # save pointer to StripOffsets value for updating later
             push @$rawDataOffset, $$stripOffsets[1];
         }

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

@@ -6,14 +6,16 @@
 # Revisions:    2019-10-23 - P. Harvey Created
 #
 # References:   1) https://developer.parrot.com/docs/pdraw/metadata.html
+#               --> changed to https://developer.parrot.com/docs/pdraw/video-metadata.html
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Parrot;
 
 use strict;
 use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub Process_mett($$$);
 
@@ -21,7 +23,10 @@ sub Process_mett($$$);
 %Image::ExifTool::Parrot::mett = (
     PROCESS_PROC => \&Process_mett,
     # put the 'P' records first in the documentation
-    VARS => { SORT_PROC => sub { my ($a,$b)=@_; $a=~s/P/A/; $b=~s/P/A/; $a cmp $b } },
+    VARS => {
+        SORT_PROC => sub { my ($a,$b)=@_; $a=~s/P/A/; $b=~s/P/A/; $a cmp $b },
+        LONG_TAGS => 1
+    },
     NOTES => q{
         Streaming metadata found in Parrot drone videos. See
         L<https://developer.parrot.com/docs/pdraw/metadata.html> for the
@@ -51,6 +56,23 @@ sub Process_mett($$$);
         Name => 'ParrotAutomation',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::Automation' },
     },
+    # timed metadata written by ARCore (see forum13653)
+    'application/arcore-accel' => {
+        Name => 'ARCoreAccel',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreAccel', ByteOrder => 'II' },
+    },
+    'application/arcore-gyro' => {
+        Name => 'ARCoreGyro',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreGyro', ByteOrder => 'II' },
+    },
+    'application/arcore-video-0' => {
+        Name => 'ARCoreVideo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreVideo', ByteOrder => 'II' },
+    },
+    'application/arcore-custom-event' => {
+        Name => 'ARCoreCustom',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreCustom', ByteOrder => 'II' },
+    },
 );
 
 # tags found in the Parrot 'mett' V1 timed metadata (ref 1) [untested]
@@ -629,6 +651,69 @@ sub Process_mett($$$);
     },
 );
 
+# ARCore Accel data (ref PH)
+%Image::ExifTool::Parrot::ARCoreAccel = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    NOTES => 'ARCore accelerometer data.',
+    FIRST_ENTRY => 0,
+    # 00-04: always 10 34 16 1 29
+    4  => {
+        Name => 'AccelerometerUnknown',
+        Format => 'undef[16]',
+        Unknown => 1,
+        ValueConv => 'join " ", unpack("Cx4Cx4Cx4C", $val)',
+    },
+    5  => { # (NC)
+        Name => 'Accelerometer',
+        Format => 'undef[14]',
+        RawConv => 'GetFloat(\$val,0) . " " . GetFloat(\$val,5) . " " . GetFloat(\$val,10)',
+    },
+    # 05-08: float Accelerometer X
+    # 09: 37
+    # 10-13: float Accelerometer Y
+    # 14: 45
+    # 15-18: float Accelerometer Z
+    # 19: 48
+    # 20-24: 128-255
+    # 25: 246 then 247
+    # 26: 188
+    # 27: 2
+    # 28: 56
+    # 29-32: 128-255
+    # 33: increments slowly (about once every 56 samples or so)
+);
+
+# ARCore Gyro data (ref PH)
+%Image::ExifTool::Parrot::ARCoreGyro = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    NOTES => 'ARCore accelerometer data.',
+    FIRST_ENTRY => 0,
+    # 00-04: always 10 34 16 3 29
+    4  => {
+        Name => 'GyroscopeUnknown',
+        Format => 'undef[16]',
+        Unknown => 1, # always "29 37 45 48" in my sample, just like AccelerometerUnknown
+        ValueConv => 'join " ", unpack("Cx4Cx4Cx4C", $val)',
+    },
+    5  => { # (NC)
+        Name => 'Gyroscope',
+        Format => 'undef[14]',
+        RawConv => 'GetFloat(\$val,0) . " " . GetFloat(\$val,5) . " " . GetFloat(\$val,10)',
+    },
+);
+
+%Image::ExifTool::Parrot::ARCoreVideo = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    FIRST_ENTRY => 0,
+);
+
+%Image::ExifTool::Parrot::ARCoreCustom = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    FIRST_ENTRY => 0,
+);
+
 %Image::ExifTool::Parrot::Composite = (
     GPSDateTime => {
         Description => 'GPS Date/Time',
@@ -676,9 +761,18 @@ sub Process_mett($$$)
     my $dataPos = $$dirInfo{DataPos};
     my $dirEnd = length $$dataPt;
     my $pos = $$dirInfo{DirStart} || 0;
+    my $metaType = $$et{MetaType} || '';
 
     $et->VerboseDir('Parrot mett', undef, $dirEnd);
 
+    if ($$tagTbl{$metaType}) {
+        $et->HandleTag($tagTbl, $metaType, undef,
+            DataPt  => $dataPt,
+            DataPos => $dataPos,
+            Base    => $$dirInfo{Base},
+        );
+        return 1;
+    }
     while ($pos + 4 < $dirEnd) {
         my ($id, $nwords) = unpack("x${pos}a2n", $$dataPt);
         my $size;

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -365,10 +365,15 @@ sub DecodeAFPoints($$$$;$);
     '8 255.4' => 'Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye', #PH
     '8 255.5' => 'Sigma 50-200mm F4-5.6 DC OS', #26
     '8 255.6' => 'Sigma 24-70mm F2.8 EX DG HSM', #29
+
+    '9 0' => '645 Manual Lens', #PH (NC)
+    '9 3' => 'HD PENTAX-FA 43mm F1.9 Limited', #IB
+    '9 24' => 'HD PENTAX-FA 77mm F1.8 Limited', #IB
+    '9 39' => 'HD PENTAX-FA 31mm F1.8 AL Limited', #IB
+    '9 247' => 'HD PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED [IF]', #IB
 #
 # 645 lenses
 #
-    '9 0' => '645 Manual Lens', #PH (NC)
     '10 0' => '645 A Series Lens', #PH
     '11 1' => 'smc PENTAX-FA 645 75mm F2.8', #PH
     '11 2' => 'smc PENTAX-FA 645 45mm F2.8', #PH

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

@@ -25,15 +25,28 @@
 package Image::ExifTool::Photoshop;
 
 use strict;
-use vars qw($VERSION $AUTOLOAD $iptcDigestInfo);
+use vars qw($VERSION $AUTOLOAD $iptcDigestInfo %printFlags);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.65';
+$VERSION = '1.67';
 
 sub ProcessPhotoshop($$$);
 sub WritePhotoshop($$$);
 sub ProcessLayers($$$);
 
+# PrintFlags bit definitions (ref forum13785)
+%printFlags = (
+    0 => 'Labels',
+    1 => 'Corner crop marks',
+    2 => 'Color bars', # (deprecated)
+    3 => 'Registration marks',
+    4 => 'Negative',
+    5 => 'Emulsion down',
+    6 => 'Interpolate', # (deprecated)
+    7 => 'Description',
+    8 => 'Print flags',
+);
+
 # map of where information is stored in PSD image
 my %psdMap = (
     IPTC         => 'Photoshop',
@@ -106,7 +119,17 @@ my %unicodeString = (
     0x03f0 => { Unknown => 1, Name => 'PStringCaption' },
     0x03f1 => { Unknown => 1, Name => 'BorderInformation' },
     0x03f2 => { Unknown => 1, Name => 'BackgroundColor' },
-    0x03f3 => { Unknown => 1, Name => 'PrintFlags', Format => 'int8u' },
+    0x03f3 => {
+        Unknown => 1,
+        Name => 'PrintFlags',
+        Format => 'int8u',
+        PrintConv => q{
+            my $byte = 0;
+            my @bits = $val =~ /\d+/g;
+            $byte = ($byte << 1) | ($_ ? 1 : 0) foreach reverse @bits;
+            return DecodeBits($byte, \%Image::ExifTool::Photoshop::printFlags);
+        },
+    },
     0x03f4 => { Unknown => 1, Name => 'BW_HalftoningInfo' },
     0x03f5 => { Unknown => 1, Name => 'ColorHalftoningInfo' },
     0x03f6 => { Unknown => 1, Name => 'DuotoneHalftoningInfo' },
@@ -332,6 +355,7 @@ my %unicodeString = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    DATAMEMBER => [ 1 ],
     FORMAT => 'int16s',
     GROUPS => { 2 => 'Image' },
     0 => {
@@ -342,6 +366,7 @@ my %unicodeString = (
     },
     1 => {
         Name => 'PhotoshopFormat',
+        RawConv => '$$self{PhotoshopFormat} = $val',
         PrintConv => {
             0x0000 => 'Standard',
             0x0001 => 'Optimized',
@@ -350,6 +375,7 @@ my %unicodeString = (
     },
     2 => {
         Name => 'ProgressiveScans',
+        Condition => '$$self{PhotoshopFormat} == 0x0101',
         PrintConv => {
             1 => '3 Scans',
             2 => '4 Scans',