exiftool_vendored 12.57.0 → 12.59.0

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 26359 tags, with 16845 unique tag names.
+They contain a total of 26390 tags, with 16859 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -28,7 +28,8 @@ gives the order of values for a serial data stream.
 A B<Tag Name> is the handle by which the information is accessed in
 ExifTool.  In some instances, more than one name may correspond to a single
 tag ID.  In these cases, the actual name used depends on the context in
-which the information is found.  Case is not significant for tag names.  A
+which the information is found.  Valid characters in a tag name are A-Z,
+a-z, 0-9, hyphen (-) and underline (_).  Case is not significant.  A
 question mark (C<?>) after a tag name indicates that the information is
 either not understood, not verified, or not very useful -- these tags are
 not extracted by ExifTool unless the Unknown (-u) option is enabled.  Be
@@ -124,6 +125,8 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                FPXR                             FlashPix
                InfiRayFactory                   InfiRay Factory
                ThermalParams                    DJI ThermalParams
+               ThermalParams2                   DJI ThermalParams2
+               ThermalParams3                   DJI ThermalParams3
                PreviewImage                     no
   'APP5'       RMETA                            Ricoh RMETA
                SamsungUniqueID                  Samsung APP5
@@ -140,6 +143,7 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                Huawei                           Unknown
                Qualcomm                         Qualcomm
                InfiRayOpMode                    InfiRay OpMode
+               DJI-DBG                          DJI Info
   'APP8'       SPIFF                            JPEG SPIFF
                InfiRayIsothermal                InfiRay Isothermal
   'APP9'       MediaJukebox                     JPEG MediaJukebox
@@ -1283,6 +1287,7 @@ L<http://www.adobe.com/devnet/xmp/> for the official XMP specification.
   digiKam                                       XMP digiKam
   drone-dji                                     DJI XMP
   dwc                                           DarwinCore
+  et                                            XMP ExifTool
   exif                                          XMP exif
   exifEX                                        XMP exifEX
   expressionmedia                               XMP ExpressionMedia
@@ -4030,6 +4035,14 @@ These tags belong to the ExifTool XMP-digiKam family 1 group.
   PickLabel                                     string
   TagsList                                      string+
 
+=head3 XMP ExifTool Tags
+
+These tags belong to the ExifTool XMP-et family 1 group.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  OriginalImageMD5                              string
+
 =head3 XMP exif Tags
 
 EXIF namespace for EXIF tags.  See
@@ -5303,7 +5316,8 @@ These tags belong to the ExifTool XMP-pmi family 1 group.
 =head3 XMP prism Tags
 
 Publishing Requirements for Industry Standard Metadata 3.0 namespace
