exiftool-vendored.pl 12.40.0 → 12.41.0

package/bin/Changes

@@ -7,10 +7,33 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.30. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Apr. 7, 2022 - Version 12.41
+
+  - Added support for "OM SYSTEM" maker notes
+  - Added 2 new Sony LensType values (thanks Jos Roost)
+  - Added some new Canon lenses (thanks LibRaw)
+  - Added a new Nikon LensID (thanks Bert Ligtvoet)
+  - Added a new Canon ContinuousDrive value (thanks Wolfgang Gulcker)
+  - Enhanced -v0 option to also print new file name when renaming, moving or
+    copying a file
+  - Updated xmp2exif.args and exif2xmp.args helper files to reflect the IPTC
+    Photometadata Mapping Guidelines version 2202.1
+  - Made "Invalid Xxx data" a minor warning for MakerNote data
+  - Patched to allow writing of MP4 videos which have other tracks with a
+    missing sample description entry
+  - Patched MacOS version to specify directory for external utilities (setfile,
+    xattr, stat, mdls and osascript from /usr/bin, and tag from /usr/local/bin)
+  - Fixed long-standing problem where Windows version could behave differently
+    for -if conditions containing undefined tags
+  - Fixed problem where -W+! combined with -j or -X produced invalid JSON or XML
+    when  processing multiple files
+  - Fixed potential "uninitialized value $time in division" runtime warning when
+    reading MP4 videos
+
 Feb. 9, 2022 - Version 12.40
 
-  - Added a new Nikon LensID (thanks Wolfgang Exler)
   - Added PageCount tag to return the number of pages in a multi-page TIFF
+  - Added a new Nikon LensID (thanks Wolfgang Exler)
   - Added a few more Sony LensTypes (thanks Jos Roost)
   - Decode some new Canon tags (thanks Mark Reid)
   - Decode another Nikon Z9 tag (thanks Warren Hatch)
@@ -20,14 +43,14 @@ Feb. 9, 2022 - Version 12.40
   - Updated photoshop_paths.config to include WorkingPath
   - Patched to allow writing of MP4 videos which have url tracks with a missing
     sample description entry
-  - Fixed typo in the name of a new Nikon tag (thanks Herb)
-  - Fixed description of GPR (General Purpose RAW) file type
+  - Fixed deep recursion error when reading multi-page TIFF images with more
+    than 100 pages
   - Fixed potential deep recursion runtime error when writing nested XMP
     structures
   - Fixed warning which could be generated when writing new
     Composite:GPSCoordinates tag
-  - Fixed deep recursion error when reading multi-page TIFF images with more
-    than 100 pages
+  - Fixed description of GPR (General Purpose RAW) file type
+  - Fixed typo in the name of a new Nikon tag (thanks Herb)
 
 Jan. 13, 2022 - Version 12.39
 

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.40",
+   "version" : "12.41",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.40
+version: 12.41
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.40.tar.gz | tar -xf -
-  cd Image-ExifTool-12.40
+  gzip -dc Image-ExifTool-12.41.tar.gz | tar -xf -
+  cd Image-ExifTool-12.41
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/arg_files/exif2xmp.args

@@ -12,8 +12,10 @@
 #               2013/06/12 - PH Additions for the Exif 2.3 for XMP spec
 #               2015/01/12 - PH Avoid copying to non-standard namespaces
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
+#               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #
 # References:   http://www.metadataworkinggroup.org/specs/
+#               https://iptc.org/std/photometadata/documentation/mappingguidelines/
 #
 # Notes:     1) The first three arguments copy most of the EXIF and GPS tags to
 #               XMP-exif/XMP-tiff, and the remaining arguments handle tags
@@ -22,6 +24,8 @@
 #            2) These arguments will not delete existing XMP tags which are
 #               missing from the EXIF.  The XMP tags should be deleted
 #               beforehand if required.
+#
+#            3) EXIF:SubjectArea is not currently mapped into XMP-iptcExt:ImageRegion
 #------------------------------------------------------------------------------
 -XMP-exif:all < EXIF:all
 -XMP-exifEX:all < EXIF:all
