exiftool-vendored.pl 13.17.0 → 13.25.0

package/bin/lib/Image/ExifTool/Trailer.pm

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::Trailer::Vivo = (
     GROUPS => { 0 => 'Trailer', 1 => 'Vivo', 2 => 'Image' },
@@ -214,7 +214,7 @@ sub ProcessGoogle($$)
 
     delete $$et{ProcessGoogleTrailer};  # reset flag to process the Google trailer
 
-    return -1 if $$dirInfo{OutFile};
+    return -1 if $$dirInfo{OutFile};    # let caller handle the writing
 
     # sometimes DirectoryItemLength is missing the Primary entry
     $len = [ $len ] unless ref $len eq 'ARRAY';
@@ -271,7 +271,7 @@ sub ProcessGoogle($$)
             DataPos => $start + $pos,
             DirLen  => $$len[$i],
         });
-        $et->HandleTag($tagTable, $$tag[$i], \$buff, { DataPos => $start + $pos, DataPt => \$buff });
+        $et->HandleTag($tagTable, $$tag[$i], \$buff, DataPos => $start + $pos, DataPt => \$buff);
         # (haven't seen non-zero padding, but I assume this is how it works
         $pos += $$len[$i] + (($pad and $$pad[$i]) ? $$pad[$i] : 0);
     }

package/bin/lib/Image/ExifTool/Validate.pm

