exiftool_vendored 13.04.0 → 13.08.0

data/bin/lib/Image/ExifTool/README

@@ -209,7 +209,7 @@ key:
                   name documentation.  When this is set, numerical TagID's are
                   not converted to hexadecimal notation.  Unless otherwise set,
                   an ID_LABEL of "Index" is assumed for tables which use
-                  ProcessBinaryData.
+                  ProcessBinaryData or set the IS_BINARY flag.
 
     NO_ID         Avoid printing "Tag ID" column in tag name documentation.
 
@@ -257,6 +257,9 @@ key:
     ALLOW_REPROCESS Flag to allow reprocessing of another directory at this
                   same location in the file, bypassing recursion avoidance test.
 
+    IS_BINARY     Set if this is a binary table and should show an Index in the
+                  first column instead of a Tag ID.
+
   DATAMEMBER : BinaryData tables only.  A reference to a list of sorted tag ID's
   which must be extracted as data members when writing.  Must also list "var_"
   format tags and tags with Hook so offsets are properly calculated if the table

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

@@ -1126,7 +1126,7 @@ my %code2charset = (
             Name => 'TextFormat',
             Condition => '$$self{RIFFStreamType} eq "txts"',
             Hidden => 1,
-            RawConv => '$self->Options("ExtractEmbedded") or $self->WarnOnce("Use ExtractEmbedded option to extract timed text",3); undef',
+            RawConv => '$self->Options("ExtractEmbedded") or $self->Warn("Use ExtractEmbedded option to extract timed text",3); undef',
         },
     ],
 );
@@ -2053,7 +2053,7 @@ sub ProcessRIFF($$)
                     last;
                 }
                 if ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Processing large chunk (LargeFileSupport is 2)');
+                    $et->Warn('Processing large chunk (LargeFileSupport is 2)');
                 }
             }
             if ($validate) {
@@ -2176,7 +2176,7 @@ sub ProcessRIFF($$)
                         last;
                     }
                     if ($et->Options('LargeFileSupport') eq '2') {
-                        $et->WarnOnce('Processing large chunk (LargeFileSupport is 2)');
+                        $et->Warn('Processing large chunk (LargeFileSupport is 2)');
                     }
                 }
                 if ($validate and $len2) {

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

@@ -182,7 +182,7 @@ sub UnescapeRTF($$$)
                 $skip = $2;
             } elsif ($1 eq 'u') {   # \uN
                 if ($2 < 0) {
-                    $et->WarnOnce('Invalid Unicode character(s) in text');
+                    $et->Warn('Invalid Unicode character(s) in text');
                     $rtnVal .= '?';
                 } else {
                     require Image::ExifTool::Charset;

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

@@ -1008,7 +1008,7 @@ sub ProcessRicohRDT($$$)
     return 0 if $dirLen < 16;
     my $ee = $et->Options('ExtractEmbedded');
     unless ($ee) {
-        $et->WarnOnce('Use ExtractEmbedded option to read Ricoh real-time metadata',3);
+        $et->Warn('Use ExtractEmbedded option to read Ricoh real-time metadata',3);
         return 1;
     }
     my $endian = substr($$dataPt, 8, 2);
@@ -1017,11 +1017,11 @@ sub ProcessRicohRDT($$$)
     my $len = Get16u($dataPt, 6);
     if ($dirName eq 'RicohRDTG') {
         if ($ee < 2) {
-            $et->WarnOnce('Set ExtractEmbedded option to 2 or higher to extract frame timestamps',3);
+            $et->Warn('Set ExtractEmbedded option to 2 or higher to extract frame timestamps',3);
             return 1;
         }
         $rdtg = 0;
-        $et->WarnOnce('Unexpected RDTG record length') if $len > 8;
+        $et->Warn('Unexpected RDTG record length') if $len > 8;
     }
     if ($count * $len + 16 > $dirLen) {
         $et->Warn("Truncated $dirName data");

data/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.70';
+$VERSION = '3.71';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -2166,6 +2166,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             397 => 'ILCE-7CM2', #JR
             398 => 'ILX-LR1', #JR
             399 => 'ZV-E10M2', #JR
+            400 => 'ILCE-1M2', #PH
         },
     },
     0xb020 => { #2
@@ -11376,7 +11377,7 @@ sub ProcessEnciphered($$$)
     Decipher(\$data);
     if ($$et{DoubleCipher}) {
         Decipher(\$data);
-        $et->WarnOnce('Some Sony metadata is double-enciphered. Write any tag to fix',1);
+        $et->Warn('Some Sony metadata is double-enciphered. Write any tag to fix',1);
     }
     if ($et->Options('Verbose') > 2) {
         my $tagInfo = $$dirInfo{TagInfo} || { Name => 'data' };
@@ -11408,7 +11409,7 @@ sub WriteEnciphered($$$)
     if ($$et{DoubleCipher}) {
         Decipher(\$data);
         ++$$et{CHANGED};
-        $et->WarnOnce('Fixed double-enciphered Sony metadata',1);
+        $et->Warn('Fixed double-enciphered Sony metadata',1);
     }
     my %dirInfo = (
         %$dirInfo,

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

@@ -15,7 +15,7 @@ use vars qw($VERSION @ISA $makeMissing);
 use Image::ExifTool qw(:Utils :Vars);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.36';
+$VERSION = '1.37';
 @ISA = qw(Exporter);
 
 # set this to a language code to generate Lang module with 'MISSING' entries
@@ -158,6 +158,7 @@ PTILoop:    for ($index=0; $index<@infoArray; ++$index) {
                 my $writable = $format ? 'true' : 'false';
                 # check our conversions to make sure we can really write this tag
                 if ($writable eq 'true') {
+                    $writable = 'false' if defined $$tagInfo{Writable} and not $$tagInfo{Writable};
                     foreach ('PrintConv','ValueConv') {
                         next unless $$tagInfo{$_};
                         next if $$tagInfo{$_ . 'Inv'};
@@ -167,7 +168,7 @@ PTILoop:    for ($index=0; $index<@infoArray; ++$index) {
                         last;
                     }
                 }
-                $format = $$tagInfo{Format} || $$table{FORMAT} if not defined $format or $format eq '1';
+                $format = $$tagInfo{Format} || $$table{FORMAT} if not $format or $format eq '1';
                 $format = 'struct' if $$tagInfo{Struct};
                 if (defined $format) {
                     $format =~ s/\[.*\$.*\]//;   # remove expressions from format
@@ -258,7 +259,7 @@ PTILoop:    for ($index=0; $index<@infoArray; ++$index) {
                     # add bitmask values to main lookup
                     if ($$conv{BITMASK}) {
                         foreach $key (keys %{$$conv{BITMASK}}) {
-                            my $mask = 0x01 << $key;
+                            my $mask = "Bit$key";
                             next if not $mask or $$conv{$mask};
                             $$conv{$mask} = $$conv{BITMASK}{$key};
                         }