exiftool_vendored 11.98.0 → 11.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd206618b02e9bdc096dbaf8dc497c6bce6a27e5782b42db0a308ba043752c49
-  data.tar.gz: 783ecd5157f77b7f56d7c85a3ddcb86aebc170e6e937ebfacfa7141a90f74cd8
+  metadata.gz: 01eeff66f9e45f6f726a4e44141317b4eac1becc2ae9eb079f4a9aad0b05291f
+  data.tar.gz: 4a26cd2011a6c4d1fb4aeb9b696b190d5fb83d8d61bd35cd24a90b2c00e7480a
 SHA512:
-  metadata.gz: c4e18ca046d054a9a06289921a7ebd70801a64f3ac133de19156969077a1618841926104c9eef4cfdcd57ead9aed13ef2b1cd53b16a7b204fd6bba4342b633ef
-  data.tar.gz: 397e4a867443f593c3d73be6e549e9b0df9256ef551cad3ff39ef335bada1a47bf63fcdc58435672f39873418d74ecfec7ecc385008da471cd6cb34904f5c26a
+  metadata.gz: 8d2f03f98474b2af36bf5fa1b1163228c61727d374273fddf69209443d72c6fd952a4ae82350897573fab244e79d12151de5e4a6648bd30296b59b0c98203930
+  data.tar.gz: dbe7f778f5a9d034303b738bd3258d05bdccbeb0ba44fb897095d987952c4461580b092be2e3a1bd71ac0b546a97bd901293f2adc10904ad2aaad3d28e483a47

data/bin/Changes

@@ -7,6 +7,20 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.85. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+May 11, 2020 - Version 11.99
+
+  - Added a new Nikon LensID (thanks Mykyta Kozlov)
+  - Added a new Canon LensType
+  - Added a newn PentaxModelID
+  - Decode a few new QuickTime tags
+  - Decode new ID3 Grouping tag
+  - Decode a few more MinoltaRaw tags (thanks LibRaw)
+  - Fixed runtime warning which could occur when reading corrupted RTF files
+  - Fixed another potential pitfall in M2TS Duration calculation
+  - Fixed problem extracting some unknown QuickTime:Keys tags
+  - Fixed problem decoding Nikon D850 orientation tags
+  - Fixed bug where TIFF image data may not be padded to an even number of bytes
+
 May 1, 2020 - Version 11.98
 
   - Added a new Nikon LensID (thanks Warren Hatch)

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.98"
+   "version" : "11.99"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 11.98
+version: 11.99

data/bin/README

@@ -105,8 +105,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-11.98.tar.gz | tar -xf -
-  cd Image-ExifTool-11.98
+  gzip -dc Image-ExifTool-11.99.tar.gz | tar -xf -
+  cd Image-ExifTool-11.99
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.98';
+my $version = '11.99';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5286,7 +5286,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.98 --
+    -- Generated by ExifTool 11.99 --
     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

data/bin/lib/Image/ExifTool.pm

@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '11.98';
+$VERSION = '11.99';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.37';
+$VERSION = '4.38';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -474,8 +474,9 @@ $VERSION = '4.37';
     253.1 => 'Canon EF 70-200mm f/2.8L IS III USM + 2x', #PH (NC)
     # 253.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025) + 2x', #forum9367
     254 => 'Canon EF 100mm f/2.8L Macro IS USM', #42
-    255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens', #50
+    255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
+    255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
     368 => 'Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens', #IB (A018)
     368.1 => 'Sigma 20mm f/1.4 DG HSM | A', #50 (newer firmware)
     368.2 => 'Sigma 50mm f/1.4 DG HSM | A', #50

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.53';
+$VERSION = '1.54';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -613,6 +613,9 @@ my %id3v2_common = (
         Name => 'OlympusDSS',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::DSS' },
     },
+    GRP1 => 'Grouping',
+    MVNM => 'MovementName', # (NC)
+    MVIN => 'MovementNumber', # (NC)
 );
 
 # Tags for ID3v2.3 (http://www.id3.org/id3v2.3.0)
