exiftool_vendored 12.55.0 → 12.56.0

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

@@ -4,6 +4,7 @@
 # Description:  Read OpenEXR meta information
 #
 # Revisions:    2011/12/10 - P. Harvey Created
+#               2023/01/31 - PH Added support for multipart images
 #
 # References:   1) http://www.openexr.com/
 #------------------------------------------------------------------------------
@@ -15,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -47,14 +48,18 @@ my %formatType = (
 %Image::ExifTool::OpenEXR::Main = (
     GROUPS => { 2 => 'Image' },
     NOTES => q{
-        Information extracted from EXR images.  See L<http://www.openexr.com/> for
-        the official specification.
+        Information extracted from EXR images.  Use the ExtractEmbedded option to
+        extract information from all frames of a multipart image.  See
+        L<http://www.openexr.com/> for the official specification.
     },
-    _ver => { Name => 'EXRVersion' },
-    _lay => {
-        Name => 'Layout',
-        PrintHex => 1,
-        PrintConv => { 0 => 'Scan Lines', 0x200 => 'Tiles' },
+    _ver => { Name => 'EXRVersion', Notes => 'low byte of Flags word' },
+    _flags => { Name => 'Flags', 
+        PrintConv => { BITMASK => {
+            9 => 'Tiled',
+            10 => 'Long names',
+            11 => 'Deep data',
+            12 => 'Multipart',
+        }},
     },
     adoptedNeutral      => { },
     altitude => {
@@ -145,6 +150,10 @@ my %formatType = (
     worldToNDC          => { },
     wrapmodes           => { Name => 'WrapModes' },
     xDensity            => { Name => 'XResolution' },
+    name                => { },
+    type                => { },
+    version             => { },
+    chunkCount          => { },
     # also observed:
     # ilut
 );
@@ -169,15 +178,22 @@ sub ProcessEXR($$)
     my $tagTablePtr = GetTagTable('Image::ExifTool::OpenEXR::Main');
 
     # extract information from header
-    my $ver = unpack('x4V', $buff);
-    $et->HandleTag($tagTablePtr, '_ver', $ver & 0xff);
-    $et->HandleTag($tagTablePtr, '_lay', $ver & 0x200);
-    my $maxLen = ($ver & 0x400) ? 255 : 31;
+    my $flags = unpack('x4V', $buff);
+    $et->HandleTag($tagTablePtr, '_ver', $flags & 0xff);
+    $et->HandleTag($tagTablePtr, '_flags', $flags & 0xffffff00);
+    my $maxLen = ($flags & 0x400) ? 255 : 31;
+    my $multi = $flags & 0x1000;
 
     # extract attributes
     for (;;) {
-        $raf->Read($buff, 68) or last;
-        last if $buff =~ /^\0/;
+        $raf->Read($buff, ($maxLen + 1) * 2 + 5) or last;
+        if ($buff =~ /^\0/) {
+            last unless $multi and $et->Options('ExtractEmbedded');
+            # remove null and process the next frame header as a sub-document
+            # (second null is end of all headers)
+            last if $buff =~ s/^(\0+)// and length($1) > 1;
+            $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+        }
         unless ($buff =~ /^([^\0]{1,$maxLen})\0([^\0]{1,$maxLen})\0(.{4})/sg) {
             $et->Warn('EXR format error');
             last;
@@ -261,7 +277,7 @@ sub ProcessEXR($$)
 
         # take image dimensions from dataWindow (with displayWindow as backup)
         if (($tag eq 'dataWindow' or (not $dim and $tag eq 'displayWindow')) and
-            $val =~ /^(-?\d+) (-?\d+) (-?\d+) (-?\d+)$/)
+            $val =~ /^(-?\d+) (-?\d+) (-?\d+) (-?\d+)$/ and not $$et{DOC_NUM})
         {
             $dim = [$3 - $1 + 1, $4 - $2 + 1];
         }
@@ -278,6 +294,7 @@ sub ProcessEXR($$)
         }
         $et->FoundTag($tagInfo, $val);
     }
+    delete $$et{DOC_NUM};
     if ($dim) {
         $et->FoundTag('ImageWidth', $$dim[0]);
         $et->FoundTag('ImageHeight', $$dim[1]);

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.61';
+$VERSION = '1.62';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -343,7 +343,12 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
         Name => 'JUMBF',
         SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
     },
-    # cICP - Coding-independent code points (added in 2022 specification)
+    cICP => {
+        Name => 'CICodePoints',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::PNG::CICodePoints',
+        },
+    },
 );
 
 # PNG IHDR chunk
@@ -428,6 +433,79 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
     },
 );
 
