exiftool_vendored 13.04.0 → 13.08.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 28187 tags, with 17502 unique tag names.
+They contain a total of 28218 tags, with 17514 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
@@ -115,6 +115,7 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                FPXR                             FlashPix
                MPF                              MPF
                InfiRayVersion                   InfiRay Version
+               UniformResourceName              no
                PreviewImage                     no
   'APP3'       Meta                             Kodak Meta
                Stim                             Stim
@@ -152,6 +153,7 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                InfiRaySensor                    InfiRay Sensor
                SEAL                             XMP SEAL
   'APP10'      Comment                          no
+               HDRGainCurve                     no
   'APP11'      JPEG-HDR                         JPEG HDR
                JUMBF                            Jpeg2000
   'APP12'      PictureInfo                      APP12 PictureInfo
@@ -1370,6 +1372,7 @@ L<http://www.adobe.com/devnet/xmp/> for the official XMP specification.
   acdsee                                        XMP acdsee
   acdsee-rs                                     XMP ACDSeeRegions
   album                                         XMP Album
+  apdi                                          XMP apdi
   apple-fi                                      XMP apple_fi
   ast                                           Nikon ast
   aux                                           XMP aux
@@ -1402,6 +1405,7 @@ L<http://www.adobe.com/devnet/xmp/> for the official XMP specification.
   GPano                                         XMP GPano
   GSpherical                                    XMP GSpherical
   hdr                                           XMP hdr
+  HDRGainMap                                    XMP HDRGainMap
   hdrgm                                         XMP hdrgm
   ics                                           XMP ics
   iptcCore                                      XMP iptcCore
@@ -1584,6 +1588,18 @@ These tags belong to the ExifTool XMP-album family 1 group.
   --------                                      --------
   Notes                                         string
 
+=head3 XMP apdi Tags
+
+Used in Apple HDR GainMap images.
+
+These tags belong to the ExifTool XMP-apdi family 1 group.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  AuxiliaryImageType                            string
+  NativeFormat                                  string
+  StoredFormat                                  string
+
 =head3 XMP apple_fi Tags
 
 Face information tags written by the Apple iPhone 5 inside the mwg-rs
@@ -5030,6 +5046,16 @@ These tags belong to the ExifTool XMP-hdr family 1 group.
   CCVWhiteXY                                    string
   SceneReferred                                 boolean
 
+=head3 XMP HDRGainMap Tags
+
+Used in Apple HDR GainMap images.
+
+These tags belong to the ExifTool XMP-HDRGainMap family 1 group.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  HDRGainMapVersion                             string
+
 =head3 XMP hdrgm Tags
 
 Tags used in Adobe gain map images.
@@ -8877,7 +8903,7 @@ access to this information.
   0x0432   MeasurementScale?                    no
   0x0433   TimelineInfo?                        no
   0x0434   SheetDisclosure?                     no
-  0x0435   ChannelOptions?                      no
+  0x0435   ChannelOptions                       Photoshop ChannelOptions
   0x0436   OnionSkins?                          no
   0x0438   CountInfo?                           no
   0x043a   PrintInfo2?                          no
@@ -8940,6 +8966,15 @@ access to this information.
   ------   --------                             --------
       4    PixelAspectRatio                     no
 
+=head3 Photoshop ChannelOptions Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    ChannelColorSpace                    no
+      2    ChannelColorData                     no
+     11    ChannelOpacity                       no
+     12    ChannelColorIndicates                no
+
 =head3 Photoshop DocumentData Tags
 
   Tag ID   Tag Name                             Writable
@@ -9299,6 +9334,7 @@ Unknown only to reduce the volume of the normal output.
            CanonCameraInfo1100D                 Canon CameraInfo600D
            CanonCameraInfo1200D                 Canon CameraInfo60D
            CanonCameraInfoR6                    Canon CameraInfoR6
+           CanonCameraInfoR6m2                  Canon CameraInfoR6m2
            CanonCameraInfoG5XII                 Canon CameraInfoG5XII
            CanonCameraInfoPowerShot             Canon CameraInfoPowerShot
            CanonCameraInfoPowerShot2            Canon CameraInfoPowerShot2