@@ -1318,6 +1321,8 @@ sub ProcessID3v2($$$)
         } elsif ($$tagInfo{Format} or $$tagInfo{SubDirectory}) {
             $et->HandleTag($tagTablePtr, $id, undef, DataPt => \$val);
             next;
+        } elsif ($id eq 'GRP1' or $id eq 'MVNM' or $id eq 'MVIN') {
+            $val =~ s/(^\0+|\0+$)//g;   # (PH guess)
         } elsif (not $$tagInfo{Binary}) {
             $et->Warn("Don't know how to handle $id frame");
             next;

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

@@ -31,7 +31,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
 # program map table "stream_type" lookup (ref 6/1)
 my %streamType = (
@@ -359,23 +359,26 @@ sub ProcessM2TS($$)
             last unless defined $startTime;
             # reconfigure to seek backwards for last PCR
             unless (defined $backScan) {
-                $et->Options('FastScan') and undef($endTime), last;
-                $verbose and print "[Starting backscan for last PCR]\n";
-                $fwdTime = $endTime;
+                my $saveTime = $endTime;
                 undef $endTime;
+                last if $et->Options('FastScan');
+                $verbose and print $out "[Starting backscan for last PCR]\n";
                 # remember how far we got when reading forward through the file
                 my $fwdPos = $raf->Tell() - length($buff) + $pEnd;
-                # determine the number of whole packets in the file
+                # determine the position of the last packet relative to the EOF
                 $raf->Seek(0, 2) or last;
                 my $fsize = $raf->Tell();
-                my $nPack = int($fsize / $pLen);
-                $backScan = $nPack * $pLen - $fsize;
+                $backScan = int($fsize / $pLen) * $pLen - $fsize;
                 # set limit on how far back we will go
                 $maxBack = $fwdPos - $fsize;
                 # scan back a maximum of 512k (have seen last PCR at -276k)
-                my $nMax = int(512000 / $pLen);     # max packets to scan
-                my $nRem = int(-$maxBack / $pLen);  # packets remaining in file
-                $maxBack = $backScan - $nMax * $pLen if $nRem > $nMax;
+                my $nMax = int(512000 / $pLen);     # max packets to backscan
+                if ($nMax < int(-$maxBack / $pLen)) {
+                    $maxBack = $backScan - $nMax * $pLen;
+                } else {
+                    # use this time if none found in all remaining packets
+                    $fwdTime = $saveTime;
+                }
                 $pEnd = 0;
             }
         }
@@ -387,15 +390,12 @@ sub ProcessM2TS($$)
             if ($pos < 0) {
                 # read another buffer from end of file
                 last if $backScan <= $maxBack;
-                my $readThis = $readSize;
-                $backScan -= $readSize;
-                if ($backScan < $maxBack) {
-                    $readThis = $readSize - ($maxBack - $backScan);
-                    $backScan = $maxBack;
-                }
+                my $buffLen = $backScan - $maxBack;
+                $buffLen = $readSize if $buffLen > $readSize;
+                $backScan -= $buffLen;
                 $raf->Seek($backScan, 2) or last;
-                $raf->Read($buff, $readThis) == $readThis or last;
-                $pos = $pEnd = $readThis - $pLen;
+                $raf->Read($buff, $buffLen) == $buffLen or last;
+                $pos = $pEnd = $buffLen - $pLen;
             }
         } else {
             $pos = $pEnd;

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Minolta;
 
-$VERSION = '1.15';
+$VERSION = '1.16';
 
 sub ProcessMRW($$;$);
 sub WriteMRW($$;$);
@@ -59,10 +59,12 @@ sub WriteMRW($$;$);
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     WRITABLE => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 0 ],
     FIRST_ENTRY => 0,
     0 => {
         Name => 'FirmwareID',
         Format => 'string[8]',
+        RawConv => '$$self{MinoltaPRD} = 1 if $$self{FILE_TYPE} eq "MRW"; $val',  # used in decoding RIF info
     },
     8 => {
         Name => 'SensorHeight',
@@ -214,38 +216,37 @@ sub WriteMRW($$;$);
             PrintConv => \%Image::ExifTool::Minolta::sonyColorMode,
         },
     ],