@@ -37,6 +41,7 @@
 -XMP-xmp:CreatorTool < EXIF:Software
 -XMP-dc:Rights < EXIF:Copyright
 -XMP-dc:Creator < EXIF:Artist
+-XMP-iptcExt:DigitalImageGUID < EXIF:DigImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -Composite:Flash < EXIF:Flash
 # overwrite GPS tags which have different formats in XMP

package/bin/arg_files/xmp2exif.args

@@ -14,8 +14,10 @@
 #               2016/09/26 - PH Write Composite SubSec tags
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
 #               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
+#               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #
 # References:   http://www.metadataworkinggroup.org/specs/
+#               https://iptc.org/std/photometadata/documentation/mappingguidelines/
 #
 # Notes:     1) The first three arguments copy the bulk of the EXIF and GPS
 #               information, and the remaining arguments handle the tags
@@ -24,6 +26,8 @@
 #            2) These arguments will not delete existing EXIF tags which are
 #               missing from the XMP.  The EXIF tags should be deleted
 #               beforehand if required.
+#
+#            3) XMP-iptcExt:ImageRegion is not currently mapped into EXIF:SubjectArea
 #------------------------------------------------------------------------------
 -EXIF:all < XMP-exif:all
 -EXIF:all < XMP-exifEX:all
@@ -37,7 +41,9 @@
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
 -EXIF:Software < XMP-xmp:CreatorTool
 -EXIF:Copyright < XMP-dc:Rights
+-EXIF:Artist < XMP-plus:ImageCreatorName
 -EXIF:Artist < XMP-dc:Creator
+-EXIF:DigImageGUID < XMP-iptcExt:DigitalImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -EXIF:Flash < Composite:Flash
 # generate GPS tags which have been combined into other XMP tags

package/bin/exiftool

@@ -8,9 +8,10 @@
 #               (See html/history.html for revision history)
 #------------------------------------------------------------------------------
 use strict;
+use warnings;
 require 5.004;
 
-my $version = '12.40';
+my $version = '12.41';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -109,6 +110,8 @@ my %database;       # lookup for database information based on file name (in Exi
 my %filterExt;      # lookup for filtered extensions
 my %ignore;         # directory names to ignore
 my $ignoreHidden;   # flag to ignore hidden files
+my %outComma;       # flag that output text file needs a comma
+my %outTrailer;     # trailer for output text file
 my %preserveTime;   # preserved timestamps for files
 my %printFmt;       # the contents of the print format file
 my %setTags;        # hash of list references for tags to set from files
@@ -441,6 +444,8 @@ undef %database;
 undef %endDir;
 undef %filterExt;
 undef %ignore;
+undef %outComma;
+undef %outTrailer;
 undef %printFmt;
 undef %preserveTime;
 undef %setTags;
@@ -1821,8 +1826,21 @@ if ($filtered and not $validFile) {
 PrintCSV() if $csv and not $isWriting;
 
 # print folder/file trailer if necessary
-print $sectTrailer if $sectTrailer and not $textOut;
-print $fileTrailer if $fileTrailer and not $textOut and not $fileHeader;
+if ($textOut) {
+    foreach (keys %outTrailer) {
+        next unless $outTrailer{$_};
+        if ($mt->Open(\*OUTTRAIL, $_, '>>')) {
+            my $fp = \*OUTTRAIL;
+            print $fp $outTrailer{$_};
+            close $fp;
+        } else {
+            Error("Error appending to $_\n");
+        }
+    }
+} else {
+    print $sectTrailer if $sectTrailer;
+    print $fileTrailer if $fileTrailer and not $fileHeader;
+}
 
 my $totWr = $countGoodWr + $countBadWr + $countSameWr + $countCopyWr +
             $countGoodCr + $countBadCr;
@@ -2160,6 +2178,9 @@ sub GetImageInfo($$)
         $tmpText = $outfile unless $append;
     }
 
