exiftool-vendored.pl 12.56.0 → 12.62.0

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

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::ID3;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -203,7 +203,7 @@ sub ProcessAIFF($$)
         return 1 if $fast3;
         $tagTablePtr = GetTagTable('Image::ExifTool::DjVu::Main');
         # modify FileType to indicate a multi-page document
-        $$et{VALUE}{FileType} .= " (multi-page)" if $buf2 eq 'DJVM';
+        $$et{VALUE}{FileType} .= " (multi-page)" if $buf2 eq 'DJVM' and $$et{VALUE}{FileType};
         $type = 'DjVu';
     } else {
         return 0 unless $buff =~ /^FORM....(AIF(F|C))/s;

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # APE metadata blocks
 %Image::ExifTool::APE::Main = (
@@ -133,7 +133,7 @@ sub ProcessAPE($$)
 
     # check APE signature and process audio information
     # unless this is some other type of file
-    unless ($$et{VALUE}{FileType}) {
+    unless ($$et{FileType}) {
         $raf->Read($buff, 32) == 32 or return 0;
         $buff =~ /^(MAC |APETAGEX)/ or return 0;
         $et->SetFileType();

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

@@ -358,4 +358,3 @@ L<Image::ExifTool::TagNames/BMP Tags>,
 L<Image::ExifTool(3pm)|Image::ExifTool>
 
 =cut
-

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.50';
+$VERSION = '3.52';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -184,7 +184,8 @@ gives the order of values for a serial data stream.
 A B<Tag Name> is the handle by which the information is accessed in
 ExifTool.  In some instances, more than one name may correspond to a single
 tag ID.  In these cases, the actual name used depends on the context in
-which the information is found.  Case is not significant for tag names.  A
+which the information is found.  Valid characters in a tag name are A-Z,
+a-z, 0-9, hyphen (-) and underline (_).  Case is not significant.  A
 question mark (C<?>) after a tag name indicates that the information is
 either not understood, not verified, or not very useful -- these tags are
 not extracted by ExifTool unless the L<Unknown|../ExifTool.html#Unknown> (-u) option is enabled.  Be
@@ -445,6 +446,11 @@ QuickTime-based files; it extracts other track-specific and timed metadata,
 but can not yet edit tags in these locations (with the exception of
 track-level date/time tags).
 
+Beware that the Keys tags are actually stored inside the ItemList in the
+file, so deleting the ItemList group as a block (ie. C<-ItemList:all=>) also
+deletes Keys tags.  Instead, to preserve Keys tags the ItemList tags may be
+deleted individually with C<-QuickTime:ItemList:all=>.
+
 Alternate language tags may be accessed for
 L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
 L<Keys|Image::ExifTool::TagNames/QuickTime Keys Tags> tags by adding
@@ -576,10 +582,10 @@ number of available PDF tags.  See
 L<http://www.adobe.com/devnet/pdf/pdf_reference.html> for the official PDF
 specification.
 
-ExifTool supports reading and writing PDF documents up to version 1.7
-extension level 3, including support for RC4, AES-128 and AES-256
-encryption.  A L<Password|../ExifTool.html#Password> option is provided to allow processing of
-password-protected PDF files.
+ExifTool supports reading and writing PDF documents up to version 2.0,
+including support for RC4, AES-128 and AES-256 encryption.  A
+L<Password|../ExifTool.html#Password> option is provided to allow processing
+of password-protected PDF files.
 
 ExifTool may be used to write native PDF and XMP metadata to PDF files. It
 uses an incremental update technique that has the advantages of being both
@@ -1051,7 +1057,7 @@ TagID:  foreach $tagID (@keys) {
                 if ($$tagInfo{SubIFD}) {
                     warn "Warning: Wrong SubDirectory Start for SubIFD tag - $short $name\n" unless $isSub;
                 } else {
-                    warn "Warning: SubIFD flag not set for $short $name\n" if $isSub;
+                    warn "Warning: SubIFD flag not set for $short $name\n" if $isSub and not $processBinaryData;
                 }
                 if ($$tagInfo{Notes}) {
                     my $note = $$tagInfo{Notes};
@@ -1201,6 +1207,7 @@ TagID:  foreach $tagID (@keys) {
                             $sepTable{$s} = $printConv;
                             # add PrintHex flag to PrintConv so we can check it later
                             $$printConv{PrintHex} = 1 if $$tagInfo{PrintHex};
+                            $$printConv{PrintInt} = 1 if $$tagInfo{PrintInt};
                             $$printConv{PrintString} = 1 if $$tagInfo{PrintString};
                         } else {
                             $caseInsensitive = 0;
@@ -1216,22 +1223,18 @@ TagID:  foreach $tagID (@keys) {
                                 next if $_ eq '' and $$printConv{$_} eq '';
                                 $_ eq 'BITMASK' and $bits = $$printConv{$_}, next;
                                 $_ eq 'OTHER' and next;
-                                my $index;
-                                if (($$tagInfo{PrintHex} or $$printConv{BITMASK}) and /^-?\d+$/) {
+                                my $index = $_;
+                                $index =~ s/\.\d+$// if $$tagInfo{PrintInt};
+                                if (($$tagInfo{PrintHex} or $$printConv{BITMASK}) and $index =~ /^-?\d+$/) {
                                     my $dig = $$tagInfo{PrintHex} || 1;
-                                    if ($_ >= 0) {
-                                        $index = sprintf('0x%.*x', $dig, $_);
+                                    if ($index >= 0) {
+                                        $index = sprintf('0x%.*x', $dig, $index);
                                     } elsif ($format and $format =~ /int(16|32)/) {
                                         # mask off unused bits of signed integer hex value
                                         my $mask = { 16 => 0xffff, 32 => 0xffffffff }->{$1};
-                                        $index = sprintf('0x%.*x', $dig, $_ & $mask);
-                                    } else {
-                                        $index = $_;
+                                        $index = sprintf('0x%.*x', $dig, $index & $mask);
                                     }
-                                } elsif (/^[+-]?(?=\d|\.\d)\d*(\.\d*)?$/ and not $$tagInfo{PrintString}) {
-                                    $index = $_;
-                                } else {
-                                    $index = $_;
+                                } elsif ($$tagInfo{PrintString} or not /^[+-]?(?=\d|\.\d)\d*(\.\d*)?$/) {
                                     # translate unprintable values
                                     if ($index =~ s/([\x00-\x1f\x80-\xff])/sprintf("\\x%.2x",ord $1)/eg) {
                                         $index = qq{"$index"};
@@ -2205,7 +2208,7 @@ sub WriteTagNames($$)
                 my $wid = 0;
                 my @keys;
                 foreach (sort { NumbersFirst($a,$b) } keys %$printConv) {
-                    next if /^(Notes|PrintHex|PrintString|OTHER)$/;
+                    next if /^(Notes|PrintHex|PrintInt|PrintString|OTHER)$/;
                     $align = '' if $align and /[^\d]/;
                     my $w = length($_) + length($$printConv{$_});
                     $wid = $w if $wid < $w;
@@ -2233,6 +2236,7 @@ sub WriteTagNames($$)
                         if (defined $key) {
                             $index = $key;
                             $prt = '= ' . EscapeHTML($$printConv{$key});
+                            $index =~ s/\.\d+$// if $$printConv{PrintInt};
                             if ($$printConv{PrintHex}) {
                                 $index =~ s/(\.\d+)$//; # remove decimal
                                 $index = sprintf('0x%x',$index);

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

@@ -88,18 +88,13 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.65';
+$VERSION = '4.66';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
 # --> have relaxed this for new lenses because Canon has been
 #     consistent about keeping "USM" in the model name
 %canonLensTypes = ( #4
-     Notes => q{
-        Decimal values have been added to differentiate lenses which would otherwise
-        have the same LensType, and are used by the Composite LensID tag when
-        attempting to identify the specific lens model.
-     },
     -1 => 'n/a',
      1 => 'Canon EF 50mm f/1.8',
      2 => 'Canon EF 28mm f/2.8 or Sigma Lens',
@@ -2402,6 +2397,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         DataMember => 'LensType',
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     23 => {
         Name => 'MaxFocalLength',
@@ -3060,6 +3056,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x0e => {
         Name => 'MinFocalLength',
@@ -3175,6 +3172,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x11 => { %ciMinFocal }, #9
     0x13 => { %ciMaxFocal }, #9
@@ -3252,6 +3250,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x11 => { %ciMinFocal },
     0x13 => { %ciMaxFocal },
@@ -3347,6 +3346,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x113 => { %ciMinFocal },
     0x115 => { %ciMaxFocal },
@@ -3502,6 +3502,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x151 => { %ciMinFocal },
     0x153 => { %ciMaxFocal,
@@ -3610,6 +3611,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x1a9 => { %ciMinFocal },
     0x1ab => { %ciMaxFocal,
@@ -3661,6 +3663,7 @@ my %ciMaxFocal = (
         RawConv => '$val ? $val : undef', # don't use if value is zero
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x17 => { %ciCameraTemperature }, #PH
     0x1b => { %ciMacroMagnification }, #PH
@@ -3721,6 +3724,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xa4 => { #PH
         Name => 'FirmwareRevision',
@@ -3936,6 +3940,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xe8 => { %ciMinFocal },
     0xea => { %ciMaxFocal,
@@ -4060,6 +4065,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x155 => { %ciMinFocal },
     0x157 => { %ciMaxFocal,
@@ -4169,6 +4175,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x163 => { %ciMinFocal }, # (5DmkIII + 0x0e)
     0x165 => { %ciMaxFocal }, # (5DmkIII + 0x0e)
@@ -4316,6 +4323,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x114 => { %ciMinFocal },
     0x116 => { %ciMaxFocal },
@@ -4405,6 +4413,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xd8 => { %ciMinFocal }, #15
     0xda => { %ciMaxFocal }, #15
@@ -4540,6 +4549,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xec => { %ciMinFocal },
     0xee => { %ciMaxFocal,
@@ -4629,6 +4639,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xea => { %ciMinFocal },
     0xec => { %ciMaxFocal },
@@ -4710,6 +4721,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x168 => { %ciMinFocal },
     0x16a => { %ciMaxFocal },
@@ -4777,6 +4789,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x18b => { %ciMinFocal },
     0x18d => { %ciMaxFocal },
@@ -4860,6 +4873,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x107 => { #PH
         Name => 'FirmwareVersion',
@@ -4975,6 +4989,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xf8 => { %ciMinFocal },
     0xfa => { %ciMaxFocal },
@@ -5070,6 +5085,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x101 => { %ciMinFocal }, # (500D + 9)
     0x103 => { %ciMaxFocal }, # (500D + 9)
@@ -5165,6 +5181,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xec => { %ciMinFocal }, # (60D + 2)
     0xee => { %ciMaxFocal }, # (60D + 2)
@@ -5247,6 +5264,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x129 => { %ciMinFocal },
     0x12b => { %ciMaxFocal },
@@ -5359,6 +5377,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0x186 => { %ciMinFocal },
     0x188 => { %ciMaxFocal },
@@ -5433,6 +5452,7 @@ my %ciMaxFocal = (
         SeparateTable => 1,
         ValueConvInv => 'int($val)', # (must truncate decimal part)
         PrintConv => \%canonLensTypes,
+        PrintInt => 1,
     },
     0xe4 => { %ciMinFocal }, #PH
     0xe6 => { %ciMaxFocal }, #PH

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Canon;
 
-$VERSION = '1.59';
+$VERSION = '1.60';
 
 sub WriteCRW($$);
 sub ProcessCanonRaw($$$);
@@ -698,6 +698,10 @@ sub ProcessCanonRaw($$$)
                           $format ne 'string' and not $subdir;
         } else {
             $valueDataPos = $ptr;
+            # do MD5 of image data if requested
+            if ($$et{ImageDataMD5} and $tagID == 0x2005) {
+                $raf->Seek($ptr, 0) and $et->ImageDataMD5($raf, $size, 'raw');
+            }
             if ($size <= 512 or ($verbose > 2 and $size <= 65536)
                 or ($tagInfo and ($$tagInfo{SubDirectory}
                 or grep(/^$$tagInfo{Name}$/i, $et->GetRequestedTags()) )))

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

@@ -16,7 +16,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.06';
+$VERSION = '1.08';
 
 sub ProcessDJIInfo($$$);
 
@@ -96,6 +96,31 @@ my %convFloat2 = (
     # (nothing yet decoded from device header)
 );
 
+# thermal parameters in APP4 of DJI M3T, H20N, M2EA and some M30T images (ref PH/forum11401)
+%Image::ExifTool::DJI::ThermalParams2 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'APP4', 2 => 'Image' },
+    NOTES => 'Thermal parameters extracted from APP4 of DJI M3T RJPEG files.',
+    0x00 => { Name => 'AmbientTemperature',  Format => 'float', PrintConv => 'sprintf("%.1f C",$val)' }, # (NC)
+    0x04 => { Name => 'ObjectDistance',      Format => 'float', PrintConv => 'sprintf("%.1f m",$val)' },
+    0x08 => { Name => 'Emissivity',          Format => 'float', PrintConv => 'sprintf("%.2f",$val)' },
+    0x0c => { Name => 'RelativeHumidity',    Format => 'float', PrintConv => 'sprintf("%g %%",$val*100)' },
+    0x10 => { Name => 'ReflectedTemperature',Format => 'float', PrintConv => 'sprintf("%.1f C",$val)' },
+    0x65 => { Name => 'IDString',            Format => 'string[16]' }, # (NC)
+);
+
+# thermal parameters in APP4 of some DJI M30T images (ref PH)
+%Image::ExifTool::DJI::ThermalParams3 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'APP4', 2 => 'Image' },
+    NOTES => 'Thermal parameters extracted from APP4 of some DJI RJPEG files.',
+  # 0x00 - 0xaa553800 - params3 magic number 
+    0x04 => { Name => 'RelativeHumidity',    Format => 'int16u' },
+    0x06 => { Name => 'ObjectDistance',      Format => 'int16u', ValueConv => '$val / 10' },
+    0x08 => { Name => 'Emissivity',          Format => 'int16u', ValueConv => '$val / 100' },
+    0x0a => { Name => 'ReflectedTemperature',Format => 'int16u', ValueConv => '$val / 10' },
+);
+
 %Image::ExifTool::DJI::XMP = (
     %Image::ExifTool::XMP::xmpTableDefaults,
     GROUPS => { 0 => 'XMP', 1 => 'XMP-drone-dji', 2 => 'Location' },
@@ -161,7 +186,7 @@ my %convFloat2 = (
 );
 
 #------------------------------------------------------------------------------
-# Process DJI infor (ref PH)
+# Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessDJIInfo($$$)
@@ -174,6 +199,7 @@ sub ProcessDJIInfo($$$)
         my $buff = substr($$dataPt, $dirStart, $dirLen);
         $dataPt = \$buff;
     }
+    $et->VerboseDir('DJIInfo', undef, length $$dataPt);
     while ($$dataPt =~ /\G\[(.*?)\](?=(\[|$))/sg) {
         my ($tag, $val) = split /:/, $1, 2;
         next unless defined $tag and defined $val;