@@ -10295,6 +10331,14 @@ CameraInfo tags for the EOS R5 and R6.
   ------   --------                             --------
    2801    ShutterCount                         int32u
 
+=head3 Canon CameraInfoR6m2 Tags
+
+CameraInfo tags for the EOS R6 Mark II.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+   3369    ShutterCount                         int32u
+
 =head3 Canon CameraInfoG5XII Tags
 
 CameraInfo tags for the PowerShot G5 X Mark II.
@@ -12912,6 +12956,35 @@ Thermal parameters extracted from APP4 of some DJI RJPEG files.
       8    Emissivity                           no
      10    ReflectedTemperature                 no
 
+=head3 DJI Protobuf Tags
+
+Tags found in protobuf-format DJI meta djmd and dbgi timed metadata.  Only a
+few tags are currently known, but unknown djmd tags may be extracted by
+setting the Unknown option to 1 (or 2 to also extract unknown dbgi debug
+tags).  Tag ID's are composed of the corresponding .proto file name combined
+with the hierarchical protobuf field numbers.  The "dvtm_AVATA2.proto" file
+is used by the DJI Avanta 2, and "dvtm_ac203.proto" by the OsmoAction4.
+
+  Tag ID                  Tag Name              Writable
+  ------                  --------              --------
+  'Protocol'              Protocol              no
+  'dvtm_AVATA2_1-1-10'    Model                 no
+  'dvtm_AVATA2_2-2-3-1'   SerialNumber          no
+  'dvtm_AVATA2_2-3-1'     FrameWidth            no
+  'dvtm_AVATA2_2-3-2'     FrameHeight           no
+  'dvtm_AVATA2_2-3-3'     FrameRate             no
+  'dvtm_AVATA2_3-1-2'     TimeStamp             no
+  'dvtm_AVATA2_3-4-4-1-2' GPSLatitude           no
+  'dvtm_AVATA2_3-4-4-1-3' GPSLongitude          no
+  'dvtm_ac203_1-1-10'     Model                 no
+  'dvtm_ac203_2-3-1'      FrameWidth            no
+  'dvtm_ac203_2-3-2'      FrameHeight           no
+  'dvtm_ac203_2-3-3'      FrameRate             no
+  'dvtm_ac203_3-4-2-1-2'  GPSLatitude           no
+  'dvtm_ac203_3-4-2-1-3'  GPSLongitude          no
+  'dvtm_ac203_3-4-2-2'    GPSAltitude           no
+  'dvtm_ac203_3-4-2-6-1'  GPSDateTime           no
+
 =head2 FLIR Tags
 
 Information extracted from the maker notes of JPEG images from thermal
@@ -24770,7 +24843,9 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'UNIT'   Units?                               no
   'VERS'   MetadataVersion                      no
   'VFOV'   FieldOfView                          no
+  'VFPS'   VideoFrameRate                       no
   'VFRH'   VisualFlightRulesHUD                 no
+  'VRES'   VideoFrameSize                       no
   'WBAL'   ColorTemperatures                    no
   'WNDM'   WindProcessing                       no
   'WRGB'   WhiteBalanceRGB                      no
@@ -29936,13 +30011,14 @@ for the official QuickTime specification.
   'sefd'               SamsungTrailer           Samsung Trailer
   'skip'               CanonSkip                Canon Skip
                        PreviewImage             no
-                       SkipInfo                 -
+                       SkipInfo                 QuickTime Stream
+                       LigoGPSInfo              -
                        Skip?                    no
   'thm '               ThumbnailImage           no
   'thum'               ThumbnailImage           no
   'udat'               GPSLog                   no
   'udta'               KenwoodData              QuickTime Stream
-                       LIGO_JSON                QuickTime Stream
+                       LigoJSON                 QuickTime Stream
                        FLIRData                 FLIR UserData
   'uuid'               XMP                      XMP
                        UUID-PROF                QuickTime Profile
