exiftool_vendored 12.32.0 → 12.36.0

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

@@ -15,12 +15,12 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::JSON;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub ProcessCBOR($$$);
 sub ReadCBORValue($$$$);
 
-# optional CBOR type codes
+# optional CBOR type code
 my %cborType6 = (
     0 => 'date/time string',
     1 => 'epoch-based date/time',
@@ -78,6 +78,7 @@ sub ReadCBORValue($$$$)
     return(undef, 'Truncated CBOR data', $pos) if $pos >= $end;
     my $verbose = $$et{OPTIONS}{Verbose};
     my $indent = $$et{INDENT};
+    my $dumpStart = $pos;
     my $fmt = Get8u($dataPt, $pos++);
     my $dat = $fmt & 0x1f;
     my ($num, $val, $err, $size);
@@ -95,28 +96,22 @@ sub ReadCBORValue($$$$)
         $num = ReadValue($dataPt, $pos, $format, 1, $size);
         $pos += $size;
     }
-    my ($pre, $opt) = ('', ':');
-    if ($verbose and $fmt != 6) {
-        if (defined $$et{cbor_pre}) {
-            $pre = "$$et{cbor_pre}";
-            delete $$et{cbor_pre};
-        }
-        if (defined $$et{cbor_opt}) {
-            $opt = ", $$et{cbor_opt}:";
-            delete $$et{cbor_opt};
-        }
+    my $pre = '';
+    if (defined $$et{cbor_pre} and $fmt != 6) {
+        $pre = $$et{cbor_pre};
+        delete $$et{cbor_pre};
     }
     if ($fmt == 0) {            # positive integer
         $val = $num;
-        $et->VPrint(1, "$$et{INDENT} ${pre}int+$opt $val\n");
+        $et->VPrint(1, "$$et{INDENT} ${pre}int+: $val\n");
     } elsif ($fmt == 1) {       # negative integer
         $val = -1 * $num;
-        $et->VPrint(1, "$$et{INDENT} ${pre}int-$opt $val\n");
+        $et->VPrint(1, "$$et{INDENT} ${pre}int-: $val\n");
     } elsif ($fmt == 2 or $fmt == 3) {  # byte/UTF8 string
         return(undef, 'Truncated CBOR string value', $pos) if $pos + $num > $end;
         if ($num < 0) { # (should not happen in C2PA)
             my $string = '';
-            $$et{INDENT} .= '   ';
+            $$et{INDENT} .= '  ';
             for (;;) {
                 ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
                 return(undef, $err, $pos) if $err;
@@ -125,26 +120,34 @@ sub ReadCBORValue($$$$)
                 $string .= $val;
             }
             $$et{INDENT} = $indent;
-            return($string, undef, $pos);   # return concatenated strings
+            return($string, undef, $pos);   # return concatenated byte/text string
         } else {
             $val = substr($$dataPt, $pos, $num);
         }
         $pos += $num;
-        if ($fmt == 2) {
-            $et->VPrint(1, "$$et{INDENT} ${pre}byte$opt <binary data ".length($val)." bytes>\n");
-            return(\$val, undef, $pos);    # (byte string)
+        if ($fmt == 2) {    # (byte string)
+            $et->VPrint(1, "$$et{INDENT} ${pre}byte: <binary data ".length($val)." bytes>\n");
+            my $dat = $val;
+            $val = \$dat;   # use scalar reference for binary data
+        } else {            # (text string)
+            $val = $et->Decode($val, 'UTF8');
+            $et->VPrint(1, "$$et{INDENT} ${pre}text: '${val}'\n");
         }
-        $et->VPrint(1, "$$et{INDENT} ${pre}text$opt '${val}'\n");
     } elsif ($fmt == 4 or $fmt == 5) {  # list/hash
         if ($fmt == 4) {
-            $et->VPrint(1, "$$et{INDENT} ${pre}list$opt <$num elements>\n");
+            $et->VPrint(1, "$$et{INDENT} ${pre}list: <$num elements>\n");
         } else {
-            $et->VPrint(1, "$$et{INDENT} ${pre}hash$opt <$num pairs>\n");
+            $et->VPrint(1, "$$et{INDENT} ${pre}hash: <$num pairs>\n");
             $num *= 2;
         }
-        $$et{INDENT} .= '   ';
+        $$et{INDENT} .= '  ';
         my $i = 0;
         my @list;
+        Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+            Start   => $dumpStart,
+            DataPos => $$et{cbor_datapos},
+            Prefix  => $$et{INDENT},
+        ) if $verbose > 2;
         while ($num) {
             $$et{cbor_pre} = "$i) ";
             if ($fmt == 4) {
@@ -162,6 +165,7 @@ sub ReadCBORValue($$$$)
             push @list, $val;
             --$num;
         }
+        $dumpStart = $pos;
         $$et{INDENT} = $indent;
         if ($fmt == 5) {
             my ($i, @keys);
@@ -174,9 +178,40 @@ sub ReadCBORValue($$$$)
         } else {
             $val = \@list;
         }
-    } elsif ($fmt == 6) {       # optional type
-        $$et{cbor_opt} = $cborType6{$num} || "<unknown type $num>";
+    } elsif ($fmt == 6) {       # optional tag
+        if ($verbose) {
+            my $str = "$num (" . ($cborType6{$num} || 'unknown') . ')';
+            my $spc = $$et{cbor_pre} ? (' ' x length $$et{cbor_pre}) : '';
+            $et->VPrint(1, "$$et{INDENT} $spc<CBOR optional type $str>\n");
+            Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+                Start   => $dumpStart,
+                DataPos => $$et{cbor_datapos},
+                Prefix  => $$et{INDENT} . '  ',
+            ) if $verbose > 2;
+        }
+        # read next value (note: in the case of multiple tags,
+        # this nesting will apply the tags in the correct order)
         ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
+        $dumpStart = $pos;
+        # convert some values according to the optional tag number (untested)
+        if ($num == 0 and not ref $val) {       # date/time string
+            require Image::ExifTool::XMP;
+            $val = Image::ExifTool::XMP::ConvertXMPDate($val);
+        } elsif ($num == 1 and not ref $val) {  # epoch-based date/time
+            if (Image::ExifTool::IsFloat($val)) {
+                my $dec = ($val == int($val)) ? undef : 6;
+                $val = Image::ExifTool::ConvertUnixTime($val, 1, $dec);
+            }
+        } elsif (($num == 2 or $num == 3) and ref($val) eq 'SCALAR') { # pos/neg bignum
+            my $big = 0;
+            $big = 256 * $big + Get8u($val,$_) foreach 0..(length($$val) - 1);
+            $val = $num==2 ? $big : -$big;
+        } elsif (($num == 4 or $num == 5) and # decimal fraction or bigfloat
+            ref($val) eq 'ARRAY' and @$val == 2 and
+            Image::ExifTool::IsInt($$val[0]) and Image::ExifTool::IsInt($$val[1]))
+        {
+            $val = $$val[1] * ($num == 4 ? 10 : 2) ** $$val[0];
+        }
     } elsif ($fmt == 7) {       
         if ($dat == 31) {
             undef $val; # "break" = end of indefinite array/hash (not used in C2PA)
@@ -202,10 +237,16 @@ sub ReadCBORValue($$$$)
         } else {
             return(undef, "Invalid CBOR type 7 variant $num", $pos);
         }
-        $et->VPrint(1, "$$et{INDENT} ${pre}typ7$opt ".(defined $val ? $val : '<break>')."\n");
+        $et->VPrint(1, "$$et{INDENT} ${pre}typ7: ".(defined $val ? $val : '<break>')."\n");
     } else {
         return(undef, "Unknown CBOR format $fmt", $pos);
     }
+    Image::ExifTool::HexDump($dataPt, $pos - $dumpStart,
+        Start   => $dumpStart,
+        DataPos => $$et{cbor_datapos},
+        Prefix  => $$et{INDENT} . '  ',
+        MaxLen  => $verbose < 5 ? ($verbose == 3 ? 96 : 2048) : undef,
+    ) if $verbose > 2;
     return($val, $err, $pos);
 }
 
