exiftool-vendored.pl 12.39.0 → 12.42.0

package/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 25764 tags, with 16462 unique tag names.
+They contain a total of 25792 tags, with 16480 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
@@ -629,6 +629,7 @@ for the official EXIF 2.32 specification.
            MakerNoteCanon            ExifIFD    Canon
            MakerNoteCasio            ExifIFD    Casio
            MakerNoteCasio2           ExifIFD    Casio Type2
+           MakerNoteDJIInfo          ExifIFD    DJI Info
            MakerNoteDJI              ExifIFD    DJI
            MakerNoteFLIR             ExifIFD    FLIR
            MakerNoteFujiFilm         ExifIFD    FujiFilm
@@ -669,6 +670,7 @@ for the official EXIF 2.32 specification.
            MakerNoteNintendo         ExifIFD    Nintendo
            MakerNoteOlympus          ExifIFD    Olympus
            MakerNoteOlympus2         ExifIFD    Olympus
+           MakerNoteOlympus3         ExifIFD    Olympus
            MakerNoteLeica            ExifIFD    Panasonic
            MakerNoteLeica2           ExifIFD    Panasonic Leica2
            MakerNoteLeica3           ExifIFD    Panasonic Leica3
@@ -853,6 +855,7 @@ for the official EXIF 2.32 specification.
            MakerNotePentax           IFD0       Pentax
            MakerNotePentax5          IFD0       Pentax
            MakerNoteRicohPentax      IFD0       Pentax
+           MakerNoteDJIInfo          IFD0       DJI Info
            DNGPrivateData            IFD0       int8u!
   0xc635   MakerNoteSafety           IFD0       int16u
   0xc640   RawImageSegmentation      -          no
@@ -6754,6 +6757,7 @@ Metadata tags that exist.
 
   Tag Name                                      Writable
   --------                                      --------
+  CreatorApp                                    no
   ManufacturerName                              no
   MediaColor                                    no
   MediaWeight                                   no
@@ -7346,6 +7350,7 @@ Unknown only to reduce the volume of the normal output.
   0x4021   MultiExp                             Canon MultiExp
   0x4024   FilterInfo                           Canon FilterInfo
   0x4025   HDRInfo                              Canon HDRInfo
+  0x4026   LogInfo                              Canon LogInfo
   0x4028   AFConfig                             Canon AFConfig
   0x403f   RawBurstModeRoll                     Canon RawBurstInfo
 
@@ -9515,6 +9520,18 @@ Information about creative filter settings.
       1    HDR                                  int32s
       2    HDREffect                            int32s
 
+=head3 Canon LogInfo Tags
+
+  Index4   Tag Name                             Writable
+  ------   --------                             --------
+      4    CompressionFormat                    int32s
+      6    Sharpness                            int32s
+      7    Saturation                           int32s
+      8    ColorTone                            int32s
+      9    ColorSpace2                          int32s
+     10    ColorMatrix                          int32s
+     11    CanonLogVersion                      int32s
+
 =head3 Canon AFConfig Tags
 
   Index4   Tag Name                             Writable
@@ -10637,6 +10654,30 @@ These tags belong to the ExifTool XMP-drone-dji family 1 group.
   RtkStdLon                                     real
   SelfData                                      string
 
+=head3 DJI Info Tags
+
+Tags written by some DJI drones.
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'FlightDegree(Y,P,R)' FlightDegree            no
+  'FlightSpeed(X,Y,Z)' FlightSpeed              no
+  'GimbalDegree(Y,P,R)' GimbalDegree            no
+  'adj_dbg_info'       ADJDebugInfo             no
+  'ae_dbg_info'        AEDebugInfo              no
+  'ae_histogram_info'  AEHistogramInfo          no
+  'ae_liveview_histogram_info'
+                       AELiveViewHistogramInfo  no
+  'ae_liveview_local_histogram'
+                       AELiveViewLocalHistogram no
+  'ae_local_histogram' AELocalHistogram         no
+  'af_dbg_info'        AFDebugInfo              no
+  'awb_dbg_info'       AWBDebugInfo             no
+  'hiso'               Histogram                no
+  'hyperlapse_dbg_info' HyperlapsDebugInfo      no
+  'sensor_id'          SensorID                 no
+  'xidiri'             Xidiri                   no
+
 =head3 DJI ThermalParams Tags
 
 Thermal parameters extracted from APP4 of DJI RJPEG files from the ZH20T.