@@ -29962,7 +30038,7 @@ for the official QuickTime specification.
 The tags below are extracted from timed metadata in QuickTime and other
 formats of video files when the ExtractEmbedded option is used.  Although
 most of these tags are combined into the single table below, ExifTool
-currently reads 82 different formats of timed GPS metadata from video files.
+currently reads 96 different types of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -29973,6 +30049,8 @@ currently reads 82 different formats of timed GPS metadata from video files.
   CameraDateTime                                no
   CameraModel                                   no
   Car                                           no
+  DJIDebug?                                     DJI Protobuf
+  DJIMetadata                                   DJI Protobuf
   DateTimeOriginal                              no
   DateTimeStamp                                 no
   Distance                                      no
@@ -30012,6 +30090,8 @@ currently reads 82 different formats of timed GPS metadata from video files.
   Unknown01?                                    no
   Unknown02?                                    no
   Unknown03?                                    no
+  Unknown_H?                                    no
+  Unknown_M?                                    no
   UserLabel                                     no
   VerticalSpeed                                 no
   VideoTimeStamp                                no

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

@@ -325,7 +325,7 @@ sub ProcessVCard($$)
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};  # read next card as a new document
         }
         unless ($val =~ s/^([-A-Za-z0-9.]+)//) {
-            $et->WarnOnce("Unrecognized line in $lbl file");
+            $et->Warn("Unrecognized line in $lbl file");
             next;
         }
         my $tag = $1;
@@ -379,7 +379,7 @@ sub ProcessVCard($$)
                 $param{$p} = '';
             }
         }
-        $val =~ s/^:// or $et->WarnOnce("Invalid line in $lbl file"), next;
+        $val =~ s/^:// or $et->Warn("Invalid line in $lbl file"), next;
         # add 'Type' parameter to id and name if it exists
         $param{Type} and $tag .= $param{Type}, $name .= $param{Type};
         # convert base64-encoded data

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

@@ -421,7 +421,7 @@ sub ValidateExif($$$$$$$$)
 {
     my ($et, $tagTablePtr, $tag, $tagInfo, $lastTag, $ifd, $count, $formatStr) = @_;
 
-    $et->WarnOnce("Entries in $ifd are out of order") if $tag <= $lastTag;
+    $et->Warn("Entries in $ifd are out of order") if $tag <= $lastTag;
 
     # (get tagInfo for unknown tags if Unknown option not used)
     if (not defined $tagInfo and $$tagTablePtr{$tag} and ref $$tagTablePtr{$tag} eq 'HASH') {
@@ -532,8 +532,8 @@ sub ValidateOffsetInfo($$$;$)
         while (@offsets) {
             my $start = pop @offsets;
             my $end = $start + pop @sizes;
-            $et->WarnOnce("$dirName:$$offsets[0]{Name} is zero", $minor) if $start == 0;
-            $et->WarnOnce("$dirName:$$sizes[0]{Name} is zero", $minor) if $start == $end;
+            $et->Warn("$dirName:$$offsets[0]{Name} is zero", $minor) if $start == 0;
+            $et->Warn("$dirName:$$sizes[0]{Name} is zero", $minor) if $start == $end;
             next unless $end > $fileSize;
             if ($start >= $fileSize) {
                 if ($start == 0xffffffff) {

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

@@ -387,8 +387,8 @@ sub ValidateImageData($$$;$)
             }
             push @bitsPerSample, $bitsPerSample[0] while @bitsPerSample < $samplesPerPix;
             foreach (@bitsPerSample) {
-                $et->WarnOnce("$dirName BitsPerSample values are different", $minor) if $_ ne $bitsPerSample[0];
-                $et->WarnOnce("Invalid $dirName BitsPerSample value", $minor) if $_ < 1 or $_ > 32;
+                $et->Warn("$dirName BitsPerSample values are different", $minor) if $_ ne $bitsPerSample[0];
+                $et->Warn("Invalid $dirName BitsPerSample value", $minor) if $_ < 1 or $_ > 32;
             }
         }
         my $bitsPerPixel = 0;

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

@@ -339,7 +339,7 @@ sub FormatQTValue($$;$$)
         $flags = 0x01;  # UTF8
         $$valPt = $et->Encode($$valPt, 'UTF8');
     }
-    defined $$valPt or $et->WarnOnce("Error converting value for $$tagInfo{Name}");
+    defined $$valPt or $et->Warn("Error converting value for $$tagInfo{Name}");
     return $flags;
 }
 
@@ -548,7 +548,7 @@ sub WriteItemInfo($$$)
                 $buff = $v2;
                 $wasDeflated = 1;
             } else {
-                $et->WarnOnce("Error inflating $name metadata");
+                $et->Warn("Error inflating $name metadata");
                 next;
             }
         }
@@ -683,7 +683,7 @@ sub WriteItemInfo($$$)
                 # write compressed XMP if Compress option is set
                 if ($et->Options('Compress') and length $newVal) {
                     if (not eval { require Compress::Zlib }) {
-                        $et->WarnOnce('Install Compress::Zlib to write compressed metadata');
+                        $et->Warn('Install Compress::Zlib to write compressed metadata');
                     } else {
                         my $deflate = Compress::Zlib::deflateInit();
                         if ($deflate) {
@@ -973,7 +973,7 @@ sub WriteQuickTime($$$)
                     $et->Error('End of processing at large atom (LargeFileSupport not enabled)');
                     last;
                 } elsif ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Processing large atom (LargeFileSupport is 2)');
+                    $et->Warn('Processing large atom (LargeFileSupport is 2)');
                 }
             }
             $size = $hi * 4294967296 + $lo - 16;

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

@@ -112,7 +112,7 @@ sub ValidateProperty($$;$)
                             my $valLang = $$et{XmpValidateLangAlt} || ($$et{XmpValidateLangAlt} = { });
                             $$valLang{$langPath} or $$valLang{$langPath} = { };
                             if ($$valLang{$langPath}{$lang}) {
-                                $et->WarnOnce("Duplicate language ($lang) in lang-alt list: $langPath");
+                                $et->Warn("Duplicate language ($lang) in lang-alt list: $langPath");
                             } else {
                                 $$valLang{$langPath}{$lang} = 1;
                             }
@@ -984,7 +984,7 @@ sub WriteXMP($$;$)
                         (not @fixInfo or $fixInfo[0] ne $info);
                     pop @props;
                 }
-                $et->WarnOnce("Error finding parent structure for $$tagInfo{Name}") unless @fixInfo;
+                $et->Warn("Error finding parent structure for $$tagInfo{Name}") unless @fixInfo;
             }
             # fix property path for this tag (last in the @fixInfo list)
             push @fixInfo, $tagInfo unless @fixInfo and $isStruct;

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

@@ -1299,10 +1299,10 @@ sub SetNewValuesFromFile($$;@)
                     ExtractEmbedded FastScan Filter FixBase Geolocation GeolocAltNames
                     GeolocFeature GeolocMinPop GeolocMaxDist GlobalTimeShift HexTagIDs
                     IgnoreGroups IgnoreMinorErrors IgnoreTags ImageHashType Lang
-                    LargeFileSupport ListItem ListSep MDItemTags MissingTagValue NoPDFList
-                    NoWarning Password PrintConv QuickTimeUTC RequestTags SaveFormat SavePath
-                    ScanForXMP StructFormat SystemTags TimeZone Unknown UserParam Validate
-                    WindowsLongPath WindowsWideFile XAttrTags XMPAutoConv))
+                    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{$_});
         }
@@ -1749,7 +1749,7 @@ GNV_TagInfo:    foreach $tagInfo (@tagInfoList) {
                 my $err = &$checkProc($self, $tagInfo, \$val);
                 if ($err or not defined $val) {
                     $err or $err = 'Error generating raw value';
-                    $self->WarnOnce("$err for $$tagInfo{Name}");
+                    $self->Warn("$err for $$tagInfo{Name}");
                     @$vals = ();
                     last;
                 }
@@ -1769,7 +1769,7 @@ GNV_TagInfo:    foreach $tagInfo (@tagInfoList) {
                 # an empty warning ("\n") ignores tag with no error
                 if ($evalWarning ne "\n") {
                     my $err = CleanWarning() . " in $$tagInfo{Name} (RawConvInv)";
-                    $self->WarnOnce($err);
+                    $self->Warn($err);
                 }
                 @$vals = ();
                 last;
@@ -1953,8 +1953,8 @@ sub SetFileModifyDate($$;$$$)
     }
     my ($aTime, $mTime, $cTime);
     if ($tag eq 'FileCreateDate') {
-        eval { require Win32::API } or $self->WarnOnce("Install Win32::API to set $tag"), return -1;
-        eval { require Win32API::File } or $self->WarnOnce("Install Win32API::File to set $tag"), return -1;
+        eval { require Win32::API } or $self->Warn("Install Win32::API to set $tag"), return -1;
+        eval { require Win32API::File } or $self->Warn("Install Win32API::File to set $tag"), return -1;
         $cTime = $val;
     } else {
         $aTime = $mTime = $val;
@@ -2151,7 +2151,7 @@ sub SetSystemTags($$)
             $self->VerboseValue('+ FilePermissions', $perm);
             $result = 1;
         } else {
-            $self->WarnOnce('Error setting FilePermissions');
+            $self->Warn('Error setting FilePermissions');
             $result = -1;
         }
     }
@@ -2165,7 +2165,7 @@ sub SetSystemTags($$)
             $self->VerboseValue('+ FileGroupID', $gid) if $gid >= 0;
             $result = 1;
         } else {
-            $self->WarnOnce('Error setting FileGroup/UserID');
+            $self->Warn('Error setting FileGroup/UserID');
             $result = -1 unless $result;
         }
     }
@@ -2181,7 +2181,7 @@ sub SetSystemTags($$)
             $result = $res if $res == 1 or not $result;
             last;
         } elsif ($tag ne 'FileCreateDate') {
-            $self->WarnOnce('Can only set MDItem tags on MacOS');
+            $self->Warn('Can only set MDItem tags on MacOS');
             last;
         }
     }
@@ -2194,7 +2194,7 @@ sub SetSystemTags($$)
         } elsif (ref $file) {
             $self->Warn('Writing ZoneIdentifer requires a file name');
         } elsif (defined $self->GetNewValue('ZoneIdentifier', \$zhash)) {
-            $self->Warn('ZoneIndentifier may only be delted');
+            $self->Warn('ZoneIndentifier may only be deleted');
         } elsif (not eval { require Win32API::File }) {
             $self->Warn('Install Win32API::File to write ZoneIdentifier');
         } else {
@@ -4266,7 +4266,7 @@ sub WriteDirectory($$$;$)
                 # allow MakerNotes to be deleted from ExifIFD of CR3 file
                 not ($self->IsRawType() == 2 and $parent eq 'ExifIFD'))
             {
-                $self->WarnOnce("Can't delete $1 from $$self{FileType}",1);
+                $self->Warn("Can't delete $1 from $$self{FileType}",1);
                 undef $grp1;
             } elsif (not $blockExifTypes{$$self{FILE_TYPE}}) {
                 # restrict delete logic to prevent entire tiff image from being killed
@@ -6430,7 +6430,7 @@ sub WriteJPEG($$)
                                 # warn of subsequent XMP blocks specifying a different
                                 # HasExtendedXMP (have never seen this)
                                 if ($goodGuid and $goodGuid ne $2) {
-                                    $self->WarnOnce('Multiple XMP segments specifying different extended XMP GUID');
+                                    $self->Warn('Multiple XMP segments specifying different extended XMP GUID');
                                 }
                                 $goodGuid = $2; # GUID for the standard extended XMP
                             }