@@ -219,15 +260,28 @@ sub ProcessCBOR($$$)
     my $dataPt = $$dirInfo{DataPt};
     my $pos = $$dirInfo{DirStart};
     my $end = $pos + $$dirInfo{DirLen};
+    my ($val, $err, $tag, $i);
+
     $et->VerboseDir('CBOR', undef, $$dirInfo{DirLen});
-    my ($val, $err, $tag);
-    require Image::ExifTool::CBOR;
+
+    $$et{cbor_datapos} = $$dirInfo{DataPos} + $$dirInfo{Base};
+
     while ($pos < $end) {
         ($val, $err, $pos) = ReadCBORValue($et, $dataPt, $pos, $end);
         $err and $et->Warn($err), last;
-        ref $val eq 'HASH' or $et->VPrint(1, "$$et{INDENT} CBOR end: Non-hash encountered\n"), last;
-        foreach $tag (@{$$val{_ordered_keys_}}) {
-            Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, $tag, $$val{$tag});
+        if (ref $val eq 'HASH') {
+            foreach $tag (@{$$val{_ordered_keys_}}) {
+                Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, $tag, $$val{$tag});
+            }
+        } elsif (ref $val eq 'ARRAY') {
+            for ($i=0; $i<@$val; ++$i) {
+                Image::ExifTool::JSON::ProcessTag($et, $tagTablePtr, "Item$i", $$val[$i]);
+            }
+        } elsif ($val eq '0') {
+            $et->VPrint(1, "$$et{INDENT} <CBOR end>\n");
+            last;   # (treat as padding)
+        } else {
+            $et->VPrint(1, "$$et{INDENT} Unknown value: $val\n");
         }
     }
     return 1;

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.51';
+$VERSION = '4.54';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -187,7 +187,7 @@ $VERSION = '4.51';
     37.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)', #38
     37.3 => 'Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]', #34
     37.4 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro', #forum2937
