exiftool_vendored 9.69.0 → 9.71.0

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/CanonVRD.pm

@@ -1040,7 +1040,7 @@ sub ProcessEditData($$$)
                     Prefix => $$et{INDENT},
                 );
                 $parms{MaxLen} = $verbose == 3 ? 96 : 2048 if $verbose < 5;
-                Image::ExifTool::HexDump($dataPt, $recLen, %parms);
+                HexDump($dataPt, $recLen, %parms);
             }
         }
 
@@ -1384,7 +1384,7 @@ sub ProcessCanonVRD($$;$)
                     Prefix => $$et{INDENT},
                 );
                 $parms{MaxLen} = $verbose == 3 ? 96 : 2048 if $verbose < 5;
-                Image::ExifTool::HexDump($dataPt, $blockLen, %parms);
+                HexDump($dataPt, $blockLen, %parms);
             }
         }
         my $tagInfo = $$tagTablePtr{$blockType};

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/Exif.pm

@@ -51,7 +51,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.65';
+$VERSION = '3.66';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1520,7 +1520,11 @@ my %sampleFormat = (
         Notes => 'called DateTimeDigitized by the EXIF spec.',
         PrintConv => '$self->ConvertDateTime($val)',
     },
-    # 0x9009 - undef[44] written by Google Plus uploader - PH
+    0x9009 => { # undef[44] (or undef[11]) written by Google Plus uploader - PH
+        Name => 'GooglePlusUploadCode',
+        Format => 'int8u',
+        Count => -1,
+    },
     0x9101 => {
         Name => 'ComponentsConfiguration',
         Format => 'int8u',

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/FLIR.pm

@@ -1310,7 +1310,7 @@ sub ProcessMeasInfo($$$)
         my $pre = 'Meas' . $i;
         $et->VerboseDir("MeasInfo $i", undef, $recLen);
         if ($verbose > 2) {
-            Image::ExifTool::HexDump($dataPt, $recLen,
+            HexDump($dataPt, $recLen,
                 Start=>$pos, Prefix=>$$et{INDENT}, DataPos=>$dataPos);
         }
         my $coordLen = Get16u($dataPt, $pos+4);
@@ -1445,7 +1445,7 @@ sub ProcessFLIR($$;$)
         } elsif ($verbose > 2) {
             my %parms = ( DataPos => $recPos, Prefix => $$et{INDENT} );
             $parms{MaxLen} = 96 if $verbose < 4;
-            Image::ExifTool::HexDump(\$rec, $recLen, %parms);
+            HexDump(\$rec, $recLen, %parms);
         }
     }
     delete $$et{SET_GROUP0};

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/FlashPix.pm

@@ -19,7 +19,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::ASF;   # for GetGUID()
 
-$VERSION = '1.24';
+$VERSION = '1.25';
 
 sub ProcessFPX($$);
 sub ProcessFPXR($$$);
@@ -298,7 +298,8 @@ my %fpxFileType = (
         "file allocation table" (FAT).  No wonder this image format never became
         popular.  However, some of the structures used in FlashPix streams are part
         of the EXIF specification, and are still being used in the APP2 FPXR segment
-        of JPEG images by some digital cameras from various manufacturers.
+        of JPEG images by some digital cameras from manufacturers such as FujiFilm,
+        Hewlett-Packard, Kodak and Sanyo.
 
         ExifTool extracts FlashPix information from both FPX images and the APP2
         FPXR segment of JPEG images.  As well, FlashPix information is extracted
@@ -1693,11 +1694,11 @@ sub ProcessFPX($$)
     }
     if ($verbose) {
         print $out "  FAT [",length($fat)," bytes]:\n";
-        Image::ExifTool::HexDump(\$fat, undef, %dumpParms) if $verbose > 2;
+        HexDump(\$fat, undef, %dumpParms) if $verbose > 2;
         print $out "  Mini-FAT [",length($miniFat)," bytes]:\n";
-        Image::ExifTool::HexDump(\$miniFat, undef, %dumpParms) if $verbose > 2;
+        HexDump(\$miniFat, undef, %dumpParms) if $verbose > 2;
         print $out "  Directory [",length($dir)," bytes]:\n";
-        Image::ExifTool::HexDump(\$dir, undef, %dumpParms) if $verbose > 2;
+        HexDump(\$dir, undef, %dumpParms) if $verbose > 2;
     }
 #
 # process the directory

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/GIF.pm