-tags.  (see L<http://www.prismstandard.org/>)
+tags.  (see
+L<https://www.w3.org/Submission/2020/SUBM-prism-20200910/prism-basic.html/>)
 
 These tags belong to the ExifTool XMP-prism family 1 group.
 
@@ -10866,6 +10880,30 @@ Thermal parameters extracted from APP4 of DJI RJPEG files from the ZH20T.
      86    DB                                   no
      88    KK                                   no
 
+=head3 DJI ThermalParams2 Tags
+
+Thermal parameters extracted from APP4 of DJI M3T RJPEG files.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    AmbientTemperature                   no
+      4    ObjectDistance                       no
+      8    Emissivity                           no
+     12    RelativeHumidity                     no
+     16    ReflectedTemperature                 no
+    101    IDString                             no
+
+=head3 DJI ThermalParams3 Tags
+
+Thermal parameters extracted from APP4 of some DJI RJPEG files.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      4    RelativeHumidity                     no
+      6    ObjectDistance                       no
+      8    Emissivity                           no
+     10    ReflectedTemperature                 no
+
 =head2 FLIR Tags
 
 Information extracted from the maker notes of JPEG images from thermal
@@ -13707,6 +13745,8 @@ DiMAGE X and Xt.
            ShotInfoD300b                        Nikon ShotInfoD300b
            ShotInfoD300S                        Nikon ShotInfoD300S
            ShotInfoD700                         Nikon ShotInfoD700
+           ShotInfoD780                         Nikon ShotInfoD780
+           ShotInfoD7500                        Nikon ShotInfoD7500
            ShotInfoD800                         Nikon ShotInfoD800
            ShotInfoD810                         Nikon ShotInfoD810
            ShotInfoD850                         Nikon ShotInfoD850
@@ -14246,6 +14286,34 @@ firmware 1.02f.
     647    ShutterCount                         int32u
     804    CustomSettingsD700                   NikonCustom SettingsD700
 
+=head3 Nikon ShotInfoD780 Tags
+
+These tags are extracted from encrypted data in images from the D780.
+
+   Index   Tag Name                             Writable
+   -----   --------                             --------
+      0    ShotInfoVersion                      no
+      4    FirmwareVersion                      no
+    156    OrientOffset                         Nikon OrientationInfo
+
+=head3 Nikon OrientationInfo Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    RollAngle                            fixed32u
+      4    PitchAngle                           fixed32u
+      8    YawAngle                             fixed32u
+
+=head3 Nikon ShotInfoD7500 Tags
+
+These tags are extracted from encrypted data in images from the D7500.
+
+   Index   Tag Name                             Writable
+   -----   --------                             --------
+      0    ShotInfoVersion                      no
+      4    FirmwareVersion                      no
+    160    OrientOffset                         Nikon OrientationInfo
+
 =head3 Nikon ShotInfoD800 Tags
 
 These tags are extracted from encrypted data in images from the D800.
@@ -14299,14 +14367,6 @@ These tags are extracted from encrypted data in images from the D810.
       4    ISOAutoShutterTime                   int8u & 0x3f
       5    ISOAutoHiLimit                       int8u & 0xff
 
-=head3 Nikon OrientationInfo Tags
-
-  Index1   Tag Name                             Writable
-  ------   --------                             --------
-      0    RollAngle                            fixed32u
-      4    PitchAngle                           fixed32u
-      8    YawAngle                             fixed32u
-
 =head3 Nikon ShotInfoD850 Tags
 
 These tags are extracted from encrypted data in images from the D850.
@@ -14606,6 +14666,7 @@ These tags are extracted from encrypted data in images from the Z9.
       0    ShotInfoVersion                      no
       4    FirmwareVersion                      no
      48    SequenceOffset                       Nikon SeqInfoZ9
+     88    Offset13                             Nikon Offset13InfoZ9
     132    OrientOffset                         Nikon OrientationInfo
     140    MenuOffset                           Nikon MenuInfoZ9
 
@@ -14616,6 +14677,15 @@ These tags are extracted from encrypted data in images from the Z9.
      32    FocusShiftShooting                   int8u~
      40    IntervalShooting                     int16u~
 
+=head3 Nikon Offset13InfoZ9 Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+   3048    AFAreaInitialXPosition               int8s~
+   3049    AFAreaInitialYPosition               int8s~
+   3050    AFAreaInitialWidth                   no
+   3051    AFAreaInitialHeight                  no
+
 =head3 Nikon MenuInfoZ9 Tags
 
   Index1   Tag Name                             Writable
@@ -14662,6 +14732,7 @@ These tags are used by the Z9.
     556    SecondarySlotFunction                int8u
     572    DXCropAlert                          int8u
     574    SubjectDetection                     int8u
+    576    DynamicAFAreaSize                    int8u
     604    MovieImageArea?                      int8u & 0x01
     614    MovieType?                           int8u
     616    MovieISOAutoHiLimit?                 int16u
@@ -14737,6 +14808,7 @@ These tags are used by the Z9 firmware 3.00.
   576    SecondarySlotFunction                  int8u
   592    DXCropAlert                            int8u
   594    SubjectDetection                       int8u
+  596    DynamicAFAreaSize                      int8u
   636    HighFrequencyFlickerReductionShooting? int8u
   646    MovieImageArea?                        int8u & 0x01
   656    MovieType?                             int8u
@@ -14938,15 +15010,16 @@ Tags found in the encrypted LensData from cameras such as the Z6 and Z7.
      18    MaxApertureAtMaxFocal                int8u
      19    MCUVersion                           int8u
      20    EffectiveMaxAperture                 int8u
+     47    NewLensData                          undef[17]
      48    LensID                               int16u
-     53    LensMountType?                       int8u
+     53    LensMountType                        int8u
      54    MaxAperture                          int16u
      56    FNumber                              int16u
      60    FocalLength                          int16u
      76    FocusDistanceRangeWidth?             int8u
      78    FocusDistance                        int16u~
      86    LensDriveEnd?                        int8u
-     90    LensPositionAbsolute?                int32s
+     90    LensPositionAbsolute                 int32s
 
 =head3 Nikon LensDataUnknown Tags
 
@@ -17266,6 +17339,8 @@ any information found here will be extracted, even if the tag is not listed.
   0x0304   FocusStepNear                        int16u
   0x0305   FocusDistance                        rational64u
   0x0308   AFPoint                              int16u
+  0x031b   AFPointDetails                       no
+           AFPointDetails                       int16u
   0x0328   AFInfo                               Olympus AFInfo
   0x1201   ExternalFlash                        int16u[2]
   0x1203   ExternalFlashGuideNumber?            rational64s
@@ -21799,7 +21874,10 @@ These tags are found in IFD0 of Panasonic/Leica RAW, RW2 and RWL images.
   0x011c   Gamma                                int16u
   0x0120   CameraIFD                            PanasonicRaw CameraIFD
   0x0121   Multishot                            int32u
+  0x0127   JpgFromRaw2                          no
+  0x013b   Artist                               string
   0x02bc   ApplicationNotes                     XMP
+  0x8298   Copyright                            string
   0x83bb   IPTC-NAA                             IPTC
   0x8769   ExifOffset                           EXIF
   0x8825   GPSInfo                              GPS
@@ -22080,30 +22158,32 @@ Note that Microsoft is not consistent with the time zone used for some
 date/time tags, and it may be either UTC or local time depending on the
 software used to create the file.
 
-  Tag ID                          Tag Name      Writable
-  ------                          --------      --------
-  "\x01CompObj"                   CompObj       FlashPix CompObj
-  "\x05Audio Info"                AudioInfo     FlashPix AudioInfo
-  "\x05Data Object"               DataObject    FlashPix DataObject
+  Tag ID                 Tag Name               Writable
+  ------                 --------               --------
+  "\x01CompObj"          CompObj                FlashPix CompObj
+  "\x05Audio Info"       AudioInfo              FlashPix AudioInfo
+  "\x05Data Object"      DataObject             FlashPix DataObject
   "\x05DocumentSummaryInformation" DocumentInfo FlashPix DocumentInfo
-  "\x05Extension List"            Extensions    FlashPix Extensions
-  "\x05Global Info"               GlobalInfo    FlashPix GlobalInfo
-  "\x05Image Contents"            Image         FlashPix Image
-  "\x05Image Info"                ImageInfo     FlashPix ImageInfo
-  "\x05Operation"                 Operation     FlashPix Operation
-  "\x05Screen Nail"               ScreenNail    no
-  "\x05SummaryInformation"        SummaryInfo   FlashPix SummaryInfo
-  "\x05Transform"                 Transform     FlashPix Transform
-  'Audio Stream'                  AudioStream   no
-  'BasicFileInfo'                 BasicFileInfo no
-  'Contents'                      Contents      XMP
-  'Current User'                  CurrentUser   no
-  'ICC Profile 0001'              ICC_Profile   ICC_Profile
-  'IeImg'                         EmbeddedImage no
-  'Preview'                       PreviewImage  no
-  'Property'                      PreviewInfo   FlashPix PreviewInfo
-  'Subimage 0000 Header'          SubimageHdr   FlashPix SubimageHdr
-  'WordDocument'                  WordDocument  FlashPix WordDocument
+  "\x05Extension List"   Extensions             FlashPix Extensions
+  "\x05Global Info"      GlobalInfo             FlashPix GlobalInfo
+  "\x05Image Contents"   Image                  FlashPix Image
+  "\x05Image Info"       ImageInfo              FlashPix ImageInfo
+  "\x05Operation"        Operation              FlashPix Operation
+  "\x05Screen Nail"      ScreenNail             no
+  "\x05SummaryInformation" SummaryInfo          FlashPix SummaryInfo
+  "\x05Transform"        Transform              FlashPix Transform
+  'Audio Stream'         AudioStream            no
+  'BasicFileInfo'        BasicFileInfo          no
+  'Contents'             Contents               XMP
+  'Current User'         CurrentUser            no
+  'ICC Profile 0001'     ICC_Profile            ICC_Profile
+  'IeImg'                EmbeddedImage          no
+  'IeImg_class'          EmbeddedImageClass     no
+  'IeImg_rect'           EmbeddedImageRectangle no
+  'Preview'              PreviewImage           no
+  'Property'             PreviewInfo            FlashPix PreviewInfo
+  'Subimage 0000 Header' SubimageHdr            FlashPix SubimageHdr
+  'WordDocument'         WordDocument           FlashPix WordDocument
 
 =head3 FlashPix CompObj Tags
 
@@ -38055,6 +38135,7 @@ FileName.
   ICC_Profile                ICC_Profile        yes!
   ID3Size                    File               no
   IPTC                       IPTC               yes!
+  ImageDataMD5               File               no
   ImageHeight                File               no
   ImageWidth                 File               no
   JPEGDigest                 File               no

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

@@ -17,7 +17,7 @@ package Image::ExifTool::Validate;
 use strict;
 use vars qw($VERSION %exifSpec);
 
-$VERSION = '1.19';
+$VERSION = '1.20';
 
 use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
@@ -437,8 +437,8 @@ sub ValidateExif($$$$$$$$)
                     $et->Warn(sprintf('Wrong IFD for 0x%.4x %s (should be %s not %s)', $tag, $$ti{Name}, $wgp, $ifd));
                 }
             }