-    38 => 'Canon EF 80-200mm f/4.5-5.6', #32
+    38 => 'Canon EF 80-200mm f/4.5-5.6 II', #32 (II added ref https://github.com/Exiv2/exiv2/issues/1906)
     39 => 'Canon EF 75-300mm f/4-5.6',
     40 => 'Canon EF 28-80mm f/3.5-5.6',
     41 => 'Canon EF 28-90mm f/4-5.6', #32
@@ -595,6 +595,10 @@ $VERSION = '4.51';
    '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.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
@@ -950,6 +954,7 @@ $VERSION = '4.51';
     0x80000435 => 'EOS Rebel T8i / 850D / X10i', #JR/PH
     0x80000436 => 'EOS SL3 / 250D / Kiss X10', #25
     0x80000437 => 'EOS 90D', #IB
+    0x80000450 => 'EOS R3', #42
     0x80000453 => 'EOS R6', #PH
     0x80000467 => 'PowerShot ZOOM',
     0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
@@ -6731,7 +6736,17 @@ my %ciMaxFocal = (
         PrintConvInv => '$val =~ s/ ?m$//; IsFloat($val) ? $val : 655.35',
     },
     # 22 - values: 0, 1
-    # 23 - values: 0, 21, 22
+    23 => { #JohnMoyer (forum12925)
+        Name => 'ShutterMode',
+        PrintConv => {
+            0 => 'Mechanical',
+            1 => 'Electronic First Curtain',
+            2 => 'Electronic',
+            # 3 => ?
+            # 21 => ?
+            # 22 => ?
+        },
+    },
     25 => { #PH
         Name => 'FlashExposureLock',
         PrintConv => \%offOn,
@@ -6765,6 +6780,10 @@ my %ciMaxFocal = (
             278 => 'Canon RF 70-200mm F4L IS USM', #42
             280 => 'Canon RF 50mm F1.8 STM', #42
             281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
+            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)
+            288 => 'Canon RF 16mm F2.8 STM', #42
            #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
@@ -8740,6 +8759,7 @@ my %filterConv = (
     #        --> ignored when reading, but offsets are updated when writing
     CMT1 => { # (CR3 files)
         Name => 'IFD0',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8748,6 +8768,7 @@ my %filterConv = (
     },
     CMT2 => { # (CR3 files)
         Name => 'ExifIFD',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8756,6 +8777,7 @@ my %filterConv = (
     },
     CMT3 => { # (CR3 files)
         Name => 'MakerNoteCanon',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
             ProcessProc => \&ProcessCMT3,
@@ -8764,6 +8786,7 @@ my %filterConv = (
     },
     CMT4 => { # (CR3 files)
         Name => 'GPSInfo',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::GPS::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -8774,6 +8797,7 @@ my %filterConv = (
     THMB => {
         Name => 'ThumbnailImage',
         Groups => { 2 => 'Preview' },
+        PreservePadding => 1,
         RawConv => 'substr($val, 16)',
         Binary => 1,
     },
@@ -8788,6 +8812,7 @@ my %filterConv = (
     WRITE_PROC => 'Image::ExifTool::QuickTime::WriteQuickTime',
     CNOP => {
         Name => 'CanonVRD',
+        PreservePadding => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::CanonVRD::Main',
             WriteProc => 'Image::ExifTool::CanonVRD::WriteCanonDR4',

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

@@ -6,6 +6,8 @@
 # Revisions:    2009/08/28 - P. Harvey created
 #               2010/01/20 - P. Harvey complete re-write
 #               2010/07/16 - P. Harvey added UTF-16 support
+#
+# Notes:        Charset lookups are generated using my convertCharset script
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Charset;

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.36';
+$VERSION = '4.38';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -265,6 +265,7 @@ sub BINARY_DATA_LIMIT { return 10 * 1024 * 1024; }
     32892 => 'Sequential Color Filter', #JR (Sony ARQ)
     34892 => 'Linear Raw', #2
     51177 => 'Depth Map', # (DNG 1.5)
+    52527 => 'Semantic Mask', # (DNG 1.6)
 );
 
 %orientation = (
@@ -291,6 +292,7 @@ sub BINARY_DATA_LIMIT { return 10 * 1024 * 1024; }
     9 => 'Depth map of reduced-resolution image', # (DNG 1.5)
     16 => 'Enhanced image data', # (DNG 1.5)
     0x10001 => 'Alternate reduced-resolution image', # (DNG 1.2)
+    0x10004 => 'Semantic Mask', # (DNG 1.6)
     0xffffffff => 'invalid', #(found in E5700 NEF's)
     BITMASK => {
         0 => 'Reduced resolution',
@@ -366,6 +368,7 @@ my %opcodeInfo = (
         11 => 'DeltaPerColumn',
         12 => 'ScalePerRow',
         13 => 'ScalePerColumn',
+        14 => 'WarpRectilinear2', # (DNG 1.6)
     },
     PrintConvInv => undef,  # (so the inverse conversion is not performed)
 );
@@ -3038,12 +3041,12 @@ my %opcodeInfo = (
         },
     },
 #
-# DNG tags 0xc6XX and 0xc7XX (ref 2 unless otherwise stated)
+# DNG tags 0xc6XX, 0xc7XX and 0xcdXX (ref 2 unless otherwise stated)
 #
     0xc612 => {
         Name => 'DNGVersion',
         Notes => q{
-            tags 0xc612-0xc7b5 are defined by the DNG specification unless otherwise
+            tags 0xc612-0xcd3b are defined by the DNG specification unless otherwise
             noted.  See L<https://helpx.adobe.com/photoshop/digital-negative.html> for
             the specification
         },
@@ -4041,6 +4044,97 @@ my %opcodeInfo = (
         Protected => 1,
         WriteGroup => 'IFD0',
     },
+    0xcd2d => { # DNG 1.6
+        Name => 'ProfileGainTableMap',
+        Writable => 'undef',
+        WriteGroup => 'SubIFD',
+        Protected => 1,
+        Binary => 1,
+    },
+    0xcd2e => { # DNG 1.6
+        Name => 'SemanticName',
+      # Writable => 'string',
+        WriteGroup => 'SubIFD' #? (NC) Semantic Mask IFD (only for Validate)
+    },
+    0xcd30 => { # DNG 1.6
+        Name => 'SemanticInstanceIFD',
+      # Writable => 'string',
+        WriteGroup => 'SubIFD' #? (NC) Semantic Mask IFD (only for Validate)
+    },
+    0xcd31 => { # DNG 1.6
+        Name => 'CalibrationIlluminant3',
+        Writable => 'int16u',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+        SeparateTable => 'LightSource',
+        PrintConv => \%lightSource,
+    },
+    0xcd32 => { # DNG 1.6
+        Name => 'CameraCalibration3',
+        Writable => 'rational64s',
+        WriteGroup => 'IFD0',
+        Count => -1,
+        Protected => 1,
+    },
+    0xcd33 => { # DNG 1.6
+        Name => 'ColorMatrix3',
+        Writable => 'rational64s',
+        WriteGroup => 'IFD0',
+        Count => -1,
+        Protected => 1,
+    },
+    0xcd34 => { # DNG 1.6
+        Name => 'ForwardMatrix3',
+        Writable => 'rational64s',
+        WriteGroup => 'IFD0',
+        Count => -1,
+        Protected => 1,
+    },
+    0xcd35 => { # DNG 1.6
+        Name => 'IlluminantData1',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+    },
+    0xcd36 => { # DNG 1.6
+        Name => 'IlluminantData2',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+    },
+    0xcd37 => { # DNG 1.6
+        Name => 'IlluminantData3',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+    },
+    0xcd38 => { # DNG 1.6
+        Name => 'MaskSubArea',
+      # Writable => 'int32u',
+        WriteGroup => 'SubIFD', #? (NC) Semantic Mask IFD (only for Validate)
+        Count => 4,
+    },
+    0xcd39 => { # DNG 1.6
+        Name => 'ProfileHueSatMapData3',
+        %longBin,
+        Writable => 'float',
+        WriteGroup => 'IFD0',
+        Count => -1,
+        Protected => 1,
+    },
+    0xcd3a => { # DNG 1.6
+        Name => 'ReductionMatrix3',
+        Writable => 'rational64s',
+        WriteGroup => 'IFD0',
+        Count => -1,
+        Protected => 1,
+    },
+    0xcd3b => { # DNG 1.6
+        Name => 'RGBTables',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+    },
     0xea1c => { #13
         Name => 'Padding',
         Binary => 1,
@@ -4722,11 +4816,23 @@ my %subSecConv = (
     },
     GPSPosition => {
         Groups => { 2 => 'Location' },
+        Writable => 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',
+        },
         Require => {
             0 => 'GPSLatitude',
             1 => 'GPSLongitude',
         },
         Priority => 0,
+        Notes => q{
+            when written, writes GPSLatitude, GPSLatitudeRef, GPSLongitude and
+            GPSLongitudeRef.  This tag may be written using the same coordinate
+            format as provided by Google Maps when right-clicking on a location
+        },
         ValueConv => '(length($val[0]) or length($val[1])) ? "$val[0] $val[1]" : undef',
         PrintConv => '"$prt[0], $prt[1]"',
     },

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.18';
+$VERSION = '1.19';
 
 sub ProcessFLIR($$;$);
 sub ProcessFLIRText($$$);
@@ -99,7 +99,7 @@ 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.
+        SEQ file, or all frames if the ExtractEmbedded option is used.
     },
     "_header" => {
         Name => 'FFFHeader',
@@ -1457,6 +1457,7 @@ sub ProcessFLIR($$;$)
     my $raf = $$dirInfo{RAF} || new File::RandomAccess($$dirInfo{DataPt});
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
+    my $base = $raf->Tell();
     my ($i, $hdr, $buff, $rec);
 
     # read and verify FFF header
@@ -1485,15 +1486,18 @@ sub ProcessFLIR($$;$)
         my $ver = Get32u(\$hdr, 0x14);
         last if $ver >= 100 and $ver < 200; # (have seen 100 and 101 - PH)
         ToggleByteOrder();
-        $i and $et->Warn("Unsupported FLIR $type version"), return 1;
+        next unless $i;
+        return 0 if $$et{DOC_NUM};
+        $et->Warn("Unsupported FLIR $type version");
+        return 1;
     }
 
     # read the FLIR record directory
     my $pos = Get32u(\$hdr, 0x18);
     my $num = Get32u(\$hdr, 0x1c);
-    unless ($raf->Seek($pos) and $raf->Read($buff, $num * 0x20) == $num * 0x20) {
+    unless ($raf->Seek($base+$pos) and $raf->Read($buff, $num * 0x20) == $num * 0x20) {
         $et->Warn('Truncated FLIR FFF directory');
-        return 1;
+        return $$et{DOC_NUM} ? 0 : 1;
     }
 
     unless ($tagTablePtr) {
@@ -1504,6 +1508,7 @@ sub ProcessFLIR($$;$)
     # process the header data
     $et->HandleTag($tagTablePtr, '_header', $hdr);
 
+    my $success = 1;
     my $oldIndent = $$et{INDENT};
     $$et{INDENT} .= '| ';
     $et->VerboseDir($type, $num);
@@ -1533,12 +1538,22 @@ sub ProcessFLIR($$;$)
         $verbose and printf $out "%s%d) FLIR Record 0x%.2x, offset 0x%.4x, length 0x%.4x\n",
                                  $$et{INDENT}, $i, $recType, $recPos, $recLen;
 
-        unless ($raf->Seek($recPos) and $raf->Read($rec, $recLen) == $recLen) {
-            $et->Warn('Invalid FLIR record');
+        # skip RawData records for embedded documents
+        if ($recType == 1 and $$et{DOC_NUM}) {
+            $raf->Seek($base+$recPos+$recLen) or $success = 0, last;
+            next;
+        }
+        unless ($raf->Seek($base+$recPos) and $raf->Read($rec, $recLen) == $recLen) {
+            if ($$et{DOC_NUM}) {
+                $success = 0;   # abort processing more documents
+            } else {
+                $et->Warn('Invalid FLIR record');
+            }
             last;
         }
         if ($$tagTablePtr{$recType}) {
             $et->HandleTag($tagTablePtr, $recType, undef,
+                Base    => $base,
                 DataPt  => \$rec,
                 DataPos => $recPos,
                 Start   => 0,
@@ -1550,7 +1565,17 @@ sub ProcessFLIR($$;$)
     }
     delete $$et{SET_GROUP0};
     $$et{INDENT} = $oldIndent;
-    return 1;
+
+    # extract information from subsequent frames in SEQ file if ExtractEmbedded is used
+    if ($$dirInfo{RAF} and $et->Options('ExtractEmbedded') and not $$et{DOC_NUM}) {
+        for (;;) {
+            $$et{DOC_NUM} = $$et{DOC_COUNT} + 1;
+            last unless ProcessFLIR($et, $dirInfo, $tagTablePtr);
+            # (DOC_COUNT will be incremented automatically if we extracted any tags)
+        }
+        delete $$et{DOC_NUM};
+    }
+    return $success;
 }
 
 #------------------------------------------------------------------------------