@@ -13591,6 +13632,8 @@ These tags belong to the ExifTool XMP-ast family 1 group.
   About                                         no
   GPSAltitude                                   no
   GPSAltitudeRef                                no
+  GPSImgDirection                               no
+  GPSImgDirectionRef                            no
   GPSLatitude                                   no
   GPSLatitudeRef                                no
   GPSLongitude                                  no
@@ -14317,6 +14360,7 @@ These tags are used by the Z9.
     434    FlashOutput?                         int8u
     444    FlashRemoteControl?                  int8u
     456    FlashWirelessOption?                 int8u
+    528    AFAreaMode                           int8u
     530    VRMode                               int8u
     534    BracketSet                           int8u
     536    BracketProgram                       int8u
@@ -14710,7 +14754,7 @@ These tags are used by the D4S, D750, D810, D5500, D7200 (FlashInfoVersion
       0    AFInfo2Version                       no
      62    AFImageWidth                         int16u
      64    AFImageHeight                        int16u
-     67    FocusPositionHoriontal               int8u~
+     67    FocusPositionHorizontal              int8u~
      69    FocusPositionVertical                int8u~
      70    AFAreaWidth                          int16u
      72    AFAreaHeight                         int16u
@@ -16624,6 +16668,7 @@ any information found here will be extracted, even if the tag is not listed.
   0x0306   AFFineTune                           int8u
   0x0307   AFFineTuneAdj                        int16s[3]
   0x0308   FocusBracketStepSize                 int8u
+  0x0309   AISubjectTrackingMode                int16u
   0x0400   FlashMode                            int16u
   0x0401   FlashExposureComp                    rational64s
   0x0403   FlashRemoteControl                   int16u
@@ -17415,29 +17460,30 @@ iPalm.
 Tags extracted from the PANA and LEIC user data found in MP4 videos from
 various Panasonic and Leica models.
 
-  Index1   Tag Name                             Writable
-  ------   --------                             --------
-      0    Make                                 no
-      4    Model                                no
-     12    Model                                no
-     16    JPEG-likeData                        EXIF
-     22    Model                                no
-     52    Version1                             no
-     62    Version2                             no
-     80    MakerNoteLeica5                      Panasonic Leica5
-     88    ThumbnailWidth                       no
-     90    ThumbnailHeight                      no
-     92    ThumbnailImage                       no
-   1334    ThumbnailWidth                       no
-   1338    ThumbnailHeight                      no
-   1342    ThumbnailLength                      no
-   1350    ThumbnailImage                       no
-   1358    ThumbnailWidth                       no
-   1362    ThumbnailHeight                      no
-   1366    ThumbnailLength                      no
-   1374    ThumbnailImage                       no
-  16488    ExifData                             EXIF
-  16512    ExifData                             EXIF
+  Index1       Tag Name                         Writable
+  ------       --------                         --------
+          0    Make                             no
+          4    Model                            no
+         12    Model                            no
+         16    JPEG-likeData                    EXIF
+         22    Model                            no
+         52    Version1                         no
+         62    Version2                         no
+         80    MakerNoteLeica5                  Panasonic Leica5
+         88    ThumbnailWidth                   no
+         90    ThumbnailHeight                  no
+         92    ThumbnailImage                   no
+       1334    ThumbnailWidth                   no
+       1338    ThumbnailHeight                  no
+       1342    ThumbnailLength                  no
+       1350    ThumbnailImage                   no
+       1358    ThumbnailWidth                   no
+       1362    ThumbnailHeight                  no
+       1366    ThumbnailLength                  no
+       1374    ThumbnailImage                   no
+      16488    ExifData                         EXIF
+      16512    ExifData                         EXIF
+  0x00200080   ExifData                         EXIF
 
 =head2 Pentax Tags
 
@@ -20938,6 +20984,7 @@ still proprietary) Adobe format.
            MakerNoteCanon                       Canon
            MakerNoteCasio                       Casio
            MakerNoteCasio2                      Casio Type2
+           MakerNoteDJIInfo                     DJI Info
            MakerNoteDJI                         DJI
            MakerNoteFLIR                        FLIR
            MakerNoteFujiFilm                    FujiFilm
@@ -20978,6 +21025,7 @@ still proprietary) Adobe format.
            MakerNoteNintendo                    Nintendo
            MakerNoteOlympus                     Olympus
            MakerNoteOlympus2                    Olympus
+           MakerNoteOlympus3                    Olympus
            MakerNoteLeica                       Panasonic
            MakerNoteLeica2                      Panasonic Leica2
            MakerNoteLeica3                      Panasonic Leica3
