exiftool-vendored.pl 13.34.0 → 13.35.0

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.29';
+$VERSION = '1.30';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -557,7 +557,7 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
+    my ($buff, $pLen, $j, $fileType, $eof);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
@@ -570,10 +570,8 @@ sub ProcessM2TS($$)
     unless ($1) {
         $pLen = 188;        # no timecode
         $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-        $upkPrefix = 'N';
     } else {
         $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-        $upkPrefix = 'x4N';
     }
     my $prePos = $pLen - 188;       # byte position of packet prefix
     my $readSize = 64 * $pLen;      # size of our read buffer

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

@@ -41,7 +41,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.89';
+$VERSION = '2.90';
 
 sub PrintLensInfo($$$);
 
@@ -117,6 +117,7 @@ my %olympusLensTypes = (
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB (also OM System M.Zuiko Digital ED 100-400mm F5.0-6.3 IS II", forum2833)
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
     '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
+    '0 38 10' => 'Olympus M.Zuiko Digital ED 20mm F1.4 Pro',
     '0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
     '0 40 10' => 'Olympus M.Zuiko Digital ED 150-600mm F5.0-6.3', #forum15652
     # Sigma lenses
@@ -2252,12 +2253,15 @@ my %indexInfo = (
             5 => 'i-Enhance', #11
             6 => 'e-Portrait', #23
             7 => 'Color Creator', #23
+            8 => 'Underwater', #7
             9 => 'Color Profile 1', #23
             10 => 'Color Profile 2', #23
             11 => 'Color Profile 3', #23
             12 => 'Monochrome Profile 1', #23
             13 => 'Monochrome Profile 2', #23
             14 => 'Monochrome Profile 3', #23
+            17 => 'Art Mode', #7
+            18 => 'Monochrome Profile 4', #7
             256 => 'Monotone',
             512 => 'Sepia',
         }],

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

@@ -59,7 +59,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.55';
+$VERSION = '3.56';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -5120,52 +5120,52 @@ my %binaryDataAttrs = (
         PrintConv => { 0 => 'Off', 1 => 'Short', 2 => 'Medium', 3 => 'Long' },
     },
     0x021f => { #KG
-          Name => 'FirstFrameActionInAFC',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              '0'   => 'Auto',
-              '1'   => 'Release Priority',
-              '2'   => 'Focus Priority',
-              # there is at least another value '3' but I couldn't figure out the
-              # meaning. However, this occurs for a few AF-S captures, so it has
-              # no real practical meaning.
-          },
+        Name => 'FirstFrameActionInAFC',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Release Priority',
+            '2'   => 'Focus Priority',
+            # there is at least another value '3' but I couldn't figure out the
+            # meaning. However, this occurs for a few AF-S captures, so it has
+            # no real practical meaning.
+        },
     },
     0x0220 => { #KG
-          Name => 'ActionInAFCCont',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              '0'   => 'Auto',
-              '1'   => 'Focus Priority',
-              '2'   => 'FPS Priority',
-          },
+        Name => 'ActionInAFCCont',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Focus Priority',
+            '2'   => 'FPS Priority',
+        },
     },
     545 => { #KG
-          Name => 'AFCHold',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          Mask => 0x03,
-          PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
+        Name => 'AFCHold',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x03,
+        PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
     },
     545.1 => { #KG
-        Name => 'AFCSensitivity',
+        Name => 'AFCPointTracking',
         Condition => '$$self{Model} =~ /K-3 Mark III/',
         Mask => 0x0c,
-        PrintConv => '5 - $val',
-        PrintConvInv => '5 - $val',
+        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
     },
     545.2 => { #KG
-        Name => 'AFCPointTracking',
+        Name => 'AFCSensitivity',
         Condition => '$$self{Model} =~ /K-3 Mark III/',
         Mask => 0x70,
-        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
+        PrintConv => '5 - $val',
+        PrintConvInv => '5 - $val',
     },
     0x0960 => { #KG
-          Name => 'SubjectRecognition',
-          Condition => '$$self{Model} =~ /K-3 Mark III/',
-          PrintConv => {
-              0 => 'Off',
-              1 => 'On',
-          },
+        Name => 'SubjectRecognition',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
     },
 );
 

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ProcessProtobuf($$$;$);
 

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         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 110 different types of timed GPS metadata from video files.
+        currently reads 111 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },

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