@@ -188,10 +188,10 @@ my %validValue = (
             0x115 => undef,     # SamplesPerPixel
             0x116 => undef,     # RowsPerStrip
             0x117 => undef,     # StripByteCounts
-            0x11a => 'defined $val',        # XResolution
-            0x11b => 'defined $val',        # YResolution
+            # (optional as of 3.0) 0x11a => 'defined $val',        # XResolution
+            # (optional as of 3.0) 0x11b => 'defined $val',        # YResolution
             0x11c => undef,     # PlanarConfiguration
-            0x128 => '$val =~ /^[123]$/',   # ResolutionUnit
+            # (optional as of 3.0) 0x128 => '$val =~ /^[123]$/',   # ResolutionUnit
             0x201 => undef,     # JPEGInterchangeFormat
             0x202 => undef,     # JPEGInterchangeFormatLength
             0x212 => undef,     # YCbCrSubSampling
@@ -218,7 +218,7 @@ my %validValue = (
         ExifIFD => {
             0x9000 => 'defined $val and $val =~ /^\d{4}$/', # ExifVersion
             0x9101 => 'defined $val',       # ComponentsConfiguration
-            0xa000 => 'defined $val',       # FlashpixVersion
+            # (optional as of 3.0) 0xa000 => 'defined $val',       # FlashpixVersion
             0xa001 => '$val == 1 or $val == 0xffff',    # ColorSpace
             0xa002 => 'defined $val',       # PixelXDimension
             0xa003 => 'defined $val',       # PixelYDimension

package/bin/lib/Image/ExifTool/WriteCanonRaw.pl

@@ -566,7 +566,7 @@ sub WriteCRW($$)
     my $trailPt;
     while ($success) {
         # check to see if trailer(s) exist(s)
-        my $trailInfo = Image::ExifTool::IdentifyTrailer($raf) or last;
+        my $trailInfo = $et->IdentifyTrailer($raf) or last;
         # rewrite the trailer(s)
         $buff = '';
         $$trailInfo{OutFile} = \$buff;

package/bin/lib/Image/ExifTool/WriteExif.pl

@@ -25,9 +25,9 @@ my %crossDelete = (
 # mandatory tag default values
 my %mandatory = (
     IFD0 => {
-        0x011a => 72,       # XResolution
-        0x011b => 72,       # YResolution
-        0x0128 => 2,        # ResolutionUnit (inches)
+      # (optional as of 3.0)  0x011a => 72,       # XResolution
+      # (optional as of 3.0)  0x011b => 72,       # YResolution
+      # (optional as of 3.0)  0x0128 => 2,        # ResolutionUnit (inches)
         0x0213 => 1,        # YCbCrPositioning (centered)
       # 0x8769 => ????,     # ExifOffset
     },
@@ -40,7 +40,7 @@ my %mandatory = (
     ExifIFD => {
         0x9000 => '0232',   # ExifVersion
         0x9101 => "1 2 3 0",# ComponentsConfiguration
-        0xa000 => '0100',   # FlashpixVersion
+      # (optional as of 3.0)  0xa000 => '0100',   # FlashpixVersion
         0xa001 => 0xffff,   # ColorSpace (uncalibrated)
       # 0xa002 => ????,     # ExifImageWidth
       # 0xa003 => ????,     # ExifImageHeight
@@ -2269,6 +2269,11 @@ NoOverwrite:            next if $isNew > 0;
             # build list of offsets to process
             my @offsetList;
             if ($ifd >= 0) {
+                $dirName = $$dirInfo{DirName} || 'unknown';
+                if ($ifd) {
+                    $dirName =~ s/\d+$//;
+                    $dirName .= $ifd;
+                }
                 my $offsetInfo = $offsetInfo[$ifd] or next;
                 if ($$offsetInfo{0x111} and $$offsetInfo{0x144}) {
                     # SubIFD may contain double-referenced data as both strips and tiles

package/bin/lib/Image/ExifTool/WritePDF.pl

@@ -546,7 +546,7 @@ sub WritePDF($$)
     }
     if ($metaChanged) {
         if ($newXMP) {
-            unless ($metaRef) {
+            unless (ref $metaRef) {
                 # allocate new PDF object
                 $metaRef = \ "$nextObject 0 R";
                 ++$nextObject;

package/bin/lib/Image/ExifTool/WriteQuickTime.pl

@@ -891,7 +891,7 @@ sub WriteQuickTime($$$)
     $et or return 1;    # allow dummy access to autoload this package
     my ($mdat, @mdat, @mdatEdit, $edit, $track, $outBuff, $co, $term, $delCount);
     my (%langTags, $canCreate, $delGrp, %boxPos, %didDir, $writeLast, $err, $atomCount);
-    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $buf2, $keysGrp, $keysPath);
+    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $buf2, $keysGrp, $keysPath, $itemIndex);
     my $outfile = $$dirInfo{OutFile} || return 0;
     my $raf = $$dirInfo{RAF};       # (will be null for lower-level atoms)
     my $dataPt = $$dirInfo{DataPt}; # (will be null for top-level atoms)
@@ -982,8 +982,25 @@ sub WriteQuickTime($$$)
     $atomCount = $$tagTablePtr{VARS}{ATOM_COUNT} if $$tagTablePtr{VARS};
 
     $tag = $lastTag = '';
-
+    $itemIndex = 0 if $dirName eq 'ItemPropertyContainer';
+
+    # read ahead to parse item property associations if this is 'iprp' ItemProperties
+    # (necessary to determine which properties belong to primary item in HEIC file)
+    if ($dirName eq 'ItemProperties') {
+        my $pos = $raf->Tell();
+        for (;;) {
+            $raf->Read($buf2, 8) == 8 or last;
+            my $size = Get32u(\$buf2, 0) - 8;    # (atom size without 8-byte header)
+            $tag = substr($buf2, 4, 4);
+            last if $size < 0;
+            $tag eq 'ipma' or $raf->Seek($size, 1), next;
+            ParseItemPropAssoc($buf2,$et) if $raf->Read($buf2,$size) == $size;
+            last;
+        }
+        $raf->Seek($pos);
+    }
     for (;;) {      # loop through all atoms at this level
+        ++$itemIndex if defined $itemIndex;
         $lastPos = $raf->Tell();
         # stop processing if we reached a known trailer
         if ($trailer and $lastPos >= $$trailer[1]) {
@@ -1186,6 +1203,36 @@ sub WriteQuickTime($$$)
         }
         undef $tagInfo if $tagInfo and $$tagInfo{AddedUnknown};
 
+        # don't write this tag unless associated with the primary item
+        # (Note: This relies on iinf and dimg coming before iprp)
+        if (defined $itemIndex and $$et{ItemInfo}) {
+            my $items = $$et{ItemInfo};
+            my ($id, $prop, $isPrimary);
+            my $primary = $$et{PrimaryItem};
+            unless (defined $primary) {
+                ($primary) = sort { $a <=> $b } keys %{$$et{ItemInfo}} if $$et{ItemInfo};
+                $primary = 0 unless defined $primary;
+            }
+            my $pitem = $$items{$primary} || { };
+            $$pitem{RefersTo} or $$pitem{RefersTo} = { };
+ItemID2:    foreach $id (reverse sort { $a <=> $b } keys %$items) {
+                next unless $$items{$id}{Association};
+                my $item = $$items{$id};
+                foreach $prop (@{$$item{Association}}) {
+                    next unless $prop == $itemIndex;
+                    my $dont = $dontInherit{$tag} || 0;
+                    last unless $id == $primary or (not $dont and
+                        ($$item{RefersTo} and $$item{RefersTo}{$primary})) or
+                        # special case to assume this property belongs to the primary
+                        # image if it belongs to an item referred to by the primary
+                        ($dont != 1 and $$pitem{RefersTo}{$id});
+                    $isPrimary = 1;
+                    last ItemID2;
+                }
+            }
+            undef $tagInfo unless $isPrimary;
+        }
+
         if ($tagInfo and (not defined $$tagInfo{Writable} or $$tagInfo{Writable})) {
             my $subdir = $$tagInfo{SubDirectory};
             my ($newData, @chunkOffset);
@@ -1225,6 +1272,7 @@ sub WriteQuickTime($$$)
                     OutFile  => $outfile,
                     NoRefTest=> 1,     # don't check directory references
                     WriteGroup => $$tagInfo{WriteGroup},
+                    Permanent => $$tagInfo{Permanent},
                     # initialize array to hold details about chunk offset table
                     # (each entry has 3-5 items: 0=atom type, 1=table offset, 2=table size,
                     #  3=optional base offset, 4=optional item ID)
@@ -1468,7 +1516,10 @@ sub WriteQuickTime($$$)
                             ++$$et{CHANGED};
                             my $grp = $et->GetGroup($langInfo, 1);
                             $et->VerboseValue("- $grp:$$langInfo{Name}", $val);
-                            next unless defined $newData and not $$didTag{$nvHash};
+                            unless (defined $newData and not $$didTag{$nvHash}) {
+                                # must not delete items from iprp because it will mess up the ordering
+                                next unless defined $itemIndex;
+                            }
                             $et->VerboseValue("+ $grp:$$langInfo{Name}", $newData);
                             # add back necessary header and encode as necessary
                             if (defined $lang) {
@@ -1497,7 +1548,7 @@ sub WriteQuickTime($$$)
                                 $newData = $et->Encode($newData, 'UTF8');
                             } elsif ($format and not $$tagInfo{Binary}) {
                                 # format new value for writing
-                                $newData = WriteValue($newData, $format);
+                                $newData = WriteValue($newData, $format, $$tagInfo{Count});
                             }
                         }
                         $$didTag{$nvHash} = 1;   # set flag so we don't add this tag again
@@ -1564,7 +1615,9 @@ sub WriteQuickTime($$$)
             }
             if ($msg) {
                 # (allow empty sample description for non-audio/video handler types, eg. 'url ', 'meta')
-                if ($$et{MediaType}) {
+                # (also, incorrectly written 'mett' SampleEntry by Google phones,
+                #  see https://exiftool.org/forum/index.php?msg=91158)
+                if ($avType{$$et{MediaType}}) {
                     my $grp = $$et{CUR_WRITE_GROUP} || $parent;
                     $et->Error("$msg for $grp");
                     return $rtnErr;

package/bin/lib/Image/ExifTool/Writer.pl

@@ -1296,15 +1296,15 @@ sub SetNewValuesFromFile($$;@)
         # ! option to decide how it is handled here. !
         # +------------------------------------------+
         foreach (qw(ByteUnit Charset CharsetEXIF CharsetFileName CharsetID3 CharsetIPTC
-                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape ExtendedXMP
-                    ExtractEmbedded FastScan Filter FixBase Geolocation GeolocAltNames
-                    GeolocFeature GeolocMinPop GeolocMaxDist GlobalTimeShift GPSQuadrant
-                    HexTagIDs IgnoreGroups IgnoreMinorErrors IgnoreTags ImageHashType Lang
-                    LargeFileSupport LigoGPSScale ListItem ListSep MDItemTags
-                    MissingTagValue NoPDFList NoWarning Password PrintConv QuickTimeUTC
-                    RequestTags SaveFormat SavePath ScanForXMP StructFormat SystemTags
-                    TimeZone Unknown UserParam Validate WindowsLongPath WindowsWideFile
-                    XAttrTags XMPAutoConv))
+                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape
+                    ExtendedXMP ExtractEmbedded FastScan Filter FixBase Geolocation
+                    GeolocAltNames GeolocFeature GeolocMinPop GeolocMaxDist
+                    GlobalTimeShift GPSQuadrant HexTagIDs IgnoreGroups IgnoreMinorErrors
+                    IgnoreTags ImageHashType KeepUTCTime Lang LargeFileSupport
+                    LigoGPSScale ListItem ListSep MDItemTags MissingTagValue NoPDFList
+                    NoWarning Password PrintConv QuickTimeUTC RequestTags SaveFormat
+                    SavePath ScanForXMP StructFormat SystemTags TimeZone Unknown UserParam
+                    Validate WindowsLongPath WindowsWideFile XAttrTags XMPAutoConv))
         {
             $srcExifTool->Options($_ => $$options{$_});
         }
@@ -4262,9 +4262,11 @@ sub WriteDirectory($$$;$)
         if ($permanentDir{$grp0} and not ($$dirInfo{TagInfo} and $$dirInfo{TagInfo}{Deletable})) {
             undef $delFlag;
         }
-        # (never delete an entire QuickTime group)
         if ($delFlag) {
-            if (($grp0 =~ /^(MakerNotes)$/ or $grp1 =~ /^(IFD0|ExifIFD|MakerNotes)$/) and
+            if ($$dirInfo{Permanent}) {
+                $self->Warn("Not deleting permanent $dirName directory");
+                undef $grp1;
+            } elsif (($grp0 =~ /^(MakerNotes)$/ or $grp1 =~ /^(IFD0|ExifIFD|MakerNotes)$/) and
                 $self->IsRawType() and
                 # allow non-permanent MakerNote directories to be deleted (ie. NikonCapture)
                 (not $$dirInfo{TagInfo} or not defined $$dirInfo{TagInfo}{Permanent} or
@@ -5044,7 +5046,6 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') {
                 last;
             }
             if (not $lib) {
-                last unless $$self{OPTIONS}{StrictDate};
                 warn $wrn || "Install POSIX::strptime or Time::Piece for inverse date/time conversions\n";
                 return undef;
             } elsif ($lib eq 'POSIX::strptime') {
@@ -6027,7 +6028,7 @@ sub WriteJPEG($$)
             Write($outfile, $hdr, $s, $segData) or $err = 1;
             my ($buff, $endPos, $trailInfo);
             my $delPreview = $$self{DEL_PREVIEW};
-            $trailInfo = IdentifyTrailer($raf) unless $$delGroup{Trailer};
+            $trailInfo = $self->IdentifyTrailer($raf) unless $$delGroup{Trailer};
             my $nvTrail = $self->GetNewValueHash($Image::ExifTool::Extra{Trailer});
             unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or $nvTrail or
                 $$self{HiddenData})

package/bin/lib/Image/ExifTool/XMP.pm

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.70';
+$VERSION = '3.72';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -165,7 +165,7 @@ my %xmpNS = (
 #
     plus      => 'http://ns.useplus.org/ldf/xmp/1.0/',
     # (prism recommendations from http://www.prismstandard.org/specifications/3.0/Image_Guide_3.0.htm)
-    prism     => 'http://prismstandard.org/namespaces/basic/2.0/',
+    prism     => 'http://prismstandard.org/namespaces/basic/2.0/', # (maybe left at 2.0 to avoid compatibility issues -- think hard before changing this)
     prl       => 'http://prismstandard.org/namespaces/prl/2.1/',
     pur       => 'http://prismstandard.org/namespaces/prismusagerights/2.1/',
     pmi       => 'http://prismstandard.org/namespaces/pmi/2.2/',
@@ -1247,8 +1247,22 @@ my %sPantryItem = (
     NAMESPACE   => 'pdfx',
     NOTES => q{
         PDF extension tags.  This namespace is used to store application-defined PDF
-        information, so there are no pre-defined tags.  User-defined tags must be
-        created to enable writing of XMP-pdfx information.
+        information, so there are few pre-defined tags.  User-defined tags must be
+        created to enable writing of other XMP-pdfx information.
+    },
+    SourceModified => {
+        Name => 'SourceModified',
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        ValueConv => 'require Image::ExifTool::PDF; $val = Image::ExifTool::PDF::ConvertPDFDate($val)',
+        ValueConvInv => q{
+            require Image::ExifTool::PDF;
+            $val = Image::ExifTool::PDF::WritePDFValue($self,$val,"date");
+            $val =~ tr/()//d;
+            return $val;
+        },
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val)',
     },
 );
 
@@ -3804,8 +3818,22 @@ sub ParseXMPElement($$$;$$$$)
         my ($parseResource, %attrs, @attrs);
 # this hangs Perl (v5.18.4) for a specific capture string [patched in ExifTool 12.98]
 #        while ($attrs =~ m/(\S+?)\s*=\s*(['"])(.*?)\2/sg) {
-        while ($attrs =~ /(\S+?)\s*=\s*(['"])/g) {
-            my ($attr, $quote) = ($1, $2);
+# this may hang Perl v5.26.3 (but not v5.18.4) if there is lots of garbage in the XMP [patched in 13.23]
+#        while ($attrs =~ /(\S+?)\s*=\s*(['"])/g) {
+        for (;;) {
+            my ($attr, $quote);
+            if (length($attrs) < 2000) { # (do it the easy way if attributes aren't stupid long)
+                last unless $attrs =~ /(\S+)\s*=\s*(['"])/g;
+                ($attr, $quote) = ($1, $2);
+            } else {
+                # 13.23 patch to avoid capturing tons of garbage if XMP is corrupted
+                last unless $attrs =~ /=\s*(['"])/g;
+                $quote = $1;
+                my $p = pos($attrs) > 1000 ? pos($attrs) - 1000 : 0;
+                my $tmp = substr($attrs, $p, pos($attrs)-$p);
+                last unless $tmp =~ /(\S+)\s*=\s*$quote$/;
+                $attr = $1;
+            }
             my $p0 = pos($attrs);
             last unless $attrs =~ /$quote/g;
             my $val = substr($attrs, $p0, pos($attrs)-$p0-1);

package/bin/lib/Image/ExifTool/XMP2.pl

@@ -402,6 +402,7 @@ my %sLocationDetails = (
     STRUCT_NAME => 'LocationDetails',
     NAMESPACE   => 'Iptc4xmpExt',
     GROUPS      => { 2 => 'Location' },
+    NOTES => 'Note that the GPS elements of this structure are in the "exif" namespace.',
     Identifier  => { List => 'Bag', Namespace => 'xmp' },
     City        => { },
     CountryCode => { },
@@ -420,6 +421,7 @@ my %sLocationDetails = (
         PrintConvInv => '$val=~s/\s*m$//;$val',
     },
     GPSAltitudeRef  => {
+        Namespace => 'exif',
         Writable => 'integer',
         PrintConv => {
             OTHER => sub {

package/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf);
 
-$VERSION = '13.17';
+$VERSION = '13.25';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -155,9 +155,9 @@ sub ReadValue($$$;$$$);
     Real::Metafile Red RIFF AIFF ASF WTV DICOM FITS XISF MIE JSON HTML XMP::SVG
     Palm Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion EXE::PEString
     EXE::DebugRSDS EXE::DebugNB10 EXE::Misc EXE::MachO EXE::PEF EXE::ELF EXE::AR
-    EXE::CHM LNK Font VCard Text VCard::VCalendar VCard::VNote RSRC Rawzor ZIP
-    ZIP::GZIP ZIP::RAR ZIP::RAR5 RTF OOXML iWork ISO FLIR::AFF FLIR::FPF MacOS
-    MacOS::MDItem FlashPix::DocTable
+    EXE::CHM LNK PCAP Font VCard Text VCard::VCalendar VCard::VNote RSRC Rawzor
+    ZIP ZIP::GZIP ZIP::RAR ZIP::RAR5 RTF OOXML iWork ISO FLIR::AFF FLIR::FPF
+    MacOS MacOS::MDItem FlashPix::DocTable
 );
 
 # alphabetical list of current Lang modules
@@ -199,8 +199,8 @@ $defaultLang = 'en';    # default language
                 LFP HTML VRD RTF FITS XISF XCF DSS QTIF FPX PICT ZIP GZIP PLIST
                 RAR 7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font
                 JUMBF RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard
-                LRI R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD
-                NKA ICO TXT AAC);
+                LRI R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS PCAP JSON MP3
+                DICOM PCD NKA ICO TXT AAC);
 
 # file types that we can write (edit)
 my @writeTypes = qw(JPEG TIFF GIF CRW MRW ORF RAF RAW PNG MIE PSD XMP PPM EPS
@@ -263,6 +263,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     BPG  => ['BPG',  'Better Portable Graphics'],
     BTF  => ['BTF',  'Big Tagged Image File Format'], #(unofficial)
     BZ2  => ['BZ2',  'BZIP2 archive'],
+    CAP  =>  'PCAP',
     C2PA => ['JUMBF','Coalition for Content Provenance and Authenticity'],
     CHM  => ['CHM',  'Microsoft Compiled HTML format'],
     CIFF => ['CRW',  'Camera Image File Format'],
@@ -454,6 +455,8 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     PAC  => ['RIFF', 'Lossless Predictive Audio Compression'],
     PAGES => ['ZIP', 'Apple Pages document'],
     PBM  => ['PPM',  'Portable BitMap'],
+    PCAP => ['PCAP', 'Packet Capture'],
+    PCAPNG => ['PCAP', 'Packet Capture Next Generation'],
     PCD  => ['PCD',  'Kodak Photo CD Image Pac'],
     PCT  =>  'PICT',
     PCX  => ['PCX',  'PC Paintbrush'],
@@ -568,7 +571,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     XLTX => [['ZIP','FPX'], 'Office Open XML Spreadsheet Template'],
     XMP  => ['XMP',  'Extensible Metadata Platform'],
     WOFF => ['Font', 'Web Open Font Format'],
-    WOFF2=> ['Font', 'Web Open Font Format2'],
+    WOFF2=> ['Font', 'Web Open Font Format 2'],
     WPG  => ['WPG',  'WordPerfect Graphics'],
     WTV  => ['WTV',  'Windows recorded TV show'],
     ZIP  => ['ZIP',  'ZIP archive'],
@@ -744,6 +747,7 @@ my %fileDescription = (
     OTF  => 'application/font-otf',
     PAGES=> 'application/x-iwork-pages-sffpages',
     PBM  => 'image/x-portable-bitmap',
+    PCAP => 'application/vnd.tcpdump.pcap',
     PCD  => 'image/x-photo-cd',
     PCX  => 'image/pcx',
     PDB  => 'application/vnd.palm',
@@ -980,6 +984,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     NKA  => 'NIKONADJ',
     OGG  => '(OggS|ID3)',
     ORF  => '(II|MM)',
+    PCAP => '\xa1\xb2(\xc3\xd4|\x3c\x4d)\0.\0.|(\xd4\xc3|\x4d\x3c)\xb2\xa1.\0.\0|\x0a\x0d\x0d\x0a.{4}(\x1a\x2b\x3c\x4d|\x4d\x3c\x2b\x1a)|GMBU\0\x02',
   # PCD  =>  signature is at byte 2048
     PCX  => '\x0a[\0-\x05]\x01[\x01\x02\x04\x08].{64}[\0-\x02]',
     PDB  => '.{60}(\.pdfADBE|TEXtREAd|BVokBDIC|DB99DBOS|PNRdPPrs|DataPPrs|vIMGView|PmDBPmDB|InfoINDB|ToGoToGo|SDocSilX|JbDbJBas|JfDbJFil|DATALSdb|Mdb1Mdb1|BOOKMOBI|DataPlkr|DataSprd|SM01SMem|TEXtTlDc|InfoTlIf|DataTlMl|DataTlPt|dataTDBP|TdatTide|ToRaTRPW|zTXTGPlm|BDOCWrdS)',
@@ -1135,6 +1140,7 @@ my @availableOptions = (
     [ 'IgnoreMinorErrors',undef,  'ignore minor errors when reading/writing' ],
     [ 'IgnoreTags',       undef,  'list of tags to ignore when extracting' ],
     [ 'ImageHashType',    'MD5',  'image hash algorithm' ],
+    [ 'KeepUTCTime',      undef,  'do not convert times stored as UTC' ],
     [ 'Lang',       $defaultLang, 'localized language for descriptions etc' ],
     [ 'LargeFileSupport', 1,      'flag indicating support of 64-bit file offsets' ],
     [ 'LimitLongValues',  60,     'length limit for long values' ],
@@ -1152,6 +1158,7 @@ my @availableOptions = (
     [ 'NoPDFList',        undef,  'flag to avoid splitting PDF List-type tag values' ],
     [ 'NoWarning',        undef,  'regular expression for warnings to suppress' ],
     [ 'Password',         undef,  'password for password-protected PDF documents' ],
+    [ 'Plot',             undef,  'SVG plot settings' ],
     [ 'PrintCSV',         undef,  'flag to print CSV directly (selected metadata types only)' ],
     [ 'PrintConv',        1,      'flag to enable print conversion' ],
     [ 'QuickTimeHandler', 1,      'flag to add mdir Handler to newly created Meta box' ],
@@ -2587,6 +2594,12 @@ sub Options($$;@)
             } else {
                 warn("Can't set $param to undef\n");
             }
+        } elsif ($param eq 'Plot') {
+            # add to existing plot settings
+            $newVal = "$oldVal,$newVal" if defined $oldVal and defined $newVal;
+            $$options{$param} = $newVal;
+        } elsif ($param eq 'KeepUTCTime') {
+            $$options{$param} = $static_vars{$param} = $newVal;
         } elsif (lc $param eq 'geodir') {
             $Image::ExifTool::Geolocation::geoDir = $newVal;
         } else {
@@ -4245,7 +4258,7 @@ sub Init($)
     my $self = shift;
     # delete all DataMember variables (lower-case names)
     delete $$self{$_} foreach grep /[a-z]/, keys %$self;
-    undef %static_vars;             # clear all static variables
+    %static_vars = ( KeepUTCTime => $$self{OPTIONS}{KeepUTCTime} ); # reset static variables
     delete $$self{FOUND_TAGS};      # list of found tags
     delete $$self{EXIF_DATA};       # the EXIF data block
     delete $$self{EXIF_POS};        # EXIF position in file
@@ -6680,12 +6693,15 @@ sub ConvertUnixTime($;$$)
         $time = int($time + 1e-6) if $time != int($time);  # avoid round-off errors
         $dec = '';
     }
-    if ($toLocal) {
-        @tm = localtime($time);
-        $tz = TimeZoneString(\@tm, $time);
-    } else {
+    if (not $toLocal) {
         @tm = gmtime($time);
         $tz = '';
+    } elsif ($static_vars{KeepUTCTime}) {
+        @tm = gmtime($time);
+        $tz = 'Z';
+    } else {
+        @tm = localtime($time);
+        $tz = TimeZoneString(\@tm, $time);
     }
     my $str = sprintf("%4d:%.2d:%.2d %.2d:%.2d:%.2d$dec%s",
                       $tm[5]+1900, $tm[4]+1, $tm[3], $tm[2], $tm[1], $tm[0], $tz);
@@ -6868,10 +6884,10 @@ sub HDump($$$$;$$$)
 # Returns: Trailer info hash (with RAF and DirName set),
 #          or undef if no recognized trailer was found
 # Notes: leaves file position unchanged
-sub IdentifyTrailer($;$)
+sub IdentifyTrailer($$;$)
 {
-    my $raf = shift;
-    my $offset = shift || 0;
+    my ($self, $raf, $offset) = @_;
+    $offset or $offset = 0;
     my $pos = $raf->Tell();
     my ($buff, $type, $len);
     while ($raf->Seek(-$offset, 2) and ($len = $raf->Tell()) > 0) {
@@ -6900,6 +6916,9 @@ sub IdentifyTrailer($;$)
             $type = 'Vivo';
         } elsif ($buff =~ /jxrs...\0$/s) {
             $type = 'OnePlus';
+        } elsif ($$self{ProcessGoogleTrailer}) {
+            # check for Google trailer information if specific XMP tags exist
+            $type = 'Google';
         }
         last;
     }
@@ -7052,7 +7071,7 @@ sub ProcessTrailers($$)
         $offset += $dirLen;
         last if $dataPos and $$self{TrailerStart} and $dataPos <= $$self{TrailerStart};
         # look for next trailer
-        my $nextTrail = IdentifyTrailer($raf, $offset);
+        my $nextTrail = $self->IdentifyTrailer($raf, $offset);
         # process Google trailer after all others if necessary and not done already
         unless ($nextTrail) {
             last unless $$self{ProcessGoogleTrailer};
@@ -7504,11 +7523,7 @@ sub ProcessJPEG($$;$)
                 }
             }
             unless ($fast) {
-                $trailInfo = IdentifyTrailer($raf);
-                # check for Google trailer information if specific XMP tags exist
-                if (not $trailInfo and $$self{ProcessGoogleTrailer}) {
-                    $trailInfo = { DirName => 'Google', RAF => $raf };
-                }
+                $trailInfo = $self->IdentifyTrailer($raf);
                 # process trailer now unless we are doing verbose dump
                 if ($trailInfo and $verbose < 3 and not $htmlDump) {
                     # process trailers (keep trailInfo to finish processing later
@@ -7963,6 +7978,12 @@ sub ProcessJPEG($$;$)
                     $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
                     undef $scalado;
                 }
+            } elsif ($$segDataPt =~ /^Qualcomm Dual Camera Attributes/) {
+                $dumpType = 'Qualcomm Dual Camera';
+                my $tagTablePtr = GetTagTable('Image::ExifTool::Qualcomm::DualCamera');
+                DirStart(\%dirInfo, 31);
+                $dirInfo{DirName} = 'Qualcomm Dual Camera';
+                $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($$segDataPt =~ /^FPXR\0/) {
                 next if $fast > 1;      # skip processing for very fast
                 $dumpType = 'FPXR';
@@ -8619,7 +8640,7 @@ sub DoProcessTIFF($$;$)
         }
         # process information in recognized trailers
         if ($raf) {
-            my $trailInfo = IdentifyTrailer($raf);
+            my $trailInfo = $self->IdentifyTrailer($raf);
             if ($trailInfo) {
                 # scan to find AFCP if necessary (Note: we are scanning
                 # from a random file position in the TIFF)
@@ -8724,7 +8745,7 @@ sub DoProcessTIFF($$;$)
         for (;;) {
             last unless $extra > 12;
             $raf->Seek($tiffEnd);  # seek back to end of image
-            $trailInfo = IdentifyTrailer($raf);
+            $trailInfo = $self->IdentifyTrailer($raf);
             last unless $trailInfo;
             my $tbuf = '';
             $$trailInfo{OutFile} = \$tbuf;  # rewrite trailer(s)
@@ -8941,7 +8962,7 @@ sub ProcessDirectory($$$;$)
         ($$dirInfo{DirLen} or not defined $$dirInfo{DirLen}))
     {
         my $addr = $$dirInfo{DirStart} + $$dirInfo{DataPos} + ($$dirInfo{Base}||0) + $$self{BASE};
-        if ($$self{PROCESSED}{$addr}) {
+        if ($$self{PROCESSED}{$addr} and not $$dirInfo{NotDup}) {
             $self->Warn("$dirName pointer references previous $$self{PROCESSED}{$addr} directory");
             # patch for bug in Windows phone 7.5 O/S that writes incorrect InteropIFD pointer
             return 0 unless $dirName eq 'GPS' and $$self{PROCESSED}{$addr} eq 'InteropIFD';
@@ -9152,10 +9173,11 @@ sub AddTagToTable($$;$$)
 # Handle simple extraction of new tag information
 # Inputs: 0) ExifTool object ref, 1) tag table reference, 2) tagID, 3) value,
 #         4-N) parameters hash: Index, DataPt, DataPos, Base, Start, Size, Parent,
-#              TagInfo, ProcessProc, RAF, Format, Count
+#              TagInfo, ProcessProc, RAF, Format, Count, MakeTagInfo
 # Returns: tag key or undef if tag not found
 # Notes: if value is not defined, it is extracted from DataPt using TagInfo
 #        Format and Count if provided
+# - set MakeTagInfo to add tag info for unknown tags with name made from tag ID
 sub HandleTag($$$$;%)
 {
     my ($self, $tagTablePtr, $tag, $val, %parms) = @_;
@@ -9167,6 +9189,15 @@ sub HandleTag($$$$;%)
 
     if ($tagInfo) {
         $subdir = $$tagInfo{SubDirectory};
+    } elsif ($parms{MakeTagInfo}) {
+        $self->VPrint(0, $$self{INDENT}, "[adding $tag]\n") if $verbose;
+        my $name = $tag;
+        $name =~ s/([A-Z]) ([A-Z][ A-Z])/${1}_$2/g; # underline between acronyms
+        $name =~ s/([^A-Za-z])([a-z])/$1\u$2/g;     # capitalize words
+        $name =~ tr/-_a-zA-Z0-9//dc;                # remove illegal characters
+        $name = "Tag$name" if length($name) < 2 or $name =~ /^[-0-9]/;
+        $tagInfo = { Name => ucfirst($name) };
+        AddTagToTable($tagTablePtr, $tag, $tagInfo);
     } else {
         return undef unless $verbose;
         $tagInfo = { Name => "tag $tag" };  # create temporary tagInfo hash
@@ -9224,10 +9255,11 @@ sub HandleTag($$$$;%)
                 }
                 $self->Warn("RawConv $tag: " . CleanWarning()) if $evalWarning;
                 return undef unless defined $val;
-                $val = $$val if ref $val eq 'SCALAR';
-                $dataPt = \$val;
+                $dataPt = ref $val eq 'SCALAR' ? $val : \$val;
                 $subdirStart = 0;
-                $subdirLen = length $val;
+                $subdirLen = length $$dataPt;
+            } elsif (not $dataPt) {
+                $dataPt = ref $val eq 'SCALAR' ? $val : \$val;
             }
             if ($$subdir{Start}) {
                 my $valuePtr = 0;
@@ -9236,7 +9268,6 @@ sub HandleTag($$$$;%)
                 $subdirStart += $off;
                 $subdirLen -= $off;
             }
-            $dataPt or $dataPt = \$val;
             # process subdirectory information
             my %dirInfo = (
                 DirName  => $$subdir{DirName} || $$tagInfo{Name},
@@ -9957,6 +9988,7 @@ sub ProcessBinaryData($$$)
                 $subdirBase = eval($$subdir{Base}) + $base;
             }
             my $start = $$subdir{Start} || 0;
+            my $notDup;
             if ($start =~ /\$/) {
                 # ignore directories with a zero offset (ie. missing Nikon ShotInfo entries)
                 next unless $val;
@@ -9967,6 +9999,7 @@ sub ProcessBinaryData($$$)
                 $len = $dataLen - $start unless $len and $len <= $dataLen - $start;
             } else {
                 $start += $dirStart + $entry;
+                $notDup = 1,
             }
             my %subdirInfo = (
                 DataPt   => $dataPt,
@@ -9975,6 +10008,7 @@ sub ProcessBinaryData($$$)
                 DirStart => $start,
                 DirLen   => $len,
                 Base     => $subdirBase,
+                NotDup   => $notDup,
             );
             delete $$self{NO_UNKNOWN};
             $self->ProcessDirectory(\%subdirInfo, $subTablePtr, $$subdir{ProcessProc});