+# PNG cICP chunk
+%Image::ExifTool::PNG::CICodePoints = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 1 => 'PNG-cICP', 2 => 'Image' },
+    NOTES => q{
+        These tags are found in the PNG cICP chunk and belong to the PNG-cICP family
+        1 group.
+    },
+    # (same as tags in QuickTime::ColorRep)
+    0 => {
+        Name => 'ColorPrimaries',
+        PrintConv => {
+            1 => 'BT.709',
+            2 => 'Unspecified',
+            4 => 'BT.470 System M (historical)',
+            5 => 'BT.470 System B, G (historical)',
+            6 => 'BT.601',
+            7 => 'SMPTE 240',
+            8 => 'Generic film (color filters using illuminant C)',
+            9 => 'BT.2020, BT.2100',
+            10 => 'SMPTE 428 (CIE 1921 XYZ)',
+            11 => 'SMPTE RP 431-2',
+            12 => 'SMPTE EG 432-1',
+            22 => 'EBU Tech. 3213-E',
+        },
+    },
+    1 => {
+        Name => 'TransferCharacteristics',
+        PrintConv => {
+            0 => 'For future use (0)',
+            1 => 'BT.709',
+            2 => 'Unspecified',
+            3 => 'For future use (3)',
+            4 => 'BT.470 System M (historical)',
+            5 => 'BT.470 System B, G (historical)',
+            6 => 'BT.601',
+            7 => 'SMPTE 240 M',
+            8 => 'Linear',
+            9 => 'Logarithmic (100 : 1 range)',
+            10 => 'Logarithmic (100 * Sqrt(10) : 1 range)',
+            11 => 'IEC 61966-2-4',
+            12 => 'BT.1361',
+            13 => 'sRGB or sYCC',
+            14 => 'BT.2020 10-bit systems',
+            15 => 'BT.2020 12-bit systems',
+            16 => 'SMPTE ST 2084, ITU BT.2100 PQ',
+            17 => 'SMPTE ST 428',
+            18 => 'BT.2100 HLG, ARIB STD-B67',
+        },
+    },
+    2 => {
+        Name => 'MatrixCoefficients',
+        PrintConv => {
+            0 => 'Identity matrix',
+            1 => 'BT.709',
+            2 => 'Unspecified',
+            3 => 'For future use (3)',
+            4 => 'US FCC 73.628',
+            5 => 'BT.470 System B, G (historical)',
+            6 => 'BT.601',
+            7 => 'SMPTE 240 M',
+            8 => 'YCgCo',
+            9 => 'BT.2020 non-constant luminance, BT.2100 YCbCr',
+            10 => 'BT.2020 constant luminance',
+            11 => 'SMPTE ST 2085 YDzDx',
+            12 => 'Chromaticity-derived non-constant luminance',
+            13 => 'Chromaticity-derived constant luminance',
+            14 => 'BT.2100 ICtCp',
+        },
+    },
+    3 => 'VideoFullRangeFlag',
+);
+
 # PNG sCAL chunk
 %Image::ExifTool::PNG::SubjectScale = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

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

@@ -81,12 +81,15 @@ my %processByMetaFormat = (
     ctbx => 1,  # ('marl' in GM videos)
 );
 
-# data lengths for each INSV record type
+# data lengths for each INSV/INSP record type
 my %insvDataLen = (
+    0x200 => 0,     # PreivewImage (any size) (a duplicate of PreviewImage in APP2 of INSP files)
     0x300 => 0,     # accelerometer (could be either 20 or 56 bytes)
     0x400 => 16,    # exposure (ref 6)
     0x600 => 8,     # timestamps (ref 6)
     0x700 => 53,    # GPS
+  # 0x900 => 48,    # ? (Insta360 X3)
+  # 0xb00 => 10,    # ? (Insta360 X3)
 );
 
 # limit the default amount of data we read for some record types
@@ -2758,7 +2761,6 @@ sub ProcessInsta360($;$)
         my ($id, $len) = unpack('vV', $buff);
         ($epos -= $len) + $trailerLen < 0 and last;
         $raf->Seek($epos, 2) or last;