@@ -751,8 +751,8 @@ my %tagLookup = (
 	'afconfidence' => { 1 => 0x3d },
 	'afconfigtool' => { 2 => 0x1 },
 	'afcoordinatesavailable' => { 203 => 0x7, 204 => 0x7 },
-	'afcpointtracking' => { 371 => '545.2' },
-	'afcsensitivity' => { 371 => '545.1' },
+	'afcpointtracking' => { 371 => '545.1' },
+	'afcsensitivity' => { 371 => '545.2' },
 	'afdefocus' => { 371 => 0x6 },
 	'afdetectionmethod' => { 200 => 0x4, 201 => 0x4, 203 => 0x4, 204 => 0x4 },
 	'afduringliveview' => { 90 => 0x511 },
@@ -1968,7 +1968,10 @@ my %tagLookup = (
 	'composerkeywords' => { 425 => "\xa9cok" },
 	'compositeimage' => { 125 => 0xa460, 539 => 'CompositeImage' },
 	'compositeimagecount' => { 125 => 0xa461, 539 => 'CompositeImageCount' },
+	'compositeimagecount1' => { 133 => 0x1151 },
+	'compositeimagecount2' => { 133 => 0x1152 },
 	'compositeimageexposuretimes' => { 125 => 0xa462, 539 => 'CompositeImageExposureTimes' },
+	'compositeimagemode' => { 133 => 0x1150 },
 	'composition' => { 520 => 'Composition' },
 	'compositionadjust' => { 397 => '0.1' },
 	'compositionadjustrotation' => { 397 => 0x7 },
@@ -5098,6 +5101,7 @@ my %tagLookup = (
 	'multiframenoisereduction' => { 455 => 0x35, 467 => 0x200b, 472 => 0x15 },
 	'multiframenreffect' => { 467 => 0x2023 },
 	'multifunctionlock' => { 90 => 0x70f },
+	'multipleexposure' => { 133 => 0x1037 },
 	'multipleexposuremode' => { 250 => 0x1bc, 252 => 0x98, 255 => 0x8c, 256 => 0x9a, 257 => 0x9a, 339 => 0x101c },
 	'multipleexposureset' => { 378 => '10.1' },
 	'multisample' => { 272 => 0x40 },
@@ -7675,7 +7679,7 @@ my %tagLookup = (
 	'whitebalancebias' => { 119 => 0x2011, 340 => 0x304, 360 => 0x23 },
 	'whitebalanceblue' => { 79 => 0x7 },
 	'whitebalancebracket' => { 335 => 0x502, 340 => 0x303 },
-	'whitebalancebracketing' => { 191 => 0x22, 194 => 0x2c, 464 => 0x2c },
+	'whitebalancebracketing' => { 133 => 0x1102, 191 => 0x22, 194 => 0x2c, 464 => 0x2c },
 	'whitebalancebuttonplaybackmode' => { 331 => 0x1c5, 332 => 0x1dd },
 	'whitebalancecomp' => { 343 => 0x1001 },
 	'whitebalancedetected' => { 145 => 0x3fb },

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 28636 tags, with 17834 unique tag names.
+They contain a total of 28650 tags, with 17839 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
@@ -11539,8 +11539,8 @@ file name combined with the hierarchical protobuf field numbers.
 ExifTool currently extracts timed GPS plus a few other tags from DJI devices
 which use the following protocols:  dvtm_AVATA2.proto (Avata 2),
 dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5),
-dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30) and
-dvtm_pm320.proto (Mini 4 Pro).
+dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30),
+dvtm_Mini4_Pro.proto (Mini 4 Pro) and dvtm_dji_neo.proto (DJI Neo).
 
 Note that with the protobuf format, numerical tags missing from the output
 for a given protocol should be considered to have the default value of 0.
@@ -11596,6 +11596,18 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac204_3-4-2-1'      GPSInfo             DJI GPSInfo
   'dvtm_ac204_3-4-2-2'      GPSAltitude         no
   'dvtm_ac204_3-4-2-6-1'    GPSDateTime         no
+  'dvtm_dji_neo_1-1-5'      SerialNumber        no
+  'dvtm_dji_neo_1-1-10'     Model               no
+  'dvtm_dji_neo_2-2-3-1'    SerialNumber2       no
+  'dvtm_dji_neo_2-3'        FrameInfo           DJI FrameInfo
+  'dvtm_dji_neo_3-1-2'      TimeStamp           no
+  'dvtm_dji_neo_3-2-2-1'    ISO                 no
+  'dvtm_dji_neo_3-2-4-1'    ShutterSpeed        no
+  'dvtm_dji_neo_3-2-6-1'    ColorTemperature    no
+  'dvtm_dji_neo_3-2-10-1'   FNumber             no
+  'dvtm_dji_neo_3-4-3'      DroneInfo           DJI DroneInfo
+  'dvtm_dji_neo_3-4-4-1'    GPSInfo             DJI GPSInfo
+  'dvtm_dji_neo_3-4-4-2'    AbsoluteAltitude    no
   'dvtm_pm320_1-1-5'        SerialNumber        no
   'dvtm_pm320_1-1-10'       Model               no
   'dvtm_pm320_2-2'          FrameInfo           DJI FrameInfo
@@ -12142,6 +12154,7 @@ Tags extracted from FLIR Public image Format (FPF) files.
   0x1032   ExposureCount                        int16u
   0x1033   EXRAuto                              int16u
   0x1034   EXRMode                              int16u
+  0x1037   MultipleExposure                     int16u
   0x1040   ShadowTone                           int32s
   0x1041   HighlightTone                        int32s
   0x1044   DigitalZoom                          int32u
@@ -12159,9 +12172,13 @@ Tags extracted from FLIR Public image Format (FPF) files.
   0x1053   CropSize                             int32u
   0x1100   AutoBracketing                       int16u
   0x1101   SequenceNumber                       int16u
+  0x1102   WhiteBalanceBracketing               int16u
   0x1103   DriveSettings                        FujiFilm DriveSettings
   0x1105   PixelShiftShots                      int16u
   0x1106   PixelShiftOffset                     rational64s[2]
+  0x1150   CompositeImageMode                   int32u
+  0x1151   CompositeImageCount1                 int16u
+  0x1152   CompositeImageCount2                 int16u
   0x1153   PanoramaAngle                        int16u
   0x1154   PanoramaDirection                    int16u
   0x1201   AdvancedFilter                       int32u
@@ -12353,14 +12370,15 @@ Tags found in the FujiIFD information of RAF images from some models.
 =head3 FujiFilm MRAW Tags
 
 Tags extracted from the M-RAW header of multi-image RAF files.  The family 1
-group name for these tags is "M-RAW".
+group name for these tags is "M-RAW".  Additional metadata may be extracted
+from the embedded RAW images with the ExtractEmbedded option.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
-  0x0001   RawImageNumber                       no
-  0x0005   ExposureTime                         no
-  0x0006   FNumber                              no
-  0x0007   ISO                                  no
+  0x2001   RawImageNumber                       no
+  0x2005   ExposureTime                         no
+  0x2006   FNumber                              no
+  0x2007   ISO                                  no
 
 =head3 FujiFilm FFMV Tags
 
@@ -20734,8 +20752,8 @@ Flash information tags for the K10D, K20D and K200D.
     543    FirstFrameActionInAFC                int8u
     544    ActionInAFCCont                      int8u
     545    AFCHold                              int8u & 0x03
-  545.1    AFCSensitivity                       int8u & 0x0c
-  545.2    AFCPointTracking                     int8u & 0x70
+  545.1    AFCPointTracking                     int8u & 0x0c
+  545.2    AFCSensitivity                       int8u & 0x70
    2400    SubjectRecognition                   int8u
 
 =head3 Pentax KelvinWB Tags
@@ -30526,7 +30544,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 110 different types of timed GPS metadata from video files.
+currently reads 111 different types of timed GPS metadata from video files.
 
   Tag ID                 Tag Name               Writable
   ------                 --------               --------

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

@@ -1352,7 +1352,8 @@ sub SetNewValuesFromFile($$;@)
         # get all tags from source file (including MakerNotes block)
         $info = $srcExifTool->ImageInfo($srcFile);
     }