@@ -26737,9 +26785,9 @@ ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, AIFF,
 OGG, FLAC, APE, MPC and RealAudio files.  ID3v2 tags which support multiple
 languages (eg. Comment and Lyrics) are extracted by specifying the tag name,
 followed by a dash ('-'), then a 3-character ISO 639-2 language code (eg.
-"Comment-spa"). See L<http://www.id3.org/> for the official ID3
-specification and L<http://www.loc.gov/standards/iso639-2/php/code_list.php>
-for a list of ISO 639-2 language codes.
+"Comment-spa"). See L<https://id3.org/> for the official ID3 specification
+and L<http://www.loc.gov/standards/iso639-2/php/code_list.php> for a list of
+ISO 639-2 language codes.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -37010,6 +37058,7 @@ FileName.
   NewGUID                    ExifTool           no
   Now                        ExifTool           no
   OtherImage                 File               no
+  PageCount                  File               no
   PreviewImage               File               yes
   PreviewPDF                 File               no
   PreviewPNG                 File               no
@@ -37477,6 +37526,7 @@ for more details.
                        MakerNoteCasio
                        MakerNoteCasio2
                        MakerNoteDJI
+                       MakerNoteDJIInfo
                        MakerNoteFLIR
                        MakerNoteFujiFilm
                        MakerNoteGE
@@ -37517,6 +37567,7 @@ for more details.
                        MakerNoteNintendo
                        MakerNoteOlympus
                        MakerNoteOlympus2
+                       MakerNoteOlympus3
                        MakerNoteLeica
                        MakerNoteLeica2
                        MakerNoteLeica3

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

@@ -1391,9 +1391,13 @@ sub WriteQuickTime($$$)
                 $pos += $siz;
             }
             if ($msg) {
-                my $grp = $$et{CUR_WRITE_GROUP} || $parent;
-                $et->Error("$msg for $grp");
-                return $rtnErr;
+                # (allow empty sample description for non-audio/video handler types, eg. 'url ', 'meta')
+                if ($$et{HandlerType}) {
+                    my $grp = $$et{CUR_WRITE_GROUP} || $parent;
+                    $et->Error("$msg for $grp");
+                    return $rtnErr;
+                }
+                $flg = 1; # (this seems to be the case)
             }
             $$et{QtDataFlg} = $flg;
         }

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

@@ -298,6 +298,8 @@ sub SetPropertyPath($$;$$$$)
         $flatInfo = $$tagTablePtr{$flatID};
         if ($flatInfo) {
             return if $$flatInfo{PropertyPath};
+        } elsif (@$propList > 50) {
+            return; # avoid deep recursion
         } else {
             # flattened tag doesn't exist, so create it now
             # (could happen if we were just writing a structure)

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

@@ -858,7 +858,7 @@ TAG: foreach $tagInfo (@matchingTags) {
                 ($shift or ($shiftable eq '0' and $options{DelValue})))
             {
                 $err = "$wgrp1:$tag is not shiftable";
-                $verbose > 2 and print $out "$err\n";
+                $verbose and print $out "$err\n";
                 next;
             }
         }

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

@@ -3399,6 +3399,10 @@ NoLoop:
         }
         # save property list for verbose "adding" message unless this tag already exists
         $added = \@tagList unless $$tagTablePtr{$tagID};
+        # if this is an empty structure, we must add a Struct field
+        if (not length $val and $$attrs{'rdf:parseType'} and $$attrs{'rdf:parseType'} eq 'Resource') {
+            $$tagInfo{Struct} = { STRUCT_NAME => 'XMP Unknown' };
+        }
         AddTagToTable($tagTablePtr, $tagID, $tagInfo);
         last;
     }