@@ -276,7 +276,7 @@ Block:
             while ($length) {
                 last unless $raf->Read($buff, $length) == $length;
                 if ($verbose > 2 and not $outfile) {
-                    Image::ExifTool::HexDump(\$buff, undef, Out => $out);
+                    HexDump(\$buff, undef, Out => $out);
                 }
                 # add buffer to comment string
                 $comment .= $buff;

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/H264.pm

@@ -1033,7 +1033,7 @@ sub ParseH264Video($$)
             printf $out "  NAL Unit Type: 0x%x (%d bytes)\n",$nal_unit_type, length $buff;
             my %parms = ( Out => $out );
             $parms{MaxLen} = 96 if $verbose < 4;
-            Image::ExifTool::HexDump(\$buff, undef, %parms) if $verbose > 2;
+            HexDump(\$buff, undef, %parms) if $verbose > 2;
         }
         pos($$dataPt) = $pos = $nextPos;
 

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/ID3.pm

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -1471,7 +1471,9 @@ sub ProcessMP3($$)
             } else {
                 # look for audio frame sync in first $scanLen bytes
                 # (set MP3 flag to 1 so this will fail unless layer 3 audio)
-                $rtnVal = 1 if Image::ExifTool::MPEG::ParseMPEGAudio($et, \$buff, 1);
+                my $ext = $$et{FILE_EXT} || '';
+                my $mp3 = ($ext eq 'MUS') ? 0 : 1;  # MUS files are MP2
+                $rtnVal = 1 if Image::ExifTool::MPEG::ParseMPEGAudio($et, \$buff, $mp3);
             }
         }
     }

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/InDesign.pm

@@ -109,7 +109,7 @@ sub ProcessIND($$)
                 my %parms = (Addr => $raf->Tell());
                 $parms{MaxLen} = $verbose > 3 ? 1024 : 96 if $verbose < 5;
                 $raf->Seek(-$raf->Read($buff, $len2), 1) or $err = 1;
-                Image::ExifTool::HexDump(\$buff, undef, %parms);
+                HexDump(\$buff, undef, %parms);
             }
         }
         # check for XMP if stream data is long enough

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/JPEG.pm

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 sub ProcessOcad($$$);
 sub ProcessJPEG_HDR($$$);
@@ -220,6 +220,10 @@ sub ProcessJPEG_HDR($$$);
             $$valPt =~ /~\0\x04\0zmie~\0\0\x0a.{8}[\x10\x18]\x08$/s
         },
         SubDirectory => { TagTable => 'Image::ExifTool::MIE::Main' },