-        } elsif (not $otherSpec{$$et{VALUE}{FileType}} or
-            (not $otherSpec{$$et{VALUE}{FileType}}{$tag} and not $otherSpec{$$et{VALUE}{FileType}}{All}))
+        } elsif (not $otherSpec{$$et{FileType}} or
+            (not $otherSpec{$$et{FileType}}{$tag} and not $otherSpec{$$et{FileType}}{All}))
         {
             if ($tagTablePtr eq \%Image::ExifTool::Exif::Main or $$tagInfo{Unknown}) {
                 $et->Warn(sprintf('Non-standard %s tag 0x%.4x %s', $ifd, $tag, $$ti{Name}), 1);
@@ -459,8 +459,8 @@ sub ValidateExif($$$$$$$$)
                 $et->Warn(sprintf('Non-standard count (%d) for %s 0x%.4x %s', $count, $ifd, $tag, $$ti{Name}));
             }
         }
-    } elsif (not $otherSpec{$$et{VALUE}{FileType}} or
-        (not $otherSpec{$$et{VALUE}{FileType}}{$tag} and not $otherSpec{$$et{VALUE}{FileType}}{All}))
+    } elsif (not $otherSpec{$$et{FileType}} or
+        (not $otherSpec{$$et{FileType}}{$tag} and not $otherSpec{$$et{FileType}}{All}))
     {
         $et->Warn(sprintf('Unknown %s tag 0x%.4x', $ifd, $tag), 1);
     }

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