-    return $info if $$info{Error} and $$info{Error} eq 'Error opening file';
+    # (allow processing to continue if we have alternate files that may have been read OK)
+    return $info if $$info{Error} and $$info{Error} eq 'Error opening file' and not $$self{ALT_EXIFTOOL};
     delete $$srcExifTool{VALUE}{Error}; # delete so we can check this later
 
     # sort tags in file order with priority tags last

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

@@ -3350,13 +3350,14 @@ sub PrintLensID(@)
 #------------------------------------------------------------------------------
 # Convert XMP date/time to EXIF format
 # Inputs: 0) XMP date/time string, 1) set if we aren't sure this is a date
-# Returns: EXIF date/time
+# Returns: EXIF date/time, and flag in list context if this was a standard date/time value
 sub ConvertXMPDate($;$)
 {
     my ($val, $unsure) = @_;
     if ($val =~ /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}:\d{2})(:\d{2})?\s*(\S*)$/) {
         my $s = $5 || '';           # seconds may be missing
         $val = "$1:$2:$3 $4$s$6";   # convert back to EXIF time format
+        return($val, 1) if wantarray;
     } elsif (not $unsure and $val =~ /^(\d{4})(-\d{2}){0,2}/) {
         $val =~ tr/-/:/;
     }
@@ -3647,7 +3648,12 @@ NoLoop:
         if (($new or $fmt eq 'rational') and ConvertRational($val)) {
             $rational = $rawVal;
         } else {
-            $val = ConvertXMPDate($val, $new) if $new or $fmt eq 'date';
+            my $stdDate;
+            ($val, $stdDate) = ConvertXMPDate($val, $new) if $new or $fmt eq 'date';
+            if ($stdDate and $added) {
+                $$tagInfo{Groups}{2} = 'Time';
+                $$tagInfo{PrintConv} = '$self->ConvertDateTime($val)';
+            }
         }
         if ($$et{XmpValidate} and $fmt and $fmt eq 'boolean' and $val!~/^True|False$/) {
             if ($val =~ /^true|false$/) {

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

@@ -1934,7 +1934,7 @@ my %sACDSeeRegionStruct = (
     BurstPrimary    => { },
     PortraitNote    => { },
     PortraitRequest => {
-        Notes => 'High Definition Render Pipeline (HDRP) data', #PH (guess)
+        Notes => 'HDRPlus (HDRP) data', #NealKrawetz
         ValueConv => 'Image::ExifTool::XMP::DecodeBase64($val)',
         ValueConvInv => 'Image::ExifTool::XMP::EncodeBase64($val)',
     },

package/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf $configFile @configFiles $noConfig);
 
-$VERSION = '13.34';
+$VERSION = '13.35';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -2825,6 +2825,8 @@ sub ExtractInfo($;@)
                 $isDir = 1;
             } else {
                 $self->Error('Error opening file');
+                # continue to process alt files if necessary
+                $self->DoneExtract() if $$self{ALT_EXIFTOOL};
             }
         } else {
             $self->Error('No file specified');

package/bin/perl-Image-ExifTool.spec

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

package/index.js

@@ -1,3 +1,3 @@
-const path = require('path');
+const path = require("path");
 
-module.exports = path.join(__dirname, 'bin', 'exiftool');
+module.exports = path.join(__dirname, "bin", "exiftool");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiftool-vendored.pl",
-  "version": "13.34.0",
+  "version": "13.35.0",
   "description": "Vendored perl ExifTool for Node.js",
   "main": "./index.js",
   "homepage": "https://github.com/photostructure/exiftool-vendored.pl#readme",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:photostructure/exiftool-vendored.pl.git"
+    "url": "git+https://github.com/photostructure/exiftool-vendored.pl.git"
   },
   "bin": {
     "exiftool": "./bin/exiftool"
@@ -25,19 +25,20 @@
     "ExifTool",
     "EXIF"
   ],
-  "author": "Matthew McEachen <matthew-exiftoolvendored@mceachen.org>",
+  "author": "Matthew McEachen <exiftool-vendored-pl@photostructure.com>",
   "license": "MIT",
   "scripts": {
-    "prettier": "prettier --write test/*.js",
     "test": "mocha",
+    "fmt": "prettier --write .",
     "update": "run-p update:*",
-    "update:deps": "ncu -u",
+    "update:deps": "npm-check-updates --upgrade --install always",
     "update:exiftool": "bash -c ./update-exiftool.sh",
     "check-version": "node check-version.js",
     "install:pinact": "go install github.com/suzuki-shunsuke/pinact/cmd/pinact@latest",
     "update:actions": "pinact run -u",
     "release": "release-it"
   },
+  "# release-it.npm.skipChecks": "Required for OIDC Trusted Publishing - bypasses npm auth checks since OIDC handles authentication automatically. See: https://github.com/release-it/release-it/issues/1244 and https://docs.npmjs.com/trusted-publishers#supported-cicd-providers",
   "release-it": {
     "git": {
       "requireBranch": "main",
@@ -48,14 +49,15 @@
       "release": true
     },
     "npm": {
-      "publish": true
+      "publish": true,
+      "skipChecks": true
     }
   },
   "devDependencies": {
     "mocha": "^11.7.1",
     "npm-run-all": "4.1.5",
     "prettier": "^3.6.2",
-    "release-it": "^19.0.3",
+    "release-it": "^19.0.4",
     "xml2js": "^0.6.2"
   }
 }