exiftool_vendored 12.56.0 → 12.57.0

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

@@ -9938,8 +9938,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
         },
     },
     217 => { Name => 'MovieMultiSelector',  %buttonsZ9, Unknown => 1}, # CSg2-h
-    221 => { Name => 'MovieAFSpeed',        ValueConv => '$val - 5', ValueConvInv => '$val + 6' }, # CSg6-a
-    223 => { Name => 'MovieAFSpeedApply',    rintConv => {0 => 'Always', 1 => 'Only During Recording'},}, # CSg6-b
+    221 => { Name => 'MovieAFSpeed',        ValueConv => '$val - 5', ValueConvInv => '$val + 5' }, # CSg6-a
+    223 => { Name => 'MovieAFSpeedApply',   PrintConv => {0 => 'Always', 1 => 'Only During Recording'},}, # CSg6-b
     225 => { # CSg7
         Name => 'MovieAFTrackingSensitivity',
         PrintConv => {

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

@@ -1512,7 +1512,7 @@ my %infoZSeries = (
             6 => 'None',
         },
     }],
-    0x0ee => { Name => 'MovieAFSpeed',                  ValueConv => '$val - 6', ValueConvInv => '$val + 6' }, # CSg4-a (Z7_2)
+    0x0ee => { Name => 'MovieAFSpeed', ValueConv => '$val - 6', ValueConvInv => '$val + 6' }, # CSg4-a (Z7_2)
     0x0ef => { # CSg4-b (Z7_2)
         Name => 'MovieAFSpeedApply',
         PrintConv => {

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.79';
+$VERSION = '2.80';
 
 sub PrintLensInfo($$$);
 
@@ -116,6 +116,7 @@ my %olympusLensTypes = (
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
     '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
+    '0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
     # Sigma lenses
     '1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
     '1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
@@ -3191,6 +3192,7 @@ my %indexInfo = (
         }
     ],
     # 0x31a Continuous AF parameters?
+    # 0x31b ContinuousFocusMode? (ref forum78245)
     0x328 => { #PH
         Name => 'AFInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::AFInfo' },

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

@@ -28,7 +28,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD $iptcDigestInfo %printFlags);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.67';
+$VERSION = '1.68';
 
 sub ProcessPhotoshop($$$);
 sub WritePhotoshop($$$);
@@ -571,6 +571,13 @@ my %unicodeString = (
         ValueConv => '100 * $val / 255',
         PrintConv => 'sprintf("%d%%",$val)',
     },
+    _xvis  => {
+        Name => 'LayerVisible',
+        Format => 'int8u',
+        List => 1,
+        ValueConv => '$val & 0x02',
+        PrintConv => { 0x02 => 'No', 0x00 => 'Yes' },
+    },
     # tags extracted from additional layer information (tag ID's are real)
     # - must be able to accommodate a blank entry to preserve the list ordering
     luni => {
@@ -589,6 +596,16 @@ my %unicodeString = (
         List => 1,
         Unknown => 1,
     },
+    lclr => {
+        Name => 'LayerColors',
+        Format => 'int16u',
+        Count => 1,
+        List => 1,
+        PrintConv => {
+            0=>'None',  1=>'Red',  2=>'Orange', 3=>'Yellow',
+            4=>'Green', 5=>'Blue', 6=>'Violet', 7=>'Gray',
+        },
+    },
     shmd => { # layer metadata (undocumented structure)
         # (for now, only extract layerTime.  May also contain "layerXMP" --
         #  it would be nice to decode this but I need a sample)
@@ -603,6 +620,13 @@ my %unicodeString = (
         ValueConv => 'length $val ? ConvertUnixTime($val,1) : ""',
         PrintConv => 'length $val ? $self->ConvertDateTime($val) : ""',
     },
+    lsct => {
+        Name => 'LayerSections',
+        Format => 'int32u',
+        Count => 1,
+        List => 1,
+        PrintConv => { 0 => 'Layer', 1 => 'Folder (open)', 2 => 'Folder (closed)', 3 => 'Divider' },
+    },
 );
 
 # tags extracted from ImageSourceData found in TIFF images (ref PH)
@@ -748,17 +772,16 @@ sub ProcessLayers($$$)
     my $pos = 0;
     return 0 if $dirLen < 2;
     $raf->Read($buff, 2) == 2 or return 0;
-    my $num = Get16s(\$buff, 0);
+    my $num = Get16s(\$buff, 0);    # number of layers
     $num = -$num if $num < 0;       # (first channel is transparency data if negative)
     $et->VerboseDir('Layers', $num, $dirLen);
     $et->HandleTag($tagTablePtr, '_xcnt', $num, Start => $pos, Size => 2, %dinfo); # LayerCount
     my $oldIndent = $$et{INDENT};
     $$et{INDENT} .= '| ';
-
     $pos += 2;
     my $psb = $$et{IsPSB};  # is PSB format?
     my $psiz = $psb ? 8 : 4;
-    for ($i=0; $i<$num; ++$i) {
+    for ($i=0; $i<$num; ++$i) { # process each layer
         $et->VPrint(0, $oldIndent.'+ [Layer '.($i+1)." of $num]\n");
         last if $pos + 18 > $dirLen;
         $raf->Read($buff, 18) == 18 or last;
@@ -776,6 +799,7 @@ sub ProcessLayers($$$)
         $sig =~ /^(8BIM|MIB8)$/ or last;    # verify signature
         $et->HandleTag($tagTablePtr, '_xbnd', undef, Start => 4, Size => 4, %dinfo);
         $et->HandleTag($tagTablePtr, '_xopc', undef, Start => 8, Size => 1, %dinfo);
+        $et->HandleTag($tagTablePtr, '_xvis', undef, Start =>10, Size => 1, %dinfo);
         my $nxt = $pos + 16 + Get32u(\$buff, 12);
         $n = Get32u(\$buff, 16);        # get size of layer mask data
         $pos += 20 + $n;                # skip layer mask data
@@ -823,7 +847,7 @@ sub ProcessLayers($$$)
                 $raf->Read($buff, $n) == $n or last;
                 $dinfo{DataPos} = $pos;
                 while ($count{$tag} < $i) {
-                    $et->HandleTag($tagTablePtr, $tag, '');
+                    $et->HandleTag($tagTablePtr, $tag, $tag eq 'lsct' ? 0 : '');
                     ++$count{$tag};
                 }
                 $et->HandleTag($tagTablePtr, $tag, undef, Start => 0, Size => $n, %dinfo);
@@ -840,6 +864,13 @@ sub ProcessLayers($$$)
         }
         $pos = $nxt;
     }
+    # pad lists if necessary to have an entry for each layer
+    foreach (sort keys %count) {
+        while ($count{$_} < $num) {
+            $et->HandleTag($tagTablePtr, $_, $_ eq 'lsct' ? 0 : '');
+            ++$count{$_};
+        }
+    }
     $$et{INDENT} = $oldIndent;
     return 1;
 }

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

@@ -419,6 +419,18 @@ my %channelLabel = (
     0x1ffff => 'Discrete_65535',
 );
 
+my %qtFlags = ( #12
+    0 => 'undef',       22 => 'unsigned int',   71 => 'float[2] size',
+    1 => 'UTF-8',       23 => 'float',          72 => 'float[4] rect',
+    2 => 'UTF-16',      24 => 'double',         74 => 'int64s',
+    3 => 'ShiftJIS',    27 => 'BMP',            75 => 'int8u',
+    4 => 'UTF-8 sort',  28 => 'QT atom',        76 => 'int16u',
+    5 => 'UTF-16 sort', 65 => 'int8s',          77 => 'int32u',
+    13 => 'JPEG',       66 => 'int16s',         78 => 'int64u',
+    14 => 'PNG',        67 => 'int32s',         79 => 'double[3][3]',
+    21 => 'signed int', 70 => 'float[2] point',
+);
+
 # properties which don't get inherited from the parent
 my %dontInherit = (
     ispe => 1,  # size of parent may be different
@@ -1159,7 +1171,10 @@ my %eeBox2 = (
         },
         {
             Name => 'GarminGPS',
-            Condition => '$$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and $$self{OPTIONS}{ExtractEmbedded}',
+            Condition => q{
+                $$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and
+                $$self{OPTIONS}{ExtractEmbedded}
+            },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::QuickTime::Stream',
                 ProcessProc => \&ProcessGarminGPS,
@@ -9656,6 +9671,7 @@ ItemID:         foreach $id (keys %$items) {
                             }
                         }
                         $langInfo or $langInfo = $tagInfo;
+                        my $str = $qtFlags{$flags} ? " ($qtFlags{$flags})" : '';
                         $et->VerboseInfo($tag, $langInfo,
                             Value   => ref $value ? $$value : $value,
                             DataPt  => \$val,
@@ -9664,7 +9680,7 @@ ItemID:         foreach $id (keys %$items) {
                             Size    => $len,
                             Format  => $format,
                             Index   => $index,
-                            Extra   => sprintf(", Type='${type}', Flags=0x%x, Lang=0x%.4x",$flags,$lang),
+                            Extra   => sprintf(", Type='${type}', Flags=0x%x%s, Lang=0x%.4x",$flags,$str,$lang),
                         ) if $verbose;
                         # use "Keys" in path instead of ItemList if this was defined by a Keys tag
                         my $isKey = $$tagInfo{Groups} && $$tagInfo{Groups}{1} && $$tagInfo{Groups}{1} eq 'Keys';

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -2924,6 +2924,7 @@ sub ProcessGarminGPS($$$)
     my $epoch = (66 * 365 + 17) * 24 * 3600; # time is relative to Jan 1, 1904
     my $scl = 180 / (32768 * 65536);         # scaling factor for lat/lon
     $et->VerboseDir('GarminGPS');
+    $$et{SET_GROUP1} = 'Garmin';
     while ($pos + 20 <= $dataLen) {
         $$et{DOC_NUM} = ++$$et{DOC_COUNT};
         my $time = Image::ExifTool::ConvertUnixTime(Get32u($dataPt, $pos) - $epoch) . 'Z';
@@ -2938,6 +2939,7 @@ sub ProcessGarminGPS($$$)
         $pos += 20;
     }
     delete $$et{DOC_NUM};
+    delete $$et{SET_GROUP1};
     return 1;
 }
 

data/bin/lib/Image/ExifTool/README

@@ -249,6 +249,13 @@ key:
                   within this atom.  Currently used only for Canon CNTH atom,
                   which contains garbage after the first contained atom.
 
+    NIKON_OFFSETS [Nikon Encrypted tables only] Pointer to int32u NumberOffsets
+                  for offset-type encrypted Nikon directories.  When set,
+                  directory and decryption lengths are calculated automatically.
+
+    ALLOW_REPROCESS Flag to allow reprocessing of another directory at this
+                  same location in the file, bypassing recursion avoidance test.
+
   DATAMEMBER : BinaryData tables only.  A reference to a list of sorted tag ID's
   which must be extracted as data members when writing.  Must also list "var_"
   format tags and tags with Hook so offsets are properly calculated if the table
@@ -713,7 +720,7 @@ numerical, and generated automatically otherwise.
                   BitShift are applied before evaluating RawConv.
 
   BitShift      : [Mask tags only] Bit shift for Mask-ed values.  If not
-                  specified, set to the number of trailing bits in the Mask.
+                  specified, set to the number of trailing zero bits in Mask.
                   When reading, the value is shifted right by this number of
                   bits after the Mask is applied.
 
@@ -1003,7 +1010,9 @@ numerical, and generated automatically otherwise.
                   current Base.  This is a Perl expression which may use
                   $valuePtr to represent the location of the tag value in the
                   file, or $val for the value itself.  If not specified, a Start
-                  of '$valuePtr' is assumed.
+                  of '$valuePtr' is assumed.  Subdirectories in BinaryData may
+                  also use $dirStart to represent the offset of the current
+                  directory start relative to the start of the data block.
 
      OffsetPt   : [EXIF directories only] If specified, this is a Perl
                   expression that gives the position of a 32-bit word in the

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.32';
+$VERSION = '1.33';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
@@ -255,6 +255,7 @@ $VERSION = '1.32';
     0x6023 => 'Sigma 20mm F2 DG DN | C', #IB
     0x6025 => 'Sigma 20mm F1.4 DG DN | A', #IB
     0x6026 => 'Sigma 24mm F1.4 DG DN | A', #IB
+    0x602c => "Sigma 50mm F1.4 DG DN | A (2023)", #IB
     0x8005 => 'Sigma 35mm F1.4 DG HSM | A', #PH (012)
     0x8009 => 'Sigma 18-35mm F1.8 DC HSM | A', #PH
     0x8900 => 'Sigma 70-300mm F4-5.6 DG OS', #PH (SD15)