-    # NOTE: some of these WB_RBLevels may apply to other models too...
+    # NOTE: WB_RBLevels up to Custom also apply to Minolta models which write PRD info (ref IB)
     8  => { #3
         Name => 'WB_RBLevelsTungsten',
-        Condition => '$$self{Model} eq "DSLR-A100"',
+        Condition => '$$self{Model} eq "DSLR-A100" or $$self{MinoltaPRD}',
         Format => 'int16u[2]',
         Notes => 'these WB_RBLevels currently decoded only for the Sony A100',
     },
     12 => { #3
         Name => 'WB_RBLevelsDaylight',
-        Condition => '$$self{Model} eq "DSLR-A100"',
+        Condition => '$$self{Model} eq "DSLR-A100" or $$self{MinoltaPRD}',
         Format => 'int16u[2]',
     },
     16 => { #3
         Name => 'WB_RBLevelsCloudy',
-        Condition => '$$self{Model} eq "DSLR-A100"',
+        Condition => '$$self{Model} eq "DSLR-A100" or $$self{MinoltaPRD}',
         Format => 'int16u[2]',
     },
     20 => { #3
         Name => 'WB_RBLevelsCoolWhiteF',
-        Condition => '$$self{Model} eq "DSLR-A100"',
+        Condition => '$$self{Model} eq "DSLR-A100" or $$self{MinoltaPRD}',
         Format => 'int16u[2]',
     },
     24 => { #3
         Name => 'WB_RBLevelsFlash',
-        Condition => '$$self{Model} eq "DSLR-A100"',
+        Condition => '$$self{Model} eq "DSLR-A100" or $$self{MinoltaPRD}',
         Format => 'int16u[2]',
     },
     28 => { #3
-        Name => 'WB_RBLevelsUnknown',
-        Condition => '$$self{Model} eq "DSLR-A100"',
+        Name => 'WB_RBLevelsCustom', #IB
+        Condition => '$$self{Model} eq "DSLR-A100" or $$self{MinoltaPRD}',
         Format => 'int16u[2]',
-        Unknown => 1,
     },
     32 => { #3
         Name => 'WB_RBLevelsShade',

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

@@ -62,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.82';
+$VERSION = '3.83';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -653,6 +653,7 @@ sub GetAFPointGrid($$;$);
     '00 40 64 64 2C 2C 00 00' => 'Voigtlander APO-Lanthar 90mm F3.5 SLII Close Focus',
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
+    '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
     '00 48 32 32 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/21 ZF.2',
     '00 54 38 38 18 18 00 00' => 'Carl Zeiss Distagon T* 2/25 ZF.2',
     '00 54 3C 3C 18 18 00 00' => 'Carl Zeiss Distagon T* 2/28 ZF.2',
@@ -1694,7 +1695,8 @@ my %binaryDataAttrs = (
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD850',
                 DecryptStart => 4,
-                DecryptLen => 0x2f07,
+                DecryptLen => 0x2efb + 12,
+                DecryptMore => 'Get32u(\$data, 0xa0) + 12',
                 ByteOrder => 'LittleEndian',
             },
         },