@@ -419,6 +419,55 @@ sub ValidateImageData($$$;$)
     }
 }
 
+#------------------------------------------------------------------------------
+# Add specified image data to ImageDataMD5 hash
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) lookup for [tagInfo,value] based on tagID
+sub AddImageDataMD5($$$)
+{
+    my ($et, $dirInfo, $offsetInfo) = @_;
+    my ($tagID, $offset, $buff);
+
+    my $verbose = $et->Options('Verbose');
+    my $md5 = $$et{ImageDataMD5};
+    my $raf = $$dirInfo{RAF};
+    my $base = $$dirInfo{Base} || 0;
+
+    foreach $tagID (sort keys %$offsetInfo) {
+        next unless ref $$offsetInfo{$tagID} eq 'ARRAY'; # ignore scalar tag values used for Validate
+        my $tagInfo = $$offsetInfo{$tagID}[0];
+        next unless $$tagInfo{IsImageData};     # only consider image data
+        my $sizeID = $$tagInfo{OffsetPair};
+        my @sizes;
+        if ($$tagInfo{NotRealPair}) {
+            @sizes = 999999999;     # (Panasonic hack: raw data runs to end of file)
+        } elsif ($sizeID and $$offsetInfo{$sizeID}) {
+            @sizes = split ' ', $$offsetInfo{$sizeID}[1];
+        } else {
+            next;
+        }
+        my @offsets = split ' ', $$offsetInfo{$tagID}[1];
+        $sizes[0] = 999999999 if $$tagInfo{NotRealPair};
+        my $total = 0;
+        foreach $offset (@offsets) {
+            my $size = shift @sizes;
+            next unless $offset =~ /^\d+$/ and $size and $size =~ /^\d+$/ and $size;
+            next unless $raf->Seek($offset+$base, 0);
+            while ($size) {
+                my $bytes = $size > 65536 ? 65536 : $size;
+                $raf->Read($buff, $bytes) or last;
+                $md5->add($buff);
+                $total += length($buff);
+                $size -= $bytes;
+            }
+        }
+        if ($verbose) {
+            my $name = "$$dirInfo{DirName}:$$tagInfo{Name}";
+            $name =~ s/Offsets?|Start$//;
+            $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $total bytes of $name data)\n");
+        }
+    }
+}
+
 #------------------------------------------------------------------------------
 # Handle error while writing EXIF
 # Inputs: 0) ExifTool ref, 1) error string, 2) tag table ref

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

@@ -1490,7 +1490,7 @@ sub WriteXMP($$;$)
             my @ns = sort keys %nsCur;
             $long[-2] .= "$nl$sp<$prop rdf:about='${about}'";
             # generate et:toolkit attribute if this is an exiftool RDF/XML output file
-            if (@ns and $nsCur{$ns[0]} =~ m{^http://ns.exiftool.(?:ca|org)/}) {
+            if ($$et{XMP_NO_XMPMETA} and @ns and $nsCur{$ns[0]} =~ m{^http://ns.exiftool.(?:ca|org)/}) {
                 $long[-2] .= "\n$sp${sp}xmlns:et='http://ns.exiftool.org/1.0/'" .
                             " et:toolkit='Image::ExifTool $Image::ExifTool::VERSION'";
             }

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

@@ -1321,6 +1321,7 @@ sub SetNewValuesFromFile($$;@)
         XMPAutoConv     => $$options{XMPAutoConv},
     );
     $$srcExifTool{GLOBAL_TIME_OFFSET} = $$self{GLOBAL_TIME_OFFSET};
+    $$srcExifTool{ALT_EXIFTOOL} = $$self{ALT_EXIFTOOL};
     foreach $tag (@setTags) {
         next if ref $tag;
         if ($tag =~ /^-(.*)/) {
@@ -1387,7 +1388,7 @@ sub SetNewValuesFromFile($$;@)
 # transfer specified tags in the proper order
 #
     # 1) loop through input list of tags to set, and build @setList
-    my (@setList, $set, %setMatches, $t);
+    my (@setList, $set, %setMatches, $t, %altFiles);
     foreach $t (@setTags) {
         if (ref $t eq 'HASH') {
             # update current options
@@ -1419,9 +1420,12 @@ sub SetNewValuesFromFile($$;@)
                     $tag =~ s/(.+?)\s*(>|<) ?//;
                     $$opts{EXPR} = 1; # flag this expression
                 } else {
+                    # (not sure why this is here because sign should be before '<')
+                    # (--> allows "<+" or "<-", which is an undocumented feature)
                     $opt = $1 if $tag =~ s/^([-+])\s*//;
                 }
             }
+            $$opts{Replace} = 0 if $dstTag =~ s/^\+//;
             # validate tag name(s)
             unless ($$opts{EXPR} or ValidTagName($tag)) {
                 $self->Warn("Invalid tag name '${tag}'. Use '=' not '<' to assign a tag value");
@@ -1438,6 +1442,8 @@ sub SetNewValuesFromFile($$;@)
             $$opts{Type} = 'ValueConv' if $dstTag =~ s/#$//;
             # replace tag name of 'all' with '*'
             $dstTag = '*' if $dstTag eq 'all';
+        } else {
+            $$opts{Replace} = 0 if $tag =~ s/^\+//;
         }
         unless ($$opts{EXPR}) {
             $isExclude = ($tag =~ s/^-//);
@@ -1447,7 +1453,17 @@ sub SetNewValuesFromFile($$;@)
                     # save family/groups in list (ignoring 'all' and '*')
                     next unless length($_) and /^(\d+)?(.*)/;
                     my ($f, $g) = ($1, $2);
-                    $f = 7 if $g =~ s/^ID-//i;
+                    $f = 7 if (not $f or $f eq '7') and $g =~ s/^ID-//i;
+                    if ($g =~ /^file\d+$/i and (not $f or $f eq '8')) {
+                        $f = 8;
+                        my $g8 = ucfirst $g;
+                        if ($$srcExifTool{ALT_EXIFTOOL}{$g8}) {
+                            $$opts{GROUP8} = $g8;
+                            $altFiles{$g8} or $altFiles{$g8} = [ ];
+                            # save list of requested tags for this alternate ExifTool object
+                            push @{$altFiles{$g8}}, "$grp:$tag";
+                        }
+                    }
                     push @fg, [ $f, $g ] unless $g eq '*' or $g eq 'all';
                 }
             }
@@ -1484,26 +1500,44 @@ sub SetNewValuesFromFile($$;@)
         # save in reverse order so we don't set tags before an exclude
         unshift @setList, [ \@fg, $tag, $dst, $opts ];
     }
+    # 1b) copy requested tags for each alternate ExifTool object
+    my $g8;
+    foreach $g8 (sort keys %altFiles) {
+        # request specific alternate tags to load them from the alternate ExifTool object
+        my $altInfo = $srcExifTool->GetInfo($altFiles{$g8});
+        # add to tags list after dummy entry to signify start of tags for this alt file
+        if (%$altInfo) {
+            push @tags, 'Warning DUMMY', reverse sort keys %$altInfo;
+            $$info{$_} = $$altInfo{$_} foreach keys %$altInfo;
+        }
+    }
     # 2) initialize lists of matching tags for each setTag
     foreach $set (@setList) {
         $$set[2] and $setMatches{$set} = [ ];
     }
     # 3) loop through all tags in source image and save tags matching each setTag
-    my %rtnInfo;
+    my (%rtnInfo, $isAlt);
     foreach $tag (@tags) {
         # don't try to set errors or warnings
         if ($tag =~ /^(Error|Warning)( |$)/) {
-            $rtnInfo{$tag} = $$info{$tag};
+            if ($tag eq 'Warning DUMMY') {
+                $isAlt = 1; # start of the alt tags
+            } else {
+                $rtnInfo{$tag} = $$info{$tag};
+            }
             next;
         }
         # only set specified tags
         my $lcTag = lc(GetTagName($tag));
         my (@grp, %grp);
 SET:    foreach $set (@setList) {
+            my $opts = $$set[3];
+            next if $$opts{EXPR};   # (expressions handled in step 4)
+            next if $$opts{GROUP8} xor $isAlt;
             # check first for matching tag
             unless ($$set[1] eq $lcTag or $$set[1] eq '*') {
                 # handle wildcards
-                next unless $$set[3]{WILD} and $lcTag =~ /^$$set[1]$/;
+                next unless $$opts{WILD} and $lcTag =~ /^$$set[1]$/;
             }
             # then check for matching group
             if (@{$$set[0]}) {
@@ -1835,6 +1869,27 @@ sub RestoreNewValues($)
     $$self{DEL_GROUP} = \%delGrp;
 }
 
+#------------------------------------------------------------------------------
+# Set alternate file for extracting information
+# Inputs: 0) ExifTool ref, 1) family 8 group name (of the form "File#" where # is any number)
+#         2) alternate file name, or undef to reset
+# Returns: 1 on success, or 0 on invalid group name
+sub SetAlternateFile($$$)
+{
+    my ($self, $g8, $file) = @_;
+    $g8 = ucfirst lc $g8;
+    return 0 unless $g8 =~ /^File\d+$/;
+    # keep the same file if already initialized (possibly has metadata extracted)
+    if (not defined $file) {
+        delete $$self{ALT_EXIFTOOL}{$g8};
+    } elsif (not ($$self{ALT_EXIFTOOL}{$g8} and $$self{ALT_EXIFTOOL}{$g8}{ALT_FILE} eq $file)) {
+        my $altExifTool = Image::ExifTool->new;
+        $$altExifTool{ALT_FILE} = $file;
+        $$self{ALT_EXIFTOOL}{$g8} = $altExifTool;
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Set filesystem time from from FileModifyDate or FileCreateDate tag
 # Inputs: 0) ExifTool object reference, 1) file name or file ref
@@ -2722,6 +2777,7 @@ sub GetAllGroups($;$)
     $family == 4 and return('Copy#');
     $family == 5 and return('[too many possibilities to list]');
     $family == 6 and return(@Image::ExifTool::Exif::formatName[1..$#Image::ExifTool::Exif::formatName]);
+    $family == 8 and return('File#');
 
     LoadAllTables();    # first load all our tables
 
@@ -3161,42 +3217,46 @@ sub InsertTagValues($$$;$$$)
                     $tag = $docGrp . ':' . $tag;
                     $lcTag = lc $tag;
                 }
+                my $et = $self;
+                if ($tag =~ s/(\bfile\d+)://i) {
+                    $et = $$self{ALT_EXIFTOOL}{ucfirst lc $1} or $et=$self, $tag = 'no_alt_file';
+                }
                 if ($lcTag eq 'all') {
                     $val = 1;   # always some tag available
-                } elsif (defined $$self{OPTIONS}{UserParam}{$lcTag}) {
-                    $val = $$self{OPTIONS}{UserParam}{$lcTag};
+                } elsif (defined $$et{OPTIONS}{UserParam}{$lcTag}) {
+                    $val = $$et{OPTIONS}{UserParam}{$lcTag};
                 } elsif ($tag =~ /(.*):(.+)/) {
                     my $group;
                     ($group, $tag) = ($1, $2);
                     if (lc $tag eq 'all') {
                         # see if any tag from the specified group exists
-                        my $match = $self->GroupMatches($group, $foundTags);
+                        my $match = $et->GroupMatches($group, $foundTags);
                         $val = $match ? 1 : 0;
                     } else {
                         # find the specified tag
                         my @matches = grep /^$tag(\s|$)/i, @$foundTags;
-                        @matches = $self->GroupMatches($group, \@matches);
+                        @matches = $et->GroupMatches($group, \@matches);
                         foreach $tg (@matches) {
                             if (defined $val and $tg =~ / \((\d+)\)$/) {
                                 # take the most recently extracted tag
                                 my $tagNum = $1;
                                 next if $tag !~ / \((\d+)\)$/ or $1 > $tagNum;
                             }
-                            $val = $self->GetValue($tg, $type);
+                            $val = $et->GetValue($tg, $type);
                             $tag = $tg;
                             last unless $tag =~ / /;    # all done if we got our best match
                         }
                     }
                 } elsif ($tag eq 'self') {
-                    $val = $self; # ("$self{var}" or "$self->{var}" in string)
+                    $val = $et; # ("$self{var}" or "$file1:self{var}" in string)
                 } else {
                     # get the tag value
-                    $val = $self->GetValue($tag, $type);
+                    $val = $et->GetValue($tag, $type);
                     unless (defined $val) {
                         # check for tag name with different case
                         ($tg) = grep /^$tag$/i, @$foundTags;
                         if (defined $tg) {
-                            $val = $self->GetValue($tg, $type);
+                            $val = $et->GetValue($tg, $type);
                             $tag = $tg;
                         }
                     }
@@ -4204,7 +4264,7 @@ sub WriteDirectory($$$;$)
             return '' unless $dataPt or $$dirInfo{RAF}; # nothing to do if block never existed
             # don't allow MakerNotes to be removed from RAW files
             if ($blockName eq 'MakerNotes' and $rawType{$$self{FileType}}) {
-                $self->Warn("Can't delete MakerNotes from $$self{VALUE}{FileType}",1);
+                $self->Warn("Can't delete MakerNotes from $$self{FileType}",1);
                 return undef;
             }
             $verb = 'Deleting';

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.56';
+$VERSION = '3.58';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -753,6 +753,10 @@ my %sRangeMask = (
         Name => 'album',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::Album' },
     },
+    et => {
+        Name => 'et',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::ExifTool' },
+    },
     prism => {
         Name => 'prism',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::prism' },
@@ -2550,6 +2554,14 @@ my %sPantryItem = (
     Notes => { },
 );
 
+# ExifTool namespace properties (et)
+%Image::ExifTool::XMP::ExifTool = (
+    %xmpTableDefaults,
+    GROUPS => { 1 => 'XMP-et', 2 => 'Image' },
+    NAMESPACE   => 'et',
+    OriginalImageMD5 => { Notes => 'used to store ExifTool ImageDataMD5 digest' },
+);
+
 # table to add tags in other namespaces
 %Image::ExifTool::XMP::other = (
     GROUPS => { 2 => 'Unknown' },
@@ -3097,7 +3109,7 @@ sub ScanForXMP($$)
             undef $buff;
         }
     }
-    unless ($$et{VALUE}{FileType}) {
+    unless ($$et{FileType}) {
         $$et{FILE_TYPE} = $$et{FILE_EXT};
         $et->SetFileType('<unknown file containing XMP>', undef, '');
     }
@@ -3539,6 +3551,7 @@ NoLoop:
             DirLen   => length $$dataPt,
             IgnoreProp => $$subdir{IgnoreProp}, # (allow XML to ignore specified properties)
             IsExtended => 1, # (hack to avoid Duplicate warning for embedded XMP)
+            NoStruct => 1,   # (don't try to build structures since this isn't true XMP)
         );
         my $oldOrder = GetByteOrder();
         SetByteOrder($$subdir{ByteOrder}) if $$subdir{ByteOrder};
@@ -4375,8 +4388,10 @@ sub ProcessXMP($$;$)
 
     # restore structures if necessary
     if ($$et{IsStruct}) {
-        require 'Image/ExifTool/XMPStruct.pl';
-        RestoreStruct($et, $keepFlat);
+        unless ($$dirInfo{NoStruct}) {
+            require 'Image/ExifTool/XMPStruct.pl';
+            RestoreStruct($et, $keepFlat);
+        }
         delete $$et{IsStruct};
     }
     # reset NO_LIST flag (must do this _after_ RestoreStruct() above)