+      }, {
+        Name => 'Samsung',
+        Condition => '$$valPt =~ /QDIOBS$/',
+        SubDirectory => { TagTable => 'Image::ExifTool::Samsung::Trailer' },
       }, {
         Name => 'PreviewImage',
         Condition => '$$valPt =~ /^\xff\xd8\xff/',

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/Kodak.pm

@@ -8,6 +8,7 @@
 # References:   1) http://search.cpan.org/dist/Image-MetaData-JPEG/
 #               2) http://www.ozhiker.com/electronics/pjmt/jpeg_info/meta.html
 #               3) http://www.cybercom.net/~dcoffin/dcraw/
+#               4) Iliah Borg private communication (LibRaw)
 #
 # Notes:        There really isn't much public information about Kodak formats.
 #               The only source I could find was Image::MetaData::JPEG, which
@@ -23,7 +24,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.35';
+$VERSION = '1.36';
 
 sub ProcessKodakIFD($$$);
 sub ProcessKodakText($$$);
@@ -1382,6 +1383,12 @@ my %sceneModeUsed = (
         Name => 'ColorTemperature',
         Writable => 'int16u',
     },
+    0x0848 => 'WB_RGBLevelsDaylight', #4
+    0x0849 => 'WB_RGBLevelsTungsten', #4
+    0x084a => 'WB_RGBLevelsFluorescent', #4
+    0x084b => 'WB_RGBLevelsFlash', #4
+    0x084c => 'WB_RGBLevelsCustom', #4
+    0x084d => 'WB_RGBLevelsAuto', #4
     0x0852 => 'WB_RGBMul0', #3
     0x0853 => 'WB_RGBMul1', #3
     0x0854 => 'WB_RGBMul2', #3
@@ -1392,6 +1399,11 @@ my %sceneModeUsed = (
     0x085f => { Name => 'WB_RGBCoeffs3', Binary => 1 }, #3
     # 0x090d: linear table (ref 3)
     # 0x0c81: some sort of date (manufacture date?) - PH
+    # 0x089d => "real" (analogue) ISO values (ref 4)
+    # 0x089e => true analogue ISO used at capture (ref 4)
+    # 0x089f => ISO calibration gain (ref 4)
+    # 0x08a0 => ISO calibration gain table (ref 4)
+    # 0x08a1 => exposure headroom coefficient (ref 4)
     0x0ce5 => { Name => 'FirmwareVersion',  Writable => 'string' },
     # 0x1390: value: "DCSProSLRn" (tone curve name?) - PH
     0x1391 => { Name => 'ToneCurveFileName',Writable => 'string' },

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/Lytro.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub ExtractTags($$$);
 
@@ -117,8 +117,9 @@ sub ExtractTags($$$)
                 $tagInfo{Groups} = { 2 => 'Image' } unless $name =~ s/^Devices//;
                 $tagInfo{List} = 1 if ref $$meta{$key} eq 'ARRAY';
                 $tagInfo{Name} = $name;
-                $et->VPrint(0, "  [adding $tag as $name]\n");
-                Image::ExifTool::AddTagToTable($tagTablePtr, $tag, \%tagInfo);
+                my $str = $tag eq $name ? '' : " as $name";
+                $et->VPrint(0, "  [adding $tag$str]\n");
+                AddTagToTable($tagTablePtr, $tag, \%tagInfo);
             }
             $et->HandleTag($tagTablePtr, $tag, $val);
         }
@@ -134,12 +135,16 @@ sub ProcessLFP($$)
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
     my $verbose = $et->Options('Verbose');
-    my ($buff, $id);
+    my ($buff, $id, %dumpParms);
 
     # validate the Lytro file header
     return 0 unless $raf->Read($buff, 16) == 16 and $buff =~ /^\x89LFP\x0d\x0a\x1a\x0a/;
     $et->SetFileType();   # set the FileType tag
     SetByteOrder('MM');
+    if ($verbose > 2) {
+        %dumpParms = ( Out => $$et{OPTIONS}{TextOut} );
+        $dumpParms{MaxLen} = 128 if $verbose < 4;
+    }
     my $tagTablePtr = GetTagTable('Image::ExifTool::Lytro::Main');
     while ($raf->Read($buff, 16) == 16) {
         $buff =~ /^\x89LF/ or $et->Warn('LFP format error'), last;
@@ -154,6 +159,7 @@ sub ProcessLFP($$)
             $raf->Seek($size, 1) or $et->Warn('Seek error in LFP file'), last;
         } else {
             $raf->Read($buff,$size) == $size or $et->Warn('Truncated LFP data'), last;
+            HexDump(\$buff, undef, %dumpParms, Addr=>$raf->Tell()-$size) if $verbose > 2;
             if ($buff =~ /^\{\s+"/) { # JSON metadata?
                 pos($buff) = 0;
                 $et->HandleTag($tagTablePtr, 'JSONMetadata', $buff);