@@ -6250,7 +6252,7 @@ my %nikonFocalConversions = (
     #        3 => 'Rotate 180',
     #    },
     #},
-    0x2ea4 => {
+    0x2ea4 => { #PH
         Name => 'NikonMeteringMode',
         Condition => '$$self{Model} =~ /\bD500\b/', # (didn't seem to work for D5, but I need more samples)
         Notes => 'D500 only',
@@ -6627,7 +6629,7 @@ my %nikonFocalConversions = (
     WRITE_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     VARS => { ID_LABEL => 'Index' },
-    DATAMEMBER => [ 0x04, 0x58, 0x0fbf ],
+    DATAMEMBER => [ 0x04, 0x58, 0xa0, 0x0fbf, 0x2efa ],
     IS_SUBDIR => [ 0x1038 ],
     WRITABLE => 1,
     FIRST_ENTRY => 0,
@@ -6653,6 +6655,14 @@ my %nikonFocalConversions = (
         Hidden => 1,
         RawConv => '$$self{CustomSettingsOffset} = $val || 0x10000000; undef',
     },
+    0xa0 => {
+        Name => 'OrientationOffset',
+        DataMember => 'OrientationOffset',
+        Format => 'int32u',
+        Writable => 0,
+        Hidden => 1,
+        RawConv => '$$self{OrientationOffset} = $val || 0x10000000; undef',
+    },
     0x0791 => {
         Name => 'PhotoShootingMenuBankImageArea',
         Mask => 0x07,
@@ -6692,6 +6702,14 @@ my %nikonFocalConversions = (
             TagTable => 'Image::ExifTool::NikonCustom::SettingsD850',
         },
     },
+### 0x2efb - OrientationInfo start (D850 firmware 1.01a)
+    0x2efa => {
+        Name => 'Hook1',
+        Hidden => 1,
+        RawConv => 'undef',
+        # account for variable location of OrientationInfo data
+        Hook => '$varSize = $$self{OrientationOffset} - 0x2efb',
+    },
     0x2efb => { #28
         Name => 'RollAngle',
         Format => 'fixed32u',

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.31';
+$VERSION = '3.32';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -546,6 +546,7 @@ my %pentaxModelID = (
     0x13222 => 'K-70', #29 (Ricoh)
     0x1322c => 'KP', #29 (Ricoh)
     0x13240 => 'K-1 Mark II', # (Ricoh)
+    0x13290 => 'WG-70', # (Ricoh)
 );
 
 # Pentax city codes - (PH, Optio WP)

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

@@ -46,7 +46,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.48';
+$VERSION = '2.49';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -5908,6 +5908,24 @@ my %eeBox = (
         PrintConv => \&PrintGPSCoordinates,
         PrintConvInv => \&PrintInvGPSCoordinates,
     },
+    # the following tags written by iTunes 12.5.1.21
+    # (ref https://www.ventismedia.com/mantis/view.php?id=14963
+    #  https://community.mp3tag.de/t/x-mp4-new-tag-problems/19488)
+    "\xa9wrk" => 'Work', #PH
+    "\xa9mvn" => 'MovementName', #PH
+    "\xa9mvi" => { #PH
+        Name => 'MovementNumber',
+        Format => 'int16s',
+    },
+    "\xa9mvc" => { #PH
+        Name => 'MovementCount',
+        Format => 'int16s',
+    },
+    shwm => { #PH
+        Name => 'ShowMovement',
+        Format => 'int8s',
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
 );
 
 # tag decoded from timed face records
@@ -6127,6 +6145,21 @@ my %eeBox = (
     'detected-face.roll-angle' => { Name => 'DetectedFaceRollAngle', Writable => 0 },
     # (fiel)com.apple.quicktime.detected-face.yaw-angle (dtyp=23, float)
     'detected-face.yaw-angle'  => { Name => 'DetectedFaceYawAngle',  Writable => 0 },
+#
+# seen in Apple ProRes RAW file
+#
+    # (mdta)com.apple.proapps.manufacturer (eg. "Sony")
+    # (mdta)com.apple.proapps.exif.{Exif}.FNumber (float, eg. 1.0)
+    # (mdta)org.smpte.rdd18.lens.irisfnumber (eg. "F1.0")
+    # (mdta)com.apple.proapps.exif.{Exif}.ShutterSpeedValue (float, eg. 1.006)
+    # (mdta)org.smpte.rdd18.camera.shutterspeed_angle (eg. "179.2deg")
+    # (mdta)org.smpte.rdd18.camera.neutraldensityfilterwheelsetting (eg. "ND1")
+    # (mdta)org.smpte.rdd18.camera.whitebalance (eg. "4300K")
+    # (mdta)com.apple.proapps.exif.{Exif}.ExposureIndex (float, eg. 4000)
+    # (mdta)org.smpte.rdd18.camera.isosensitivity (eg. "4000")
+    # (mdta)com.apple.proapps.image.{TIFF}.Make (eg. "Atmos")
+    # (mdta)com.apple.proapps.image.{TIFF}.Model (eg. "ShogunInferno")
+    # (mdta)com.apple.proapps.image.{TIFF}.Software (eg. "9.0")
 );
 
 # iTunes info ('----') atoms
@@ -6734,13 +6767,28 @@ my %eeBox = (
         Name => 'SchemeInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::SchemeInfo' },
     },
+    enda => {
+        Name => 'Endianness',
+        Format => 'int16u',
+        PrintConv => {
+            0 => 'Big-endian (Motorola, MM)',
+            1 => 'Little-endian (Intel, II)',
+        },
+    },
     # skcr
-    # enda
 );
 
 %Image::ExifTool::QuickTime::Wave = (
     PROCESS_PROC => \&ProcessMOV,
     frma => 'PurchaseFileFormat',
+    enda => {
+        Name => 'Endianness',
+        Format => 'int16u',
+        PrintConv => {
+            0 => 'Big-endian (Motorola, MM)',
+            1 => 'Little-endian (Intel, II)',
+        },
+    },
     # "ms\0\x11" - 20 bytes
 );
 
@@ -8564,9 +8612,10 @@ sub ProcessKeys($$$)
             $$newInfo{Groups} = $groups ? { %$groups } : { };
             $$newInfo{Groups}{$_} or $$newInfo{Groups}{$_} = $$tagTablePtr{GROUPS}{$_} foreach 0..2;
             $$newInfo{Groups}{1} = 'Keys';
-        } elsif ($tag =~ /^[-\w. ]+$/) {
+        } elsif ($tag =~ /^[-\w. ]+$/ or $tag =~ /\w{4}/) {
             # create info for tags with reasonable id's
             my $name = ucfirst $tag;
+            $name =~ tr/-0-9a-zA-Z_. //dc;
             $name =~ s/[. ]+(.?)/\U$1/g;
             $name =~ s/_([a-z])/_\U$1/g;
             $name =~ s/([a-z])_([A-Z])/$1$2/g;
@@ -8587,7 +8636,7 @@ sub ProcessKeys($$$)
         if ($newInfo) {
             AddTagToTable($itemList, $id, $newInfo);
             $msg or $msg = '';
-            $out and print $out "$$et{INDENT}Added ItemList Tag $id = $tag$msg\n";
+            $out and print $out "$$et{INDENT}Added ItemList Tag $id = ($ns) $tag$msg\n";
         }
         $pos += $len;
         ++$index;

data/bin/lib/Image/ExifTool/README

@@ -1083,7 +1083,7 @@ The contained structure field information hashes are similar to tag information
 hashes, except that only the following elements are used:
 
   Raw/Value/PrintConv (and their inverses), TagID (optional), Groups, List,
-  Writable, Struct, Namespace, LangCode, PropertyPath, Notes.
+  Writable, Struct, Namespace, FlatName, LangCode, PropertyPath, Notes.
 
 But note that for PropertyPath, only the element of the path corresponding to
 the specific field is stored (including any necessary list properties).  The

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ProcessUserProps($$$);
 
@@ -181,12 +181,17 @@ sub UnescapeRTF($$$)
             if ($1 eq 'uc') {       # \ucN
                 $skip = $2;
             } elsif ($1 eq 'u') {   # \uN
-                require Image::ExifTool::Charset;
-                $rtnVal .= Image::ExifTool::Charset::Recompose($et, [$2]);
-                if ($skip) {
-                    # must skip the specified number of characters
-                    # (not simple because RTF control words count as a single character)
-                    last unless $val =~ /\G([^\\]|\\([a-zA-Z]+)(-?\d+)? ?|\\'.{2}|\\.){$skip}/g;
+                if ($2 < 0) {
+                    $et->WarnOnce('Invalid Unicode character(s) in text');
+                    $rtnVal .= '?';
+                } else {
+                    require Image::ExifTool::Charset;
+                    $rtnVal .= Image::ExifTool::Charset::Recompose($et, [$2]);
+                    if ($skip) {
+                        # must skip the specified number of characters
+                        # (not simple because RTF control words count as a single character)
+                        last unless $val =~ /\G([^\\]|\\([a-zA-Z]+)(-?\d+)? ?|\\'.{2}|\\.){$skip}/g;
+                    }
                 }
             } elsif ($rtfEntity{$1}) {
                 require Image::ExifTool::Charset;

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

@@ -226,13 +226,15 @@ sub PrintInvLensSpec($;$$);
     # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)
     # 504xx => 'Sigma 30mm F1.4 DC HSM | A + MC-11', # (013)
 
+    # Note: For Samyang lenses, the "FE" designation isn't written to
+    # EXIF:LensModel, so it isn't included in these strings either - JR/PH
     51504 => 'Samyang AF 50mm F1.4', #IB
     51505 => 'Samyang AF 14mm F2.8 or Samyang AF 35mm F2.8', #forum3833
     51505.1 => 'Samyang AF 35mm F2.8', #PH (also 32794)
     51507 => 'Samyang AF 35mm F1.4', #IB
     51508 => 'Samyang AF 45mm F1.8',
     51510 => 'Samyang AF 18mm F2.8', #JR
-    51512 => 'Samyang AF 75mm F1.8 FE', #IB
+    51512 => 'Samyang AF 75mm F1.8', #IB/JR
 );
 
 # ExposureProgram values (ref PH, mainly decoded from A200)

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

@@ -4002,6 +4002,9 @@ my %tagLookup = (
 	'moonphase' => { 367 => 0x12, 368 => 0x43, 369 => 0x4c },
 	'morepermissions' => { 460 => 'morePermissions' },
 	'motionsensitivity' => { 367 => 0x29, 369 => 0x60 },
+	'movementcount' => { 358 => "\xa9mvc" },
+	'movementname' => { 358 => "\xa9mvn" },
+	'movementnumber' => { 358 => "\xa9mvi" },
 	'movieaelockbuttonassignment' => { 279 => '40.1' },
 	'moviefunc1button' => { 269 => '41.1', 270 => '41.1', 280 => '41.1' },
 	'moviefunctionbutton' => { 267 => '41.1', 279 => '41.1' },
@@ -5276,6 +5279,7 @@ my %tagLookup = (
 	'shotnumbersincepowerup' => { 410 => 0x44e, 426 => 0x1a, 427 => 0x16, 428 => 0xa },
 	'shotnumbersincepowerup2' => { 395 => 0x200 },
 	'shotsize' => { 488 => 'shotSize' },
+	'showmovement' => { 358 => 'shwm' },
 	'shownevent' => { 474 => 'EventExt' },
 	'showneventidentifier' => { 474 => [\'EventExt','EventExtIdentifier'] },
 	'showneventname' => { 474 => [\'EventExt','EventExtName'] },
@@ -6027,7 +6031,7 @@ my %tagLookup = (
 	'wb_rblevelscloudy' => { 182 => 0x3f0, 184 => 0x10, 196 => 0x296, 291 => 0x121 },
 	'wb_rblevelscoolwhitef' => { 182 => 0x308, 184 => 0x14 },
 	'wb_rblevelscoolwhitefluor' => { 291 => 0x132 },
-	'wb_rblevelscustom' => { 182 => 0x424 },
+	'wb_rblevelscustom' => { 182 => 0x424, 184 => 0x1c },
 	'wb_rblevelscwb1' => { 287 => 0x10e },
 	'wb_rblevelscwb2' => { 287 => 0x10f },
 	'wb_rblevelscwb3' => { 287 => 0x110 },
@@ -6044,7 +6048,6 @@ my %tagLookup = (
 	'wb_rblevelsincandescent' => { 196 => 0x282 },
 	'wb_rblevelsshade' => { 182 => 0x418, 184 => 0x20, 196 => 0x2b2, 291 => 0x120 },
 	'wb_rblevelstungsten' => { 182 => 0x3e8, 184 => 0x8, 291 => 0x123 },
-	'wb_rblevelsunknown' => { 184 => 0x1c },
 	'wb_rblevelsused' => { 291 => 0x100 },
 	'wb_rblevelswhitef' => { 184 => 0x2c },
 	'wb_rblevelswhitefluorescent' => { 291 => 0x133 },
@@ -6222,6 +6225,7 @@ my %tagLookup = (
 	'windowsatominvocationflags' => { 463 => [\'windowsAtom','windowsAtomInvocationFlags'] },
 	'windowsatomuncprojectpath' => { 463 => [\'windowsAtom','windowsAtomUncProjectPath'] },
 	'wordcount' => { 478 => 'wordCount' },
+	'work' => { 358 => "\xa9wrk" },
 	'workcolorspace' => { 100 => 0x10200, 105 => 0x270 },
 	'workflowtag' => { 474 => 'WorkflowTag' },
 	'workflowtagcvid' => { 474 => [\'WorkflowTag','WorkflowTagCvId'] },
@@ -7640,6 +7644,7 @@ my %tagExists = (
 	'encrypt' => 1,
 	'encryption' => 1,
 	'enddate' => 1,
+	'endianness' => 1,
 	'endpoints' => 1,
 	'endtime' => 1,
 	'endtimecode' => 1,

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

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 23365 tags, with 15307 unique tag names.
+They contain a total of 23378 tags, with 15312 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
@@ -18950,7 +18950,7 @@ These tags are used in Minolta RAW format (MRW) images.
      16    WB_RBLevelsCloudy                    int16u[2]
      20    WB_RBLevelsCoolWhiteF                int16u[2]
      24    WB_RBLevelsFlash                     int16u[2]
-     28    WB_RBLevelsUnknown?                  int16u[2]
+     28    WB_RBLevelsCustom                    int16u[2]
      32    WB_RBLevelsShade                     int16u[2]
      36    WB_RBLevelsDaylightF                 int16u[2]
      40    WB_RBLevelsDayWhiteF                 int16u[2]
@@ -24260,9 +24260,12 @@ software.
   'APIC-2' PictureType                          no
   'APIC-3' PictureDescription                   no
   'COMM'   Comment                              no
+  'GRP1'   Grouping                             no
   'IPLS'   InvolvedPeople                       no
   'ITNU'   iTunesU?                             no
   'MCDI'   MusicCDIdentifier                    no
+  'MVIN'   MovementNumber                       no
+  'MVNM'   MovementName                         no
   'OWNE'   Ownership                            no
   'PCNT'   PlayCounter                          no
   'PCST'   Podcast?                             no
@@ -24362,8 +24365,11 @@ software.
   'APIC-2' PictureType                          no
   'APIC-3' PictureDescription                   no
   'COMM'   Comment                              no
+  'GRP1'   Grouping                             no
   'ITNU'   iTunesU?                             no
   'MCDI'   MusicCDIdentifier                    no
+  'MVIN'   MovementNumber                       no
+  'MVNM'   MovementName                         no
   'OWNE'   Ownership                            no
   'PCNT'   PlayCounter                          no
   'PCST'   Podcast?                             no
@@ -25466,6 +25472,7 @@ API QuickTimeHandler option may be used to include an 'mdir' Handler box.
   'rldt'       ReleaseDate                      string
   'rtng'       Rating                           int8u
   'sfID'       AppleStoreCountry                int32u
+  'shwm'       ShowMovement                     int8s
   'soaa'       SortAlbumArtist                  string
   'soal'       SortAlbum                        string
   'soar'       SortArtist                       string
@@ -25494,11 +25501,15 @@ API QuickTimeHandler option may be used to include an 'mdir' Handler box.
   "\xa9gen"    Genre                            string
   "\xa9grp"    Grouping                         string
   "\xa9lyr"    Lyrics                           string
+  "\xa9mvc"    MovementCount                    int16s
+  "\xa9mvi"    MovementNumber                   int16s
+  "\xa9mvn"    MovementName                     string
   "\xa9nam"    Title                            string
   "\xa9nrt"    Narrator                         string
   "\xa9pub"    Publisher                        string
   "\xa9too"    Encoder                          string
   "\xa9trk"    Track                            string
+  "\xa9wrk"    Work                             string
   "\xa9wrt"    Composer                         string
   "\xa9xyz"    GPSCoordinates                   string
 
@@ -25858,6 +25869,7 @@ Child atoms found in "sinf" and/or "pinf" atoms.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  'enda'   Endianness                           no
   'frma'   OriginalFormat                       no
   'schi'   SchemeInfo                           QuickTime SchemeInfo
   'schm'   SchemeType                           QuickTime SchemeType
@@ -25898,6 +25910,7 @@ Child atoms found in "sinf" and/or "pinf" atoms.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  'enda'   Endianness                           no
   'frma'   PurchaseFileFormat                   no
 
 =head3 QuickTime ImageDesc Tags

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

@@ -2297,8 +2297,8 @@ NoOverwrite:            next if $isNew > 0;
                     } elsif ($ifd < 0) {
                         # pad if necessary (but don't pad contiguous image blocks)
                         my $pad = 0;
-                        ++$pad if $size & 0x01 and ($n+1 >= $count or not $oldEnd or
-                                  $oldEnd != $$oldOffset[$n+1]);
+                        ++$pad if ($blockSize + $size) & 0x01 and ($n+1 >= $count or
+                                  not $oldEnd or $oldEnd != $$oldOffset[$n+1]);
                         # preserve original image padding if specified
                         if ($$origDirInfo{PreserveImagePadding} and $n+1 < $count and
                             $oldEnd and $$oldOffset[$n+1] > $oldEnd)

data/bin/perl-Image-ExifTool.spec

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

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('11.98.0')
+  VERSION = Gem::Version.new('11.99.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.98.0
+  version: 11.99.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool
@@ -450,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Vendored version of exiftool