@@ -3730,7 +3734,11 @@ sub ParseXMPElement($$$;$$$$)
         } elsif ($prop eq 'rdf:Description') {
             # remove unnecessary rdf:Description elements since parseType='Resource'
             # is more efficient (also necessary to make property path consistent)
-            $parseResource = 1 if grep /^rdf:Description$/, @$propList;
+            if (grep /^rdf:Description$/, @$propList) {
+                $parseResource = 1;
+                # set parseType so we know this is a structure
+                $attrs{'rdf:parseType'} = 'Resource';
+            }
         } elsif ($prop eq 'xmp:xmpmeta') {
             # patch MicrosoftPhoto unconformity
             $prop = 'x:xmpmeta';

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

@@ -634,15 +634,14 @@ sub RestoreStruct($;$)
     local $_;
     my ($et, $keepFlat) = @_;
     my ($key, %structs, %var, %lists, $si, %listKeys, @siList);
-    my $ex = $$et{TAG_EXTRA};
     my $valueHash = $$et{VALUE};
     my $fileOrder = $$et{FILE_ORDER};
     my $tagExtra = $$et{TAG_EXTRA};
     foreach $key (keys %{$$et{TAG_INFO}}) {
-        $$ex{$key} or next;
-        my $structProps = $$ex{$key}{Struct} or next;
-        delete $$ex{$key}{Struct}; # (don't re-use)
-        my $tagInfo = $$et{TAG_INFO}{$key};   # tagInfo for flattened tag
+        $$tagExtra{$key} or next;
+        my $structProps = $$tagExtra{$key}{Struct} or next;
+        delete $$tagExtra{$key}{Struct};    # (don't re-use)
+        my $tagInfo = $$et{TAG_INFO}{$key}; # tagInfo for flattened tag
         my $table = $$tagInfo{Table};
         my $prop = shift @$structProps;
         my $tag = $$prop[0];
@@ -829,8 +828,23 @@ sub RestoreStruct($;$)
     $var{$_} and push @siList, $_ foreach keys %structs;
     # save new structures in the same order they were read from file
     foreach $si (sort { $var{$a}[1] <=> $var{$b}[1] } @siList) {
-        $key = $et->FoundTag($var{$si}[0], '');
-        $$valueHash{$key} = $structs{$si};
+        # test to see if a tag for this structure has already been generated
+        # (this could happen only if one of the structures in a list was empty)
+        $key = $var{$si}[0]{Name};
+        my $found;
+        if ($$valueHash{$key}) {
+            my @keys = grep /^$key( \(\d+\))?$/, keys %$valueHash;
+            foreach $key (@keys) {
+                next unless $$valueHash{$key} eq $structs{$si};
+                $found = 1;
+                last;
+            }
+        }
+        unless ($found) {
+            # otherwise, generate a new tag for this structure
+            $key = $et->FoundTag($var{$si}[0], '');
+            $$valueHash{$key} = $structs{$si};
+        }
         $$fileOrder{$key} = $var{$si}[1];
     }
 }

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);
 
-$VERSION = '12.39';
+$VERSION = '12.42';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -320,7 +320,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     FPF  => ['FPF',  'FLIR Public image Format'],
     FPX  => ['FPX',  'FlashPix'],
     GIF  => ['GIF',  'Compuserve Graphics Interchange Format'],
-    GPR  => ['TIFF', 'GoPro RAW'],
+    GPR  => ['TIFF', 'General Purpose RAW'], # https://gopro.github.io/gpr/
     GZ   =>  'GZIP',
     GZIP => ['GZIP', 'GNU ZIP compressed archive'],
     HDP  => ['TIFF', 'Windows HD Photo'],
@@ -1799,6 +1799,7 @@ my %systemTagsNotes = (
         Writable => 1,
         Protected => 1,
     },
+    PageCount => { Notes => 'the number of pages in a multi-page TIFF document' },
 );
 
 # tags defined by UserParam option (added at runtime)
@@ -5895,13 +5896,13 @@ sub GetUnixTime($;$)
 sub ConvertFileSize($)
 {
     my $val = shift;
-    $val < 2048 and return "$val bytes";
-    $val < 10240 and return sprintf('%.1f KiB', $val / 1024);
-    $val < 2097152 and return sprintf('%.0f KiB', $val / 1024);
-    $val < 10485760 and return sprintf('%.1f MiB', $val / 1048576);
-    $val < 2147483648 and return sprintf('%.0f MiB', $val / 1048576);
-    $val < 10737418240 and return sprintf('%.1f GiB', $val / 1073741824);
-    return sprintf('%.0f GiB', $val / 1073741824);
+    $val < 2000 and return "$val bytes";
+    $val < 10000 and return sprintf('%.1f kB', $val / 1000);
+    $val < 2000000 and return sprintf('%.0f kB', $val / 1000);
+    $val < 10000000 and return sprintf('%.1f MB', $val / 1000000);
+    $val < 2000000000 and return sprintf('%.0f MB', $val / 1000000);
+    $val < 10000000000 and return sprintf('%.1f GB', $val / 1000000000);
+    return sprintf('%.0f GB', $val / 1000000000);
 }
 
 #------------------------------------------------------------------------------
@@ -7448,7 +7449,11 @@ sub DoProcessTIFF($$;$)
                 # this looks like a BigTIFF image
                 $raf->Seek(0);
                 require Image::ExifTool::BigTIFF;
-                return 1 if Image::ExifTool::BigTIFF::ProcessBTF($self, $dirInfo);
+                my $result = Image::ExifTool::BigTIFF::ProcessBTF($self, $dirInfo);
+                if ($result) {
+                    $self->FoundTag(PageCount => $$self{PageCount}) if $$self{MultiPage};
+                    return 1;
+                }
             } elsif ($identifier == 0x4f52 or $identifier == 0x5352) {
                 # Olympus ORF image (set FileType now because base type is 'ORF')
                 $self->SetFileType($fileType = 'ORF');
@@ -7541,6 +7546,9 @@ sub DoProcessTIFF($$;$)
             # override whatever FileType we set since we now know it is DNG
             $self->OverrideFileType($$self{TIFF_TYPE} = 'DNG');
         }
+        if ($$self{TIFF_TYPE} eq 'TIFF') {
+            $self->FoundTag(PageCount => $$self{PageCount}) if $$self{MultiPage};
+        }
         return 1;
     }
 #
@@ -7678,8 +7686,8 @@ sub DoProcessTIFF($$;$)
     # check DNG version
     if ($$self{DNGVersion}) {
         my $ver = $$self{DNGVersion};
-        # currently support up to DNG version 1.5
-        unless ($ver =~ /^(\d+) (\d+)/ and "$1.$2" <= 1.5) {
+        # currently support up to DNG version 1.6
+        unless ($ver =~ /^(\d+) (\d+)/ and "$1.$2" <= 1.6) {
             $ver =~ tr/ /./;
             $self->Error("DNG Version $ver not yet tested", 1);
         }

package/bin/lib/Image/ExifTool.pod

@@ -593,12 +593,13 @@ different when copying tags with L</SetNewValuesFromFile>.
 =item DateFormat
 
 Format for printing date/time values.  See C<strftime> in the L<POSIX>
-package for details about the format string.  If date can not be converted,
-value is left unchanged unless the StrictDate option is set.  Timezones are
-ignored.  The inverse conversion (ie. when calling L</SetNewValue>) is
-performed only if POSIX::strptime or Time::Piece is installed.  The default
-setting of undef causes date/time values to remain in standard EXIF format
-(similar to a DateFormat of "%Y:%m:%d %H:%M:%S").
+package and L<https://exiftool.org/filename.html#codes> for details about
+the format string.  If the date can not be converted, the value is left
+unchanged unless the StrictDate option is set.  Timezones are ignored.  The
+inverse conversion (ie. when calling L</SetNewValue>) is performed only if
+POSIX::strptime or Time::Piece is installed.  The default setting of undef
+causes date/time values to remain in standard EXIF format (similar to a
+DateFormat of "%Y:%m:%d %H:%M:%S").
 
 =item Duplicates
 

package/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.39
+Version: 12.42
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

package/bin/pp_build_exe.args

@@ -21,10 +21,10 @@
 #           10) Copy zip archive to web servers.
 #           11) Update zip file version in link and text of html/index.html.
 #------------------------------------------------------------------------------
--T exiftool-12.39
-#--info=FileVersion=12.3.9.0
-#--info=ProductVersion=12.3.9.0
-##"--info=Build Date=2022:01:13 07:56:50-05:00"
+-T exiftool-12.42
+#--info=FileVersion=12.4.2.0
+#--info=ProductVersion=12.4.2.0
+##"--info=Build Date=2022:06:01 14:21:21-04:00"
 ##"--info=Bundled Perl Version=ActivePerl 5.24.0"
 ##"--info=LegalCopyright=Copyright (c) 2003-2022, Phil Harvey"
 ##"--info=ProductName=ExifTool"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiftool-vendored.pl",
-  "version": "12.39.0",
+  "version": "12.42.0",
   "description": "Vendored perl ExifTool for Node.js",
   "main": "./index.js",
   "homepage": "https://github.com/mceachen/exiftool-vendored.pl#readme",
@@ -30,9 +30,20 @@
     "test": "mocha",
     "update": "bash -c ./update.sh"
   },
+  "release-it": {
+    "hooks": {
+      "before:init": [
+        "yarn install",
+        "yarn test"
+      ]
+    },
+    "github": {
+      "release": true
+    }
+  },
   "devDependencies": {
-    "mocha": "^9.1.4",
-    "prettier": "^2.5.1",
+    "mocha": "^10.0.0",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2"
   }
 }