-        my $dlen = $insvDataLen{$id};
         if ($verbose) {
             $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $fileEnd + $epos, $len));
         }
@@ -2771,20 +2773,25 @@ sub ProcessInsta360($;$)
         # 2. 20 byte records
         # 0000: c1 d8 d9 0b 00 00 00 00 f5 83 14 80 df 7f fe 7f [................]
         # 0010: fe 7f 01 80
-        if ($id == 0x300) {
-            if ($len % 20 and not $len % 56) {
-                $dlen = 56;
-            } elsif ($len % 56 and not $len % 20) {
-                $dlen = 20;
-            } else {
-                if ($raf->Read($buff, 20) == 20) {
-                    if (substr($buff, 16, 3) eq "\0\0\0") {
-                        $dlen = 56;
-                    } else {
-                        $dlen = 20;
+        my $dlen = $insvDataLen{$id};
+        if (defined $dlen and not $dlen) {
+            if ($id == 0x300) {
+                if ($len % 20 and not $len % 56) {
+                    $dlen = 56;
+                } elsif ($len % 56 and not $len % 20) {
+                    $dlen = 20;
+                } else {
+                    if ($raf->Read($buff, 20) == 20) {
+                        if (substr($buff, 16, 3) eq "\0\0\0") {
+                            $dlen = 56;
+                        } else {
+                            $dlen = 20;
+                        }
                     }
+                    $raf->Seek($epos, 2) or last;
                 }
-                $raf->Seek($epos, 2) or last;
+            } elsif ($id == 0x200) {
+                $dlen = $len;
             }
         }
         # limit the number of records we read if necessary
@@ -2798,6 +2805,8 @@ sub ProcessInsta360($;$)
         if ($dlen) {
             if ($len % $dlen) {
                 $et->Warn(sprintf('Unexpected Insta360 record 0x%x length',$id));
+            } elsif ($id == 0x200) {
+                $et->FoundTag(PreviewImage => $buff);
             } elsif ($id == 0x300) {
                 for ($p=0; $p<$len; $p+=$dlen) {
                     $$et{DOC_NUM} = ++$$et{DOC_COUNT};

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ProcessRealMeta($$$);
 sub ProcessRealProperties($$$);
@@ -608,7 +608,7 @@ sub ProcessReal($$)
         } else {
             last if $tag eq 'DATA'; # stop normal parsing at DATA tag
         }
-        if ($size & 0x80000000) {
+        if ($size & 0x80000000 or $size < 10) {
             $et->Warn('Bad chunk header');
             last;
         }

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.56';
+$VERSION = '3.57';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -160,6 +160,7 @@ sub PrintInvLensSpec($;$$);
     32875 => 'Sony FE 24-70mm F2.8 GM II', #JR
     32876 => 'Sony E 11mm F1.8', #JR
     32877 => 'Sony E 15mm F1.4 G', #JR
+    32878 => 'Sony FE 20-70mm F4 G', #JR
 
   # (comment this out so LensID will report the LensModel, which is more useful)
   # 32952 => 'Metabones Canon EF Speed Booster Ultra', #JR (corresponds to 184, but 'Advanced' mode, LensMount reported as E-mount)
@@ -191,6 +192,7 @@ sub PrintInvLensSpec($;$$);
     49235 => 'Zeiss Loxia 85mm F2.4', #JR
     49236 => 'Zeiss Loxia 25mm F2.4', #JR
 
+    49456 => 'Tamron E 18-200mm F3.5-6.3 Di III VC', #FrancoisPiette
     49457 => 'Tamron 28-75mm F2.8 Di III RXD', #JR (Model A036)
     49458 => 'Tamron 17-28mm F2.8 Di III RXD', #JR (Model A046)
     49459 => 'Tamron 35mm F2.8 Di III OSD M1:2', #IB (Model F053)
@@ -256,6 +258,8 @@ sub PrintInvLensSpec($;$$);
     50533 => 'Sigma 16-28mm F2.8 DG DN | C', #JR (022)
     50534 => 'Sigma 20mm F1.4 DG DN | A', #JR (022)
     50535 => 'Sigma 24mm F1.4 DG DN | A', #JR (022)
+    50536 => 'Sigma 60-600mm F4.5-6.3 DG DN OS | S', #JR (023)
+    50539 => 'Sigma 50mm F1.4 DG DN | A', #JR (023)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB