exiftool_vendored 9.46.0 → 9.49.0

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/TagNames.pod

@@ -116,7 +116,9 @@ This table lists information extracted by ExifTool from JPEG images.
   'APP7'       Pentax                           Pentax
                Qualcomm                         Qualcomm
   'APP8'       SPIFF                            JPEG SPIFF
+  'APP9'       MediaJukebox                     JPEG MediaJukebox
   'APP10'      Comment                          N
+  'APP11'      JPEG-HDR                         JPEG HDR
   'APP12'      PictureInfo                      APP12 PictureInfo
                Ducky                            APP12 Ducky
   'APP13'      Photoshop                        Photoshop
@@ -201,6 +203,35 @@ specification.
      18    YResolution                          N
      22    XResolution                          N
 
+=head3 JPEG MediaJukebox Tags
+
+Tags found in the XML metadata of the "Media Jukebox" APP9 segment.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  Album                                         N
+  Date                                          N
+  Name                                          N
+  People                                        N
+  Places                                        N
+  Tool_Name                                     N
+  Tool_Version                                  N
+
+=head3 JPEG HDR Tags
+
+Information extracted from APP11 of a JPEG-HDR image.
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'RatioImage'         RatioImage               N
+  'alp'                Alpha                    N
+  'bet'                Beta                     N
+  'cor'                CorrectionMethod         N
+  'ln0'                Ln0                      N
+  'ln1'                Ln1                      N
+  's2n'                S2n                      N
+  'ver'                JPEG-HDRVersion          N
+
 =head3 JPEG AdobeCM Tags
 
 The "Adobe_CM" APP13 segment presumably contains color management
@@ -550,6 +581,7 @@ EXIF 2.3 specification.
            MakerNoteKodak7           ExifIFD    Kodak Type7
            MakerNoteKodak8a          ExifIFD    Kodak Type8
            MakerNoteKodak8b          ExifIFD    Kodak Type8
+           MakerNoteKodak8c          ExifIFD    Kodak Type8
            MakerNoteKodak9           ExifIFD    Kodak Type9
            MakerNoteKodak10          ExifIFD    Kodak Type10
            MakerNoteKodakUnknown     ExifIFD    Kodak Unknown
@@ -3338,6 +3370,7 @@ complete GeoTIFF specification.
   0x080b   GeogInvFlattening                    N
   0x080c   GeogAzimuthUnits                     N
   0x080d   GeogPrimeMeridianLong                N
+  0x080e   GeogToWGS84                          N
   0x0c00   ProjectedCSType                      N
   0x0c01   PCSCitation                          N
   0x0c02   Projection                           N
@@ -6214,15 +6247,19 @@ SEQ file, even though SEQ is not listed as a supported file type.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0001   RawData                              FLIR RawData
+  0x0005   GainDeadData                         FLIR GainDeadData
+  0x0006   CoarseData                           FLIR CoarseData
   0x000e   EmbeddedImage                        FLIR EmbeddedImage
   0x0020   CameraInfo                           FLIR CameraInfo
+  0x0021   MeasurementInfo                      FLIR MeasInfo
   0x0022   PaletteInfo                          FLIR PaletteInfo
   0x0023   TextInfo                             FLIR TextInfo
   0x0024   EmbeddedAudioFile                    N
+  0x0028   PaintData                            FLIR PaintData
   0x002a   PiP                                  FLIR PiP
   0x002b   GPSInfo                              FLIR GPSInfo
   0x002c   MeterLink                            FLIR MeterLink
-  0x002e   ParamInfo                            FLIR ParamInfo
+  0x002e   ParameterInfo                        FLIR ParamInfo
 
 =head3 FLIR RawData Tags
 
@@ -6239,6 +6276,28 @@ as-is.  Note that most FLIR cameras using the PNG format seem to write the
      16    RawThermalImageType                  N
    16.1    RawThermalImage                      N
 
+=head3 FLIR GainDeadData Tags
+
+Information found in FFF-format .GAN calibration image files.
+
+  Index2   Tag Name                             Writable
+  ------   --------                             --------
+      1    GainDeadMapImageWidth                N
+      2    GainDeadMapImageHeight               N
+     16    GainDeadMapImageType                 N
+   16.1    GainDeadMapImage                     N
+
+=head3 FLIR CoarseData Tags
+
+Information found in FFF-format .CRS correction image files.
+
+  Index2   Tag Name                             Writable
+  ------   --------                             --------
+      1    CoarseMapImageWidth                  N
+      2    CoarseMapImageHeight                 N
+     16    CoarseMapImageType                   N
+   16.1    CoarseMapImage                       N
+
 =head3 FLIR EmbeddedImage Tags
 
   Index2   Tag Name                             Writable
@@ -6294,6 +6353,19 @@ for details.
     912    FocusStepCount                       N
    1116    FocusDistance                        N
 
+=head3 FLIR MeasInfo Tags
+
+Tags listed below are only for the first measurement tool, however multiple
+measurements may be added, and information is extracted for all of them.
+Tags for subsequent measurements are generated as required with the prefixes
+"Meas2", "Meas3", etc.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  Meas1Label                                    N
+  Meas1Params                                   N
+  Meas1Type                                     N
+
 =head3 FLIR PaletteInfo Tags
 
   Index1   Tag Name                             Writable
@@ -6324,6 +6396,17 @@ for details.
   Value2                                        N
   Value3                                        N
 
+=head3 FLIR PaintData Tags
+
+Information generated by FLIR Tools "Paint colors" tool.
+
+  Index2   Tag Name                             Writable
+  ------   --------                             --------
+      5    PaintImageWidth                      N
+      6    PaintImageHeight                     N
+     20    PaintImageType                       N
+   20.1    PaintImage                           N
+
 =head3 FLIR PiP Tags
 
 FLIR Picture in Picture tags.
@@ -6647,6 +6730,7 @@ Tags found in the FujiIFD information of RAF images from some models.
   0xf003   BitsPerSample                        N
   0xf007   StripOffsets                         N
   0xf008   StripByteCounts                      N
+  0xf00a   BlackLevel                           N
   0xf00c   WB_GRBLevelsStandard                 N
   0xf00d   WB_GRBLevelsDaylight                 N
   0xf00e   WB_GRBLevels                         N
@@ -12410,7 +12494,7 @@ Valid for DSC-RX100M2, DSC-QX10/QX100.
 
 =head3 Sony Tag2010g Tags
 
-Valid for DSC-RX10, ILCE-7/7R.
+Valid for DSC-RX10, ILCE-7/7R/5000.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -12535,7 +12619,7 @@ DSC-HX50V, DSC-QX10/QX100.
 
 =head3 Sony Tag9400c Tags
 
-Valid for DSC-RX10, ILCE-7/7R.
+Valid for DSC-RX10, ILCE-7/7R/5000.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -12574,7 +12658,7 @@ Valid for DSC-RX10, ILCE-7/7R.
 
 =head3 Sony Tag9405b Tags
 
-Valid for the DSC-RX10 and ILCE-7/7R.
+Valid for the DSC-RX10 and ILCE-7/7R/5000.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -12871,6 +12955,7 @@ still proprietary) Adobe format.
            MakerNoteKodak7                      Kodak Type7
            MakerNoteKodak8a                     Kodak Type8
            MakerNoteKodak8b                     Kodak Type8
+           MakerNoteKodak8c                     Kodak Type8
            MakerNoteKodak9                      Kodak Type9
            MakerNoteKodak10                     Kodak Type10
            MakerNoteKodakUnknown                Kodak Unknown
@@ -15030,6 +15115,7 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   DCFootprintWKT                                string_
   DCGeodeticDatum                               string_
   DCGeoreferencedBy                             string_
+  DCGeoreferencedDate                           string_
   DCGeoreferenceProtocol                        string_
   DCGeoreferenceRemarks                         string_
   DCGeoreferenceSources                         string_
@@ -15091,6 +15177,7 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   LatestAgeOrHighestStage                       string_
   LatestEonOrHighestEonothem                    string_
   LatestEpochOrHighestSeries                    string_
+  LatestEraOrHighestErathem                     string_
   LatestPeriodOrHighestSystem                   string_
   LithostratigraphicTerms                       string_
   LowestBiostratigraphicZone                    string_
@@ -15101,6 +15188,7 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   IdentificationQualifier                       string_
   IdentificationReferences                      string_
   IdentificationRemarks                         string_
+  IdentificationVerificationStatus              string_
   IdentifiedBy                                  string_
   TypeStatus                                    string_
   MeasurementOrFact                             DarwinCore MeasurementOrFact Struct
@@ -15170,10 +15258,12 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   TaxonNameAccordingToID                        string_
   TaxonNamePublishedIn                          string_
   TaxonNamePublishedInID                        string_
+  TaxonNamePublishedInYear                      string_
   TaxonNomenclaturalCode                        string_
   TaxonNomenclaturalStatus                      string_
   TaxonOrder                                    string_
   TaxonOriginalNameUsage                        string_
+  TaxonOriginalNameUsageID                      string_
   TaxonParentNameUsage                          string_
   TaxonParentNameUsageID                        string_
   TaxonPhylum                                   string_
@@ -15211,6 +15301,7 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   GeoreferenceSources                           string
   GeoreferenceVerificationStatus                string
   GeoreferencedBy                               string
+  GeoreferencedDate                             string
   HigherGeography                               string
   HigherGeographyID                             string
   Island                                        string
@@ -15276,6 +15367,7 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   LatestAgeOrHighestStage                       string
   LatestEonOrHighestEonothem                    string
   LatestEpochOrHighestSeries                    string
+  LatestEraOrHighestErathem                     string
   LatestPeriodOrHighestSystem                   string
   LithostratigraphicTerms                       string
   LowestBiostratigraphicZone                    string
@@ -15290,6 +15382,7 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   IdentificationQualifier                       string
   IdentificationReferences                      string
   IdentificationRemarks                         string
+  IdentificationVerificationStatus              string
   IdentifiedBy                                  string
   TypeStatus                                    string
 
@@ -15379,10 +15472,12 @@ L<http://rs.tdwg.org/dwc/index.htm> for the official specification.
   NameAccordingToID                             string
   NamePublishedIn                               string
   NamePublishedInID                             string
+  NamePublishedInYear                           string
   NomenclaturalCode                             string
   NomenclaturalStatus                           string
   Order                                         string
   OriginalNameUsage                             string
+  OriginalNameUsageID                           string
   ParentNameUsage                               string
   ParentNameUsageID                             string
   Phylum                                        string
@@ -18409,8 +18504,8 @@ meta information a variety of audio, video and image parameters, as well as
 proprietary information written by many camera models.  Tags with a question
 mark after their name are not extracted unless the Unknown option is set.
 
-ExifTool has the ability to write/create XMP, and edit date/time tags in
-QuickTime format files.
+ExifTool has the ability to write/create XMP, and edit some date/time tags
+in QuickTime-format files.
 
 According to the specification, many QuickTime date/time tags should be
 stored as UTC.  Unfortunately, digital cameras often store local time values
@@ -26529,6 +26624,7 @@ for more details.
                        MakerNoteKodak7
                        MakerNoteKodak8a
                        MakerNoteKodak8b
+                       MakerNoteKodak8c
                        MakerNoteKodak9
                        MakerNoteKodak10
                        MakerNoteKodakUnknown

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/WriteExif.pl

@@ -2700,10 +2700,22 @@ NoOverwrite:            next if $isNew > 0;
                         $newValue = '';    # reset value because we regenerate it below
                         for ($i=0; $i<$readCount; ++$i) {
                             my $off = $i * $formatSize[$readFormat];
-                            my $pt = ReadValue($valueDataPt, $valuePtr + $off,
-                                               $readFormName, 1, $oldSize - $off);
-                            my $subdirStart = $pt - $dataPos;
+                            my $val = ReadValue($valueDataPt, $valuePtr + $off,
+                                                $readFormName, 1, $oldSize - $off);
+                            my $subdirStart = $val - $dataPos;
                             my $subdirBase = $base;
+                            my $hdrLen;
+                            if (defined $$subdir{Start}) {
+                                #### eval Start ($val)
+                                my $newStart = eval $$subdir{Start};
+                                unless (Image::ExifTool::IsInt($newStart)) {
+                                    $et->Error("Bad subdirectory start for $$newInfo{Name}");
+                                    next;
+                                }
+                                $newStart -= $dataPos;
+                                $hdrLen = $newStart - $subdirStart;
+                                $subdirStart = $newStart;
+                            }
                             if ($$subdir{Base}) {
                                 my $start = $subdirStart + $dataPos;
                                 #### eval Base ($start,$base)
@@ -2757,6 +2769,11 @@ NoOverwrite:            next if $isNew > 0;
                                 $et->Error("Error writing $subdirName") unless $$et{VALUE}{Error};
                                 return undef;
                             }
+                            # add back original header if necessary (ie. Ricoh GR)
+                            if ($hdrLen and $hdrLen > 0 and $subdirStart <= $dataLen) {
+                                $subdirData = substr($$dataPt, $subdirStart - $hdrLen, $hdrLen) . $subdirData;
+                                $subdirInfo{Fixup}{Start} += $hdrLen;
+                            }
                             unless (length $subdirData) {
                                 next unless $inMakerNotes;
                                 # don't delete MakerNote Sub-IFD's, write empty IFD instead

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/WriteIPTC.pl

@@ -215,7 +215,7 @@ sub IptcTime($)
         } else {
             # use local system timezone by default 
             my (@tm, $time);
-            if ($date and $date =~ /^(\d{4}):(\d{2}):(\d{2})\s*$/ and eval 'require Time::Local') {
+            if ($date and $date =~ /^(\d{4}):(\d{2}):(\d{2})\s*$/ and eval { require Time::Local }) {
                 # we were given a date too, so determine the local timezone
                 # offset at the specified date/time
                 my @d = ($3,$2-1,$1-1900);
@@ -634,7 +634,7 @@ sub WriteIPTC($$$)
         my $new = grep /^new$/, @values;
         my $old = grep /^old$/, @values;
         last unless $new or $old;
-        unless (eval 'require Digest::MD5') {
+        unless (eval { require Digest::MD5 }) {
             $et->Warn('Digest::MD5 must be installed to calculate IPTC digest');
             last;
         }

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/WritePNG.pl

@@ -68,7 +68,7 @@ sub WriteProfile($$$;$)
 {
     my ($outfile, $rawType, $dataPt, $profile) = @_;
     my ($buff, $prefix, $chunk, $deflate);
-    if (eval 'require Compress::Zlib') {
+    if (eval { require Compress::Zlib }) {
         $deflate = Compress::Zlib::deflateInit();
     }
     if (not defined $profile) {
@@ -187,7 +187,7 @@ sub BuildTextChunk($$$$$)
     }
     if ($comp) {
         my $warn;
-        if (eval 'require Compress::Zlib') {
+        if (eval { require Compress::Zlib }) {
             my $deflate = Compress::Zlib::deflateInit();
             $compVal = $deflate->deflate($val) if $deflate;
             if (defined $compVal) {

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/WriteXMP.pl

@@ -582,7 +582,7 @@ sub LimitXMPSize($$$$$$)
     }
     $extData .= $rdfClose . $xmpClose;  # close rdf:RDF and x:xmpmeta
     # calculate GUID from MD5 of extended XMP data
-    if (eval 'require Digest::MD5') {
+    if (eval { require Digest::MD5 }) {
         $guid = uc unpack('H*', Digest::MD5::md5($extData));
         $newData =~ s/0{32}/$guid/;     # update GUID in main XMP segment
     }

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/Writer.pl

@@ -1604,7 +1604,7 @@ sub SetFileModifyDate($$;$$)
         $val = $$nvHash{Value}[0]; # get shifted value
     }
     if ($tag eq 'FileCreateDate') {
-        unless (eval 'require Win32API::File::Time') {
+        unless (eval { require Win32API::File::Time }) {
             $self->Warn("Install Win32API::File::Time to set $tag");
             return -1;
         }
@@ -1775,7 +1775,7 @@ sub WriteInfo($$;$$)
         } elsif (UNIVERSAL::isa($inRef,'File::RandomAccess')) {
             $inRef->Seek(0);
             $raf = $inRef;
-        } elsif ($] >= 5.006 and (eval 'require Encode; Encode::is_utf8($$inRef)' or $@)) {
+        } elsif ($] >= 5.006 and (eval { require Encode; Encode::is_utf8($$inRef) } or $@)) {
             # convert image data from UTF-8 to character stream if necessary
             my $buff = $@ ? pack('C*',unpack('U0C*',$$inRef)) : Encode::encode('utf8',$$inRef);
             if (defined $outfile) {
@@ -2052,7 +2052,7 @@ sub WriteInfo($$;$$)
                 seek($inRef, 0, 0) and          # seek back to the start
                 print $inRef $outBuff and       # write the new data
                 ($len >= $size or               # if necessary:
-                eval 'truncate($inRef, $len)'); #  shorten output file
+                eval { truncate($inRef, $len) }); #  shorten output file
         } else {
             $$inRef = $outBuff;                 # replace original data
         }
@@ -2325,7 +2325,7 @@ sub Sanitize($$)
     $$valPt = $$$valPt if ref $$valPt eq 'SCALAR';
     # make sure the Perl UTF-8 flag is OFF for the value if perl 5.6 or greater
     # (otherwise our byte manipulations get corrupted!!)
-    if ($] >= 5.006 and (eval 'require Encode; Encode::is_utf8($$valPt)' or $@)) {
+    if ($] >= 5.006 and (eval { require Encode; Encode::is_utf8($$valPt) } or $@)) {
         # repack by hand if Encode isn't available
         $$valPt = $@ ? pack('C*',unpack('U0C*',$$valPt)) : Encode::encode('utf8',$$valPt);
     }
@@ -3974,7 +3974,7 @@ sub InverseDateTime($$;$$)
             # add/remove timezone if necessary
             if ($tzFlag) {
                 if (not $tz) {
-                    if (eval 'require Time::Local') {
+                    if (eval { require Time::Local }) {
                         # determine timezone offset for this time
                         my @args = ($a[4],$a[3],$a[2],$a[1],$a[0]-1,$yr-1900);
                         my $diff = Time::Local::timegm(@args) - TimeLocal(@args);

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool/XMP.pm

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:Utils);
 use Image::ExifTool::Exif;
 require Exporter;
 
-$VERSION = '2.70';
+$VERSION = '2.71';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -2840,17 +2840,22 @@ sub FoundXMP($$$$;$)
         }
     }
 
-    # look up this tag in the appropriate table
-    $table or $table = 'Image::ExifTool::XMP::other';
-    $tagTablePtr = GetTagTable($table);
-    if ($$tagTablePtr{NAMESPACE}) {
+    if (not $ns and $$tagTablePtr{GROUPS}{0} ne 'XMP') {
+        # this is a simple XML table (no namespaces)
         $tagID = $tag;
     } else {
-        # add XMP namespace prefix to avoid collisions in variable-namespace tables
-        $xns = $xmpNS{$ns} || $ns;
-        $tagID = "$xns:$tag";
-        # add namespace to top-level structure property
-        $structProps[0][0] = "$xns:" . $structProps[0][0] if @structProps;
+        # look up this tag in the appropriate table
+        $table or $table = 'Image::ExifTool::XMP::other';
+        $tagTablePtr = GetTagTable($table);
+        if ($$tagTablePtr{NAMESPACE}) {
+            $tagID = $tag;
+        } else {
+            # add XMP namespace prefix to avoid collisions in variable-namespace tables
+            $xns = $xmpNS{$ns} || $ns;
+            $tagID = "$xns:$tag";
+            # add namespace to top-level structure property
+            $structProps[0][0] = "$xns:" . $structProps[0][0] if @structProps;
+        }
     }
     my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);