@@ -6578,7 +6578,7 @@ sub WriteJPEG($$)
                         undef $$segDataPt;
                         next Marker;
                     } elsif (defined $chunkNum) {
-                        $self->WarnOnce('Invalid or extraneous ICC_Profile chunk(s)');
+                        $self->Warn('Invalid or extraneous ICC_Profile chunk(s)');
                         # fall through to preserve this extra profile...
                     }
                 } elsif ($$segDataPt =~ /^FPXR\0/) {
@@ -6985,9 +6985,9 @@ sub SetFileTime($$;$$$$)
     # on Windows, try to work around incorrect file times when daylight saving time is in effect
     if ($^O eq 'MSWin32') {
         if (not eval { require Win32::API }) {
-            $self->WarnOnce('Install Win32::API for proper handling of Windows file times');
+            $self->Warn('Install Win32::API for proper handling of Windows file times');
         } elsif (not eval { require Win32API::File }) {
-            $self->WarnOnce('Install Win32API::File for proper handling of Windows file times');
+            $self->Warn('Install Win32API::File for proper handling of Windows file times');
         } else {
             # get Win32 handle, needed for SetFileTime
             my $win32Handle = eval { Win32API::File::GetOsFHandle($file) };

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.69';
+$VERSION = '3.70';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -207,6 +207,8 @@ my %xmpNS = (
     # Note: Google uses a prefix of 'Container', but this conflicts with the
     # Device Container namespace, also by Google.  So call this one GContainer
     GContainer=> 'http://ns.google.com/photos/1.0/container/',
+    HDRGainMap=> 'http://ns.apple.com/HDRGainMap/1.0/',
+    apdi      => 'http://ns.apple.com/pixeldatainfo/1.0/',
 );
 
 # build reverse namespace lookup
@@ -934,6 +936,14 @@ my %sRangeMask = (
         Name => 'xmpDSA',
         SubDirectory => { TagTable => 'Image::ExifTool::Panasonic::DSA' },
     },
+    HDRGainMap => {
+        Name => 'HDRGainMap',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::HDRGainMap' },
+    },
+    apdi => {
+        Name => 'apdi',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::apdi' },
+    },
     seal => {
         Name => 'seal',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::seal' },
@@ -2839,7 +2849,7 @@ sub FullEscapeXML($)
     $str =~ s/\\/\/sg;                  # escape backslashes too
     # then use C-escape sequences for invalid characters
     if ($str =~ /[\0-\x1f]/ or Image::ExifTool::IsUTF8(\$str) < 0) {
-        $str =~ s/([\0-\x1f\x80-\xff])/sprintf("\\x%.2x",ord $1)/sge;
+        $str =~ s/([\0-\x1f\x7f-\xff])/sprintf("\\x%.2x",ord $1)/sge;
     }
     return $str;
 }
@@ -3620,9 +3630,9 @@ NoLoop:
         }
         if ($$et{XmpValidate} and $fmt and $fmt eq 'boolean' and $val!~/^True|False$/) {
             if ($val =~ /^true|false$/) {
-                $et->WarnOnce("Boolean value for XMP-$ns:$$tagInfo{Name} should be capitalized",1);
+                $et->Warn("Boolean value for XMP-$ns:$$tagInfo{Name} should be capitalized",1);
             } else {
-                $et->WarnOnce(qq(Boolean value for XMP-$ns:$$tagInfo{Name} should be "True" or "False"),1);
+                $et->Warn(qq(Boolean value for XMP-$ns:$$tagInfo{Name} should be "True" or "False"),1);
             }
         }
         # protect against large binary data in unknown tags
@@ -3813,7 +3823,7 @@ sub ParseXMPElement($$$;$$$$)
                         $stdNS = $uri2ns{$try};
                         if ($stdNS) {
                             $val = $try;
-                            $et->WarnOnce("Fixed incorrect URI for xmlns:$ns", 1);
+                            $et->Warn("Fixed incorrect URI for xmlns:$ns", 1);
                         } elsif ($val =~ m(^http://ns.nikon.com/BASIC_PARAM)) {
                             $et->OverrideFileType('NXD','application/x-nikon-nxd');
                         } else {
@@ -3894,9 +3904,9 @@ sub ParseXMPElement($$$;$$$$)
             if ($nItems == 1000) {
                 my ($tg,$ns) = GetXMPTagID($propList);
                 if ($isWriting) {
-                    $et->WarnOnce("Excessive number of items for $ns:$tg. Processing may be slow", 1);
+                    $et->Warn("Excessive number of items for $ns:$tg. Processing may be slow", 1);
                 } elsif (not $$et{OPTIONS}{IgnoreMinorErrors}) {
-                    $et->WarnOnce("Extracted only 1000 $ns:$tg items. Ignore minor errors to extract all", 2);
+                    $et->Warn("Extracted only 1000 $ns:$tg items. Ignore minor errors to extract all", 2);
                     last;
                 }
             }
@@ -3996,12 +4006,12 @@ sub ParseXMPElement($$$;$$$$)
                 } elsif ($$et{XmpAbout} ne $attrs{$shortName}) {
                     if ($isWriting) {
                         my $str = "Different 'rdf:about' attributes not handled";
-                        unless ($$et{WARNED_ONCE}{$str}) {
+                        unless ($$et{WAS_WARNED}{$str}) {
                             $et->Error($str, 1);
-                            $$et{WARNED_ONCE}{$str} = 1;
+                            $$et{WAS_WARNED}{$str} = 1;
                         }
                     } elsif ($$et{XmpValidate}) {
-                        $et->WarnOnce("Different 'rdf:about' attributes");
+                        $et->Warn("Different 'rdf:about' attributes");
                     }
                 }
             }

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

@@ -2250,6 +2250,44 @@ my %sACDSeeRegionStruct = (
     Gamma               => { Writable => 'real', List => 'Seq', Avoid => 1 },
 );
 
+%Image::ExifTool::XMP::HDRGainMap = (
+    %xmpTableDefaults,
+    GROUPS => { 1 => 'XMP-HDRGainMap', 2 => 'Unknown' },
+    NAMESPACE   => 'HDRGainMap',
+    NOTES => 'Used in Apple HDR GainMap images.',
+    HDRGainMapVersion => {
+        PrintConv => 'IsInt($val) ? join(".",unpack("C*", pack "N", $val)) : $val',
+        PrintConvInv => q{
+            return $val unless $val =~ /^\d+\.\d+\.\d+\.\d+$/;
+            return unpack('N', pack('C*', split /\./, $val));
+        },
+    },
+);
+
+%Image::ExifTool::XMP::apdi = (
+    %xmpTableDefaults,
+    GROUPS => { 1 => 'XMP-apdi', 2 => 'Image' },
+    NAMESPACE   => 'apdi',
+    NOTES => 'Used in Apple HDR GainMap images.',
+    NativeFormat => {
+        PrintConv => q{
+            return $val unless IsInt($val);
+            my $tmp = pack("N", $val);
+            $tmp =~ /^\w{4}$/ ? $tmp : $val;
+        },
+        PrintConvInv => '$val =~ /^\w{4}$/ ? unpack("N", $val) : $val',
+    },
+    AuxiliaryImageType => { },
+    StoredFormat => {
+        PrintConv => q{
+            return $val unless IsInt($val);
+            my $tmp = pack("N", $val);
+            $tmp =~ /^\w{4}$/ ? $tmp : $val;
+        },
+        PrintConvInv => '$val =~ /^\w{4}$/ ? unpack("N", $val) : $val',
+    },
+);
+
 # SVG namespace properties (ref 9)
 %Image::ExifTool::XMP::SVG = (
     GROUPS => { 0 => 'SVG', 1 => 'SVG', 2 => 'Image' },

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

@@ -330,7 +330,7 @@ sub ProcessRAR($$)
                     $et->Warn('Large block encountered. Aborting.');
                     last;
                 } elsif ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Processing large block (LargeFileSupport is 2)');
+                    $et->Warn('Processing large block (LargeFileSupport is 2)');
                 }
             }
             # process the block