+    # restore state of comma flag for this file if appending
+    $comma = $outComma{$outfile} if $append and ($textOverwrite & 0x02);
+
     # print the results for this file
     if (%printFmt) {
         # output using print format file (-p) option
@@ -2221,7 +2242,7 @@ sub GetImageInfo($$)
         if ($fp) {
             # print file header (only once)
             if ($fileHeader) {
-                print $fp $fileHeader;
+                print $fp $fileHeader unless defined $outfile and ($created{$outfile} or $appended{$outfile});
                 undef $fileHeader unless $textOut;
             }
             if ($html) {
@@ -2674,9 +2695,17 @@ TAG:    foreach $tag (@foundTags) {
         }
     }
     if ($outfile) {
-        # write section and file trailers before closing the file
-        print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
-        print $fp $fileTrailer if $fileTrailer;
+        if ($textOverwrite & 0x02) {
+            # save state of this file if we may be appending
+            $outComma{$outfile} = $comma;
+            $outTrailer{$outfile} = '';
+            $outTrailer{$outfile} .= $sectTrailer and $sectTrailer = '' if $sectTrailer;
+            $outTrailer{$outfile} .= $fileTrailer if $fileTrailer;
+        } else {
+            # write section and file trailers before closing the file
+            print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
+            print $fp $fileTrailer if $fileTrailer;
+        }
         close($fp);
         undef $tmpText;
         if ($lineCount) {
@@ -2926,7 +2955,7 @@ sub SetImageInfo($$$)
             }
         }
         if (defined $outfile) {
-            $verbose and print $vout "'${infile}' --> '${outfile}'\n";
+            defined $verbose and print $vout "'${infile}' --> '${outfile}'\n";
             # create output directory if necessary
             CreateDirectory($outfile);
             # set temporary file (automatically erased on abnormal exit)
@@ -5136,13 +5165,14 @@ The following examples demonstrate basic use of the B<-csv> option:
     # update metadata for all images in a directory from CSV file
     exiftool -csv=a.csv dir
 
-Empty values are ignored when importing (unless the B<-f> option is used and
-the API MissingTagValue is set to an empty string, in which case the tag is
+When importing, empty values are ignored unless the B<-f> option is used and
+the API MissingTagValue is set to an empty string (in which case the tag is
 deleted).  Also, FileName and Directory columns are ignored if they exist
-(ie. ExifTool will not attempt to write these tags with a CSV import).  To
-force a tag to be deleted, use the B<-f> option and set the value to "-" in
-the CSV file (or to the MissingTagValue if this API option was used).
-Multiple databases may be imported in a single command.
+(ie. ExifTool will not attempt to write these tags with a CSV import), but
+all other columns are imported.  To force a tag to be deleted, use the B<-f>
+option and set the value to "-" in the CSV file (or to the MissingTagValue
+if this API option was used).  Multiple databases may be imported in a
+single command.
 
 When exporting a CSV file, the B<-g> or B<-G> option adds group names to the
 tag headings.  If the B<-a> option is used to allow duplicate tag names, the
@@ -5436,7 +5466,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.40 --
+    -- Generated by ExifTool 12.41 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -5555,7 +5585,9 @@ level greater than 0, most other options are ignored and normal console
 output is suppressed unless specific tags are extracted.  Using B<-v0>
 causes the console output buffer to be flushed after each line (which may be
 useful to avoid delays when piping exiftool output), and prints the name of
-each processed file when writing.  Also see the B<-progress> option.
+each processed file when writing and the new file name when renaming,
+moving or copying.  Verbose levels above B<-v0> do not flush after each
+line.  Also see the B<-progress> option.
 
 =item B<-w>[+|!] I<EXT> or I<FMT> (B<-textOut>)
 
@@ -5768,11 +5800,10 @@ an XMP extension for the output file.
 =item B<-a>, B<--a> (B<-duplicates>, B<--duplicates>)
 
 Allow (B<-a>) or suppress (B<--a>) duplicate tag names to be extracted.  By
-default, duplicate tags are suppressed when reading unless the B<-ee> or
-B<-X> options are used or the Duplicates option is enabled in the
-configuration file. This option has an affect when writing only to allow
-duplicate Warning messages to be shown.  Duplicate tags are always extracted
-when copying.
+default, duplicate tags are suppressed when reading unless the B<-ee> or B<-X>
+options are used or the Duplicates option is enabled in the configuration file.
+When writing, this option allows multiple Warning messages to be shown.
+Duplicate tags are always extracted when copying.
 
 =item B<-e> (B<--composite>)
 

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.56';
+$VERSION = '4.57';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -208,6 +208,7 @@ $VERSION = '4.56';
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
     54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
     60 => 'Irix 11mm f/4', #50
+    63 => 'Irix 30mm F1.4 Dragonfly', #IB
     80 => 'Canon TS-E 50mm f/2.8L Macro', #42
     81 => 'Canon TS-E 90mm f/2.8L Macro', #42
     82 => 'Canon TS-E 135mm f/4L Macro', #42
@@ -599,6 +600,9 @@ $VERSION = '4.56';
    '61182.25' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
    '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
    '61182.27' => 'Canon RF 16mm F2.8 STM', #42
+   '61182.28' => 'Canon RF 400mm F2.8L IS USM', #IB
+   '61182.29' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+   '61182.30' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
   #'61182.xx' => 'Canon RF 100mm F2.8L MACRO IS USM',
     65535 => 'n/a',
 );
@@ -1018,7 +1022,7 @@ my %canonWhiteBalance = (
     20 => 'PC Set4', #PH
     21 => 'PC Set5', #PH
     # 22 - Custom 2?
-    23 => 'Auto (ambience priority)', #PH (5DS)
+    23 => 'Auto (ambience priority)', #PH (5DS) (perhaps this needs re-thinking?: forum13295)
     # 30 - Click White Balance?
     # 31 - Shot Settings?
     # 137 - Tungsten?
@@ -2133,6 +2137,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             4 => 'Continuous, Low', #PH
             5 => 'Continuous, High', #PH
             6 => 'Silent Single', #PH
+            8 => 'Continuous, High+', #WolfgangGulcker
             # ref A: https://exiftool.org/forum/index.php/topic,5701.msg27843.html#msg27843
             9 => 'Single, Silent', #A
             10 => 'Continuous, Silent', #A
@@ -6796,6 +6801,9 @@ my %ciMaxFocal = (
             284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
             285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
             288 => 'Canon RF 16mm F2.8 STM', #42
+            289 => 'Canon RF 400mm F2.8L IS USM', #IB
+            290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+            291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
            #xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },

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

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.39';
+$VERSION = '4.40';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -6605,7 +6605,7 @@ sub ProcessExif($$$)
                 #### eval Validate ($val, $dirData, $subdirStart, $size)
                 my $ok = 0;
                 if (defined $$subdir{Validate} and not eval $$subdir{Validate}) {
-                    $et->Warn("Invalid $tagStr data");
+                    $et->Warn("Invalid $tagStr data", $inMakerNotes);
                     $invalid = 1;
                 } else {
                     if (not $subdirInfo{DirName} and $inMakerNotes) {

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub MDItemLocalTime($);
 sub ProcessATTR($$$);
@@ -381,7 +381,7 @@ sub SetMacOSTags($$$)
                 $val = Image::ExifTool::ConvertUnixTime($time, 1) if $time;
             }
             $val =~ s{(\d{4}):(\d{2}):(\d{2})}{$2/$3/$1};   # reformat for setfile
-            $cmd = "setfile -d '${val}' '${f}'";
+            $cmd = "/usr/bin/setfile -d '${val}' '${f}'";
         } elsif ($tag eq 'MDItemUserTags') {
             # (tested with "tag" version 0.9.0)
             ($f = $file) =~ s/'/'\\''/g;
@@ -391,7 +391,7 @@ sub SetMacOSTags($$$)
                 my @dels = @{$$nvHash{DelValue}};
                 s/'/'\\''/g foreach @dels;
                 my $del = join ',', @dels;
-                $err = system "tag -r '${del}' '${f}'>/dev/null 2>&1";
+                $err = system "/usr/local/bin/tag -r '${del}' '${f}'>/dev/null 2>&1";
                 unless ($err) {
                     $et->VerboseValue("- $tag", $del);
                     $result = 1;
@@ -403,13 +403,13 @@ sub SetMacOSTags($$$)
                 s/'/'\\''/g foreach @vals;
                 my $opt = $overwrite > 0 ? '-s' : '-a';
                 $val = @vals ? join(',', @vals) : '';
-                $cmd = "tag $opt '${val}' '${f}'";
+                $cmd = "/usr/local/bin/tag $opt '${val}' '${f}'";
                 $et->VPrint(1,"    - $tag = (all)\n") if $overwrite > 0;
                 undef $val if $val eq '';
             }
         } elsif ($tag eq 'XAttrQuarantine') {
             ($f = $file) =~ s/'/'\\''/g;
-            $cmd = "xattr -d com.apple.quarantine '${f}'";
+            $cmd = "/usr/bin/xattr -d com.apple.quarantine '${f}'";
             $silentErr = 256;   # (will get this error if attribute doesn't exist)
         } else {
             ($f = $file) =~ s/(["\\])/\\$1/g;   # escape necessary characters for script
@@ -426,7 +426,7 @@ sub SetMacOSTags($$$)
                 $v = $val ? 8 - $val : 0;       # convert from label to label index (0 for no label)
                 $attr = 'label index';
             }
-            $cmd = qq(osascript -e 'set fp to POSIX file "$f" as alias' -e \\
+            $cmd = qq(/usr/bin/osascript -e 'set fp to POSIX file "$f" as alias' -e \\
                 'tell application "Finder" to set $attr of file fp to "$v"');
         }
         if (defined $cmd) {
@@ -455,7 +455,7 @@ sub ExtractMDItemTags($$)
 
     ($fn = $file) =~ s/([`"\$\\])/\\$1/g;   # escape necessary characters
     $et->VPrint(0, '(running mdls)');
-    my @mdls = `mdls "$fn" 2> /dev/null`;   # get MacOS metadata
+    my @mdls = `/usr/bin/mdls "$fn" 2> /dev/null`;   # get MacOS metadata
     if ($? or not @mdls) {
         $et->Warn('Error running "mdls" to extract MDItem tags');
         return;
@@ -565,7 +565,7 @@ sub ExtractXAttrTags($$)
 
     ($fn = $file) =~ s/([`"\$\\])/\\$1/g;       # escape necessary characters
     $et->VPrint(0, '(running xattr)');
-    my @xattr = `xattr -lx "$fn" 2> /dev/null`; # get MacOS extended attributes
+    my @xattr = `/usr/bin/xattr -lx "$fn" 2> /dev/null`; # get MacOS extended attributes
     if ($? or not @xattr) {
         $? and $et->Warn('Error running "xattr" to extract XAttr tags');
         return;
@@ -611,7 +611,7 @@ sub GetFileCreateDate($$)
 
     ($fn = $file) =~ s/([`"\$\\])/\\$1/g;   # escape necessary characters
     $et->VPrint(0, '(running stat)');
-    my $time = `stat -f '%SB' -t '%Y:%m:%d %H:%M:%S%z' "$fn" 2> /dev/null`;
+    my $time = `/usr/bin/stat -f '%SB' -t '%Y:%m:%d %H:%M:%S%z' "$fn" 2> /dev/null`;
     if ($? or not $time or $time !~ s/([-+]\d{2})(\d{2})\s*$/$1:$2/) {
         $et->Warn('Error running "stat" to extract FileCreateDate');
         return;

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

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '2.10';
+$VERSION = '2.11';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -570,6 +570,17 @@ my $debug;          # set to 1 to enable debugging code
             ByteOrder => 'Unknown',
         },
     },
+    {
+        Name => 'MakerNoteOlympus3',
+        # new Olympus maker notes start with "OLYMPUS\0"
+        Condition => '$$valPt =~ /^OM SYSTEM\0/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Olympus::Main',
+            Start => '$valuePtr + 16',
+            Base => '$start - 16',
+            ByteOrder => 'Unknown',
+        },
+    },
     {
         Name => 'MakerNoteLeica',
         # (starts with "LEICA\0\0\0")

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

@@ -437,6 +437,7 @@ sub GetAFPointGrid($$;$);
     'A5 40 2D 88 2C 40 4B 0E' => 'Sigma 18-250mm F3.5-6.3 DC OS HSM',
   #  LensFStops varies with FocalLength for this lens (ref 2):
     '92 2C 2D 88 2C 40 4B 0E' => 'Sigma 18-250mm F3.5-6.3 DC Macro OS HSM', #2
+    '87 2C 2D 8E 2C 40 4B 0E' => 'Sigma 18-300mm F3.5-6.3 DC Macro HSM', #30
   # '92 2C 2D 88 2C 40 4B 0E' (250mm)
   # '92 2B 2D 88 2C 40 4B 0E' (210mm)
   # '92 2C 2D 88 2C 40 4B 0E' (185mm)

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.76';
+$VERSION = '2.77';
 
 sub PrintLensInfo($$$);
 
@@ -432,6 +432,7 @@ my %olympusCameraTypes = (
     S0089 => 'E-M5MarkIII',
     S0092 => 'E-M1MarkIII', #IB
     S0093 => 'E-P7', #IB
+    S0095 => 'OM-1', #IB
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',

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

@@ -2232,7 +2232,7 @@ my %eeBox2 = (
     #  4 ? - "1e 00"
     #  6 int16u - record length in bytes
     #  8 ? - "23 01 00 00 00 00 00 00"
-    #  16 - start of records (each record ends in an int64u timestamp in ns)
+    #  16 - start of records (each record ends in an int64u timestamp "ts" in ns)
     # RDTA - float[4],ts: "-0.31289672 -0.2245330 11.303817 0 775.780"
     # RDTB - float[4],ts: "-0.04841613 -0.2166595 0.0724792 0 775.780"
     # RDTC - float[4],ts: "27.60925 -27.10037 -13.27285 0 775.829"

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

@@ -1144,13 +1144,13 @@ sub ProcessSamples($)
             }
             @$size < @$start + $samplesPerChunk and $et->WarnOnce('Sample size error'), last;
             my $sampleStart = $chunkStart;
-            for ($i=0; ; ) {
+Sample:     for ($i=0; ; ) {
                 push @$start, $sampleStart;
                 if (defined $time) {
                     until ($timeCount) {
                         if (@$stts < 2) {
                             undef $time;
-                            last;
+                            last Sample;
                         }
                         $timeCount = shift @$stts;
                         $timeDelta = shift @$stts;

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

@@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.65';
+$VERSION = '1.66';
 
 # this is a special table used to define command-line shortcuts
 # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm)
@@ -158,6 +158,7 @@ $VERSION = '1.65';
         'MakerNoteNintendo',
         'MakerNoteOlympus',
         'MakerNoteOlympus2',
+        'MakerNoteOlympus3',
         'MakerNoteLeica',
         'MakerNoteLeica2',
         'MakerNoteLeica3',

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.49';
+$VERSION = '3.50';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -244,7 +244,8 @@ sub PrintInvLensSpec($;$$);
     50529 => 'Sigma 90mm F2.8 DG DN | C', #JR (021)
     50530 => 'Sigma 24mm F2 DG DN | C', #JR (021)
     50531 => 'Sigma 18-50mm F2.8 DC DN | C', #IB/JR (021)
- 
+    50532 => 'Sigma 20mm F2 DG DN | C', #JR (022)
+
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
     50994 => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB
@@ -278,6 +279,7 @@ sub PrintInvLensSpec($;$$);
     51515 => 'Samyang AF 12mm F2.0', #JR
     51516 => 'Samyang AF 24-70mm F2.8', #JR
     51517 => 'Samyang AF 50mm F1.4 II', #JR
+    51518 => 'Samyang AF 135mm F1.8', #JR
 );
 
 # ExposureProgram values (ref PH, mainly decoded from A200)
@@ -1790,7 +1792,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     # 15  0   35  2  2     ILCA-68/77M2, ILCE-5000/5100/6000/7/7R/7S/7M2/QX1, DSC-HX60V/HX350/HX400V/QX30/RX10/RX100M3/WX220/WX350
     # 16  0   85  2  2     DSC-HX80/HX90V/WX500
     # 17  0  232  1  2     DSC-RX0/RX0M2/RX1RM2/RX10M2/RX10M3/RX10M4/RX100M4/RX100M5/RX100M5A/RX100M6/RX100M7/HX99, ILCE-6100/6300/6400/6500/6600/7C/7M3/7RM2/7RM3/7RM4/7SM2/9/9M2, ILCA-99M2, ZV-1
-    # 18  0   20  0 164    ILCE-7SM3 
+    # 18  0   20  0 164    ILCE-7SM3
     # other values for Panorama images and several other models
     0x9404 => [{
         Name => 'Tag9404a',
@@ -8386,7 +8388,7 @@ my %isoSetting2010 = (
     DATAMEMBER => [ 0x04 ],
     0x04 => {
         # seen values 0,2,3,18,19,32,49,50,83,130,132,148,213,229,255
-        # CameraTemperature is valid for all values above except ==0 and >=130 
+        # CameraTemperature is valid for all values above except ==0 and >=130
         Name => 'TempTest2',
         DataMember => 'TempTest2',
         Hidden => 1,

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

@@ -4075,6 +4075,7 @@ my %tagLookup = (
 	'makernoteoffset' => { 396 => 0xff },
 	'makernoteolympus' => { 117 => 'MakN', 119 => 0x927c },
 	'makernoteolympus2' => { 117 => 'MakN', 119 => 0x927c },
+	'makernoteolympus3' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotepanasonic' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotepanasonic2' => { 117 => 'MakN', 119 => 0x927c },
 	'makernotepanasonic3' => { 117 => 'MakN', 119 => 0x927c },

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

@@ -669,6 +669,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
@@ -20994,6 +20995,7 @@ still proprietary) Adobe format.
            MakerNoteNintendo                    Nintendo
            MakerNoteOlympus                     Olympus
            MakerNoteOlympus2                    Olympus
+           MakerNoteOlympus3                    Olympus
            MakerNoteLeica                       Panasonic
            MakerNoteLeica2                      Panasonic Leica2
            MakerNoteLeica3                      Panasonic Leica3
@@ -37534,6 +37536,7 @@ for more details.
                        MakerNoteNintendo
                        MakerNoteOlympus
                        MakerNoteOlympus2
+                       MakerNoteOlympus3
                        MakerNoteLeica
                        MakerNoteLeica2
                        MakerNoteLeica3

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

@@ -1391,8 +1391,8 @@ sub WriteQuickTime($$$)
                 $pos += $siz;
             }
             if ($msg) {
-                # (allow empty sample description for 'url ' handler type)
-                if ($$et{HandlerType} or length($buff) > 8) {
+                # (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;

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.40';
+$VERSION = '12.41';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

package/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.40
+Version: 12.41
 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.40
-#--info=FileVersion=12.4.0.0
-#--info=ProductVersion=12.4.0.0
-##"--info=Build Date=2022:02:08 10:30:47-05:00"
+-T exiftool-12.41
+#--info=FileVersion=12.4.1.0
+#--info=ProductVersion=12.4.1.0
+##"--info=Build Date=2022:04:07 11:32:41-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.40.0",
+  "version": "12.41.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.2.0",
-    "prettier": "^2.5.1",
+    "mocha": "^9.2.2",
+    "prettier": "^2.6.2",
     "rimraf": "^3.0.2"
   }
 }