exiftool_vendored 10.01.0 → 10.04.0

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/NikonCapture.pm

@@ -724,7 +724,7 @@ sub WriteNikonCapture($$$)
     my $tagID = Get32u($dataPt, $dirStart);
     # sometimes size includes 18 header bytes, and other times it doesn't (eg. ViewNX 2.1.1)
     my $size = Get32u($dataPt, $dirStart + 18);
-    my $pad = $dirLen - $size - 18; 
+    my $pad = $dirLen - $size - 18;
     unless ($tagID == 0x7a86a940 and ($pad >= 0 or $pad == -18)) {
         $et->Warn('Unrecognized Nikon Capture Data header');
         return undef;

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/NikonCustom.pm

@@ -3167,7 +3167,7 @@ $VERSION = '1.12';
             0x40 => 'Release + Focus',
             0x80 => 'Focus',
         },
-    }, 
+    },
     1.2 => { # CSa2
         Name => 'AF-SPrioritySelection',
         Mask => 0x20,
@@ -3362,7 +3362,7 @@ $VERSION = '1.12';
             0x08 => '1 EV',
         },
     },
-    8.1 => { # CSb6 
+    8.1 => { # CSb6
         Name => 'CenterWeightedAreaSize',
         Mask => 0xe0,
         PrintConv => {
@@ -3374,7 +3374,7 @@ $VERSION = '1.12';
         },
     },
     8.2 => { # CSb7-a
-        Name => 'FineTuneOptMatrixMetering',  
+        Name => 'FineTuneOptMatrixMetering',
         Mask => 0x0f,
         ValueConv => '($val > 0x7 ? $val - 0x10 : $val) / 6',
         ValueConvInv => 'int($val*6+($val>0?0.5:-0.5)) & 0x0f',
@@ -3397,7 +3397,7 @@ $VERSION = '1.12';
         PrintConv => '$val ? sprintf("%+.2f", $val) : 0',
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
     },
-    10.1 => { # CSf2-a                  
+    10.1 => { # CSf2-a
         Name => 'MultiSelectorShootMode',
         Mask => 0xc0,
         PrintConv => {
@@ -3762,7 +3762,7 @@ $VERSION = '1.12';
             0xa0 => '10 min',
         },
     },
-    37.1 => { # CSf2-c 
+    37.1 => { # CSf2-c
         Name => 'MultiSelectorLiveView',
         Mask => 0xc0,
         PrintConv => {
@@ -3846,7 +3846,7 @@ $VERSION = '1.12';
             3 => 'One Step Speed / Aperture',
             4 => 'Choose Non-CPU Lens Number',
             5 => 'Active D-Lighting',
-            8 => 'Exposure Delay Mode',     
+            8 => 'Exposure Delay Mode',
         },
     },
     43.1 => { # CSf5-b
@@ -3859,7 +3859,7 @@ $VERSION = '1.12';
             3 => 'One Step Speed / Aperture',
             4 => 'Choose Non-CPU Lens Number',
             5 => 'Active D-Lighting',
-            8 => 'Exposure Delay Mode', 
+            8 => 'Exposure Delay Mode',
         },
     },
     44.1 => { # CSf6-b
@@ -3870,7 +3870,7 @@ $VERSION = '1.12';
             1 => 'Choose Image Area (FX/DX/5:4)',
             2 => 'Shutter Speed & Aperture Lock',
             4 => 'Choose Non-CPU Lens Number',
-            8 => 'Exposure Delay Mode',     
+            8 => 'Exposure Delay Mode',
         },
     },
     45.1 => { # CSf13
@@ -3880,7 +3880,7 @@ $VERSION = '1.12';
             0 => 'None',
             1 => 'Choose Image Area (FX/DX/5:4)',
             2 => 'Shutter Speed & Aperture Lock',
-            9 => 'White Balance',   
+            9 => 'White Balance',
             10 => 'ISO Sensitivity',
         },
     },
@@ -3908,7 +3908,7 @@ $VERSION = '1.12';
             0x40 => 'On During Manual Focusing',
         },
     },
-    47.3 => { # CSa9 
+    47.3 => { # CSa9
         Name => 'StoreByOrientation',
         Mask => 0x18,
         PrintConv => {

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/OOXML.pm

@@ -63,10 +63,10 @@ my @vectorVals;
         directory.
 
         B<Tips:>
-        
+
         1) Structural ZIP tags may be ignored (if desired) with C<--ZIP:all> on the
         command line.
-        
+
         2) Tags may be grouped by their document number in the ZIP archive with the
         C<-g3> or C<-G3> option.
     },
@@ -134,7 +134,7 @@ my @vectorVals;
     Matter      => { },
     MMClips     => { },
     modified    => {
-        Name => 'ModifyDate', 
+        Name => 'ModifyDate',
         Groups => { 2 => 'Time' },
         Format => 'date',
         PrintConv => '$self->ConvertDateTime($val)',

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/PDF.pm

@@ -1242,7 +1242,7 @@ sub DecodeStream($$)
                 } elsif ($$decodeParms{EarlyChange}) {
                     $et->WarnOnce("LZWDecode EarlyChange currently not supported");
                     return 0;
-                }                    
+                }
             }
             unless (DecodeLZW(\$$dict{_stream})) {
                 $et->WarnOnce('LZW decompress error');

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/PNG.pm

@@ -26,7 +26,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.34';
+$VERSION = '1.35';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -80,6 +80,12 @@ $Image::ExifTool::PNG::colorType = -1;
         Tags extracted from PNG images.  See
         L<http://www.libpng.org/pub/png/spec/1.2/> for the official PNG 1.2
         specification.
+
+        According to the specification, a PNG file should end at the IEND chunk,
+        however ExifTool will preserve any data found after this when writing unless
+        it is specifically deleted with -Trailer:All=.  When reading, a minor
+        warning is issued if this trailer exists, and ExifTool will attempt to parse
+        this data as additional PNG chunks.
     },
     bKGD => {
         Name => 'BackgroundColor',
@@ -999,7 +1005,7 @@ sub ProcessPNG($$)
     my $datChunk = '';
     my $datCount = 0;
     my $datBytes = 0;
-    my ($sig, $err, $ok);
+    my ($sig, $err);
 
     # check to be sure this is a valid PNG/MNG/JNG image
     return 0 unless $raf->Read($sig,8) == 8 and $pngLookup{$sig};
@@ -1033,14 +1039,26 @@ sub ProcessPNG($$)
     }
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
-    my ($hbuf, $dbuf, $cbuf, $foundHdr);
+    my ($hbuf, $dbuf, $cbuf, $wasHdr, $wasEnd);
 
     # process the PNG/MNG/JNG chunks
     undef $noCompressLib;
     for (;;) {
-        $raf->Read($hbuf,8) == 8 or $et->Warn("Truncated $fileType image"), last;
+        my $n = $raf->Read($hbuf,8);
+        if ($wasEnd) {
+            last unless $n; # stop now if normal end of PNG
+            $et->WarnOnce("Trailer data after $fileType $endChunk chunk", 1);
+            last if $n < 8;
+            $$et{SET_GROUP1} = 'Trailer';
+        } elsif ($n != 8) {
+            $et->Warn("Truncated $fileType image") unless $wasEnd;
+            last;
+        }
         my ($len, $chunk) = unpack('Na4',$hbuf);
-        $len > 0x7fffffff and $et->Warn("Invalid $fileType box size"), last;
+        if ($len > 0x7fffffff) {
+            $et->Warn("Invalid $fileType chunk size") unless $wasEnd;
+            last;
+        }
         if ($verbose) {
             # don't dump image data chunks in verbose mode (only give count instead)
             if ($datCount and $chunk ne $datChunk) {
@@ -1056,8 +1074,8 @@ sub ProcessPNG($$)
             }
         }
         if ($outfile) {
-            if ($chunk eq 'IEND') {
-                # add any new chunks immediately before the IEND chunk
+            if ($chunk eq $endChunk) {
+                # add any new chunks immediately before the IEND/MEND chunk
                 AddChunks($et, $outfile) or $err = 1;
             } elsif ($chunk eq 'PLTE' or $chunk eq 'IDAT') {
                 if ($chunk eq 'IDAT') {
@@ -1072,27 +1090,45 @@ sub ProcessPNG($$)
             }
         }
         if ($chunk eq $endChunk) {
+            # read CRC
+            unless ($raf->Read($cbuf,4) == 4) {
+                $et->Warn("Truncated $fileType $endChunk chunk") unless $wasEnd;
+                last;
+            }
+            $verbose and print $out "$fileType $chunk (end of image)\n";
+            $wasEnd = 1;
             if ($outfile) {
-                # copy over the rest of the file if necessary
-                Write($outfile, $hbuf) or $err = 1;
-                while ($raf->Read($hbuf, 65536)) {
-                    Write($outfile, $hbuf) or $err = 1;
+                # write the IEND/MEND chunk with CRC
+                Write($outfile, $hbuf, $cbuf) or $err = 1;
+                if ($$et{DEL_GROUP}{Trailer}) {
+                    if ($raf->Read($hbuf, 1)) {
+                        $verbose and printf $out "  Deleting PNG trailer\n";
+                        ++$$et{CHANGED};
+                    }
+                } else {
+                    # copy over any existing trailer data
+                    my $tot = 0;
+                    for (;;) {
+                        $n = $raf->Read($hbuf, 65536) or last;
+                        $tot += $n;
+                        Write($outfile, $hbuf) or $err = 1;
+                    }
+                    $tot and $verbose and printf $out "  Copying PNG trailer ($tot bytes)\n";
                 }
+                last;
             }
-            $verbose and print $out "$fileType $chunk (end of image)\n";
-            $ok = 1;
-            last;
+            next;
         }
         # set FoundIDAT flag: 1=after IDAT, 2=after IDAT and warn about late XMP
         $$et{FoundIDAT} = $earlyXMP ? 2 : 1 if $chunk eq 'IDAT';
         # read chunk data and CRC
         unless ($raf->Read($dbuf,$len)==$len and $raf->Read($cbuf, 4)==4) {
-            $et->Warn("Corrupted $fileType image");
+            $et->Warn("Corrupted $fileType image") unless $wasEnd;
             last;
         }
-        unless ($foundHdr) {
+        unless ($wasHdr) {
             if ($chunk eq $hdrChunk) {
-                $foundHdr = 1;
+                $wasHdr = 1;
             } elsif ($hdrChunk eq 'IHDR' and $chunk eq 'CgBI') {
                 $et->Warn('Non-standard PNG image (Apple iPhone format)');
             } else {
@@ -1104,7 +1140,7 @@ sub ProcessPNG($$)
             # check CRC when in verbose mode (since we don't care about speed)
             my $crc = CalculateCRC(\$hbuf, undef, 4);
             $crc = CalculateCRC(\$dbuf, $crc);
-            $crc == unpack('N',$cbuf) or $et->Warn("Bad CRC for $chunk chunk");
+            $crc == unpack('N',$cbuf) or $et->Warn("Bad CRC for $chunk chunk") unless $wasEnd;
             if ($datChunk) {
                 Write($outfile, $hbuf, $dbuf, $cbuf) or $err = 1 if $outfile;
                 next;
@@ -1137,7 +1173,8 @@ sub ProcessPNG($$)
             Write($outfile, $hbuf, $dbuf, $cbuf) or $err = 1;
         }
     }
-    return -1 if $outfile and ($err or not $ok);
+    delete $$et{SET_GROUP1};
+    return -1 if $outfile and ($err or not $wasEnd);
     return 1;   # this was a valid PNG/MNG/JNG image
 }
 

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Palm.pm

@@ -179,7 +179,7 @@ my %dateTimeInfo = (
     103 => 'Description',
     104 => 'ISBN',
     105 => { Name => 'Subject', List => 1 },
-    106 => { 
+    106 => {
         Name => 'PublishDate',
         Groups => { 2 => 'Time' },
         ValueConv => q{

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/PanasonicRaw.pm

@@ -108,19 +108,19 @@ my %wbTypeInfo = (
     },
     # 0x18,0x19,0x1a: 0
     0x18 => { #4
-        Name => 'HighISOMultiplierRed', 
+        Name => 'HighISOMultiplierRed',
         Writable => 'int16u',
         ValueConv => '$val / 256',
         ValueConvInv => 'int($val * 256 + 0.5)',
     },
     0x19 => { #4
-        Name => 'HighISOMultiplierGreen', 
+        Name => 'HighISOMultiplierGreen',
         Writable => 'int16u',
         ValueConv => '$val / 256',
         ValueConvInv => 'int($val * 256 + 0.5)',
     },
     0x1a => { #4
-        Name => 'HighISOMultiplierBlue', 
+        Name => 'HighISOMultiplierBlue',
         Writable => 'int16u',
         ValueConv => '$val / 256',
         ValueConvInv => 'int($val * 256 + 0.5)',
@@ -167,6 +167,10 @@ my %wbTypeInfo = (
             ProcessProc => \&ProcessJpgFromRaw,
         },
     },
+    0x2f => { Name => 'CropTop',    Writable => 'int16u' },
+    0x30 => { Name => 'CropLeft',   Writable => 'int16u' },
+    0x31 => { Name => 'CropBottom', Writable => 'int16u' },
+    0x32 => { Name => 'CropRight',  Writable => 'int16u' },
     0x10f => {
         Name => 'Make',
         Groups => { 2 => 'Camera' },

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Pentax.pm

@@ -56,7 +56,7 @@ use vars qw($VERSION %pentaxLensTypes);
 use Image::ExifTool::Exif;
 use Image::ExifTool::HP;
 
-$VERSION = '2.94';
+$VERSION = '2.96';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -316,6 +316,7 @@ sub PrintFilter($$$);
     '8 30' => 'Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary', #27
     '8 31' => 'Sigma 18-35mm F1.8 DC HSM', #27
     '8 32' => 'Sigma 30mm F1.4 DC HSM | A', #27
+    '8 34' => 'Sigma 18-300mm F3.5-6.3 DC Macro HSM', #25
     '8 59' => 'HD PENTAX-D FA 150-450mm F4.5-5.6 ED DC AW', #29
     '8 60' => 'HD PENTAX-D FA* 70-200mm F2.8 ED DC AW', #29
     '8 198' => 'smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE', #29
@@ -1997,7 +1998,7 @@ my %binaryDataAttrs = (
         ValueConv => \&CryptShutterCount,
         ValueConvInv => '$val',
     },
-    # 0x005e - 
+    # 0x005e -
     0x0060 => { #PH (K-5)
         Name => 'FaceInfo',
         Format => 'undef', # (written as int8u)
@@ -3786,6 +3787,11 @@ my %binaryDataAttrs = (
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
     },
+    3 => { #PH
+        Name => 'ExtenderStatus',
+        Notes => 'not valid if a non-AF lens is used',
+        PrintConv => { 0 => 'Not attached', 1 => 'Attached' },
+    },
     # this is a binaryData table because some cameras add an extra
     # byte or two here (typically zeros)...
 );
@@ -4009,7 +4015,7 @@ my %binaryDataAttrs = (
         Mask => 0xf8,
         PrintConv => {
             0x00 => '0.13-0.19 m',  # (plus K or M lenses)
-            0x08 => '0.20-0.24 m', 
+            0x08 => '0.20-0.24 m',
             0x10 => '0.25-0.28 m',
             0x18 => '0.28-0.30 m',
             0x20 => '0.35-0.38 m',
@@ -4603,6 +4609,12 @@ my %binaryDataAttrs = (
             20 => 'Mid-right',
         },
     },
+    0x1fd => {
+        Name => 'AFHold',
+        Notes => 'decoded only for the K-3 II',
+        Condition => '$$self{Model} eq "PENTAX K-3 II"',
+        PrintConv => { 0 => 'Off', 1 => 'Short', 2 => 'Medium', 3 => 'Long' },
+    },
 );
 
 # Kelvin white balance information (ref 28, topic 4834)

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/PhaseOne.pm

@@ -492,7 +492,7 @@ sub ProcessPhaseOne($$$)
                         $formatStr = 'float';
                         $value = ReadValue($dataPt,$valuePtr,$formatStr,$count,$size);
                     }
-                }                    
+                }
             }
         }
         my %parms = (

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/PhotoMechanic.pm

@@ -191,7 +191,7 @@ sub ProcessPhotoMechanic($$)
             $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
         } elsif ($$et{DEL_GROUP}{PhotoMechanic}) {
             # delete the trailer
-            $verbose and printf $out "  Deleting PhotoMechanic trailer\n";
+            $verbose and print $out "  Deleting PhotoMechanic trailer\n";
             ++$$et{CHANGED};
         } else {
             # rewrite the trailer

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Qualcomm.pm

@@ -1248,7 +1248,7 @@ sub MakeNameAndDesc($$)
     # convert underlines to spaces in description
     if ($desc =~ tr/_/ /) {
         # remove unnecessary underlines from tag name...
-        s/_([A-Z][a-z])/$1/g; 
+        s/_([A-Z][a-z])/$1/g;
         s/([a-z0-9])_([A-Z])/$1$2/g;
         s/([A-Za-z])_(\d)/$1$2/g;
     }

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/QuickTime.pm

@@ -41,7 +41,7 @@ use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.91';
+$VERSION = '1.92';
 
 sub FixWrongFormat($);
 sub ProcessMOV($$;$);
@@ -2146,11 +2146,11 @@ my %graphicsMode = (
             1114 => 'Music|Jazz|Smooth Jazz',
             1115 => 'Music|Latino|Latin Jazz',
             1116 => 'Music|Latino|Contemporary Latin',
-            1117 => 'Music|Latino|Pop in Spanish',
+            1117 => 'Music|Latino|Latin Pop',
             1118 => 'Music|Latino|Raices', # (Raíces)
             1119 => 'Music|Latino|Latin Urban',
             1120 => 'Music|Latino|Baladas y Boleros',
-            1121 => 'Music|Latino|Alternative & Rock in Spanish',
+            1121 => 'Music|Latino|Latin Alternative & Rock',
             1122 => 'Music|Brazilian',
             1123 => 'Music|Latino|Regional Mexicano',
             1124 => 'Music|Latino|Salsa y Tropical',
@@ -3240,7 +3240,7 @@ my %graphicsMode = (
             10055 => 'Books|Mysteries & Thrillers|Women Sleuths',
             10056 => 'Books|Romance|Erotic Romance',
             10057 => 'Books|Romance|Contemporary',
-            10058 => 'Books|Romance|Fantasy, Futuristic & Ghost',
+            10058 => 'Books|Romance|Paranormal',
             10059 => 'Books|Romance|Historical',
             10060 => 'Books|Romance|Short Stories',
             10061 => 'Books|Romance|Suspense',
@@ -3372,7 +3372,6 @@ my %graphicsMode = (
             11038 => 'Books|Biographies & Memoirs|Sports',
             11039 => 'Books|Biographies & Memoirs|Women',
             11040 => 'Books|Romance|New Adult',
-            11041 => 'Books|Romance|Paranormal',
             11042 => 'Books|Romance|Romantic Comedy',
             11043 => 'Books|Romance|Gay & Lesbian',
             11044 => 'Books|Fiction & Literature|Essays',
@@ -3560,7 +3559,6 @@ my %graphicsMode = (
             11227 => 'Books|Communications & Media',
             11228 => 'Books|Military & Warfare',
             11229 => 'Books|Romance|Inspirational',
-            11230 => 'Books|Romance|Boxed Sets',
             11231 => 'Books|Romance|Holiday',
             11232 => 'Books|Romance|Wholesome',
             11233 => 'Books|Romance|Military',
@@ -3632,6 +3630,11 @@ my %graphicsMode = (
             11334 => 'Books|Professional & Technical|Engineering|Environmental Engineering',
             11335 => 'Books|Professional & Technical|Engineering|Mechanical Engineering',
             11336 => 'Books|Professional & Technical|Engineering|Power Resources',
+            11337 => 'Books|Comics & Graphic Novels|Manga|Boys',
+            11338 => 'Books|Comics & Graphic Novels|Manga|Men',
+            11339 => 'Books|Comics & Graphic Novels|Manga|Girls',
+            11340 => 'Books|Comics & Graphic Novels|Manga|Women',
+            11341 => 'Books|Comics & Graphic Novels|Manga|Other',
             12001 => 'Mac App Store|Business',
             12002 => 'Mac App Store|Developer Tools',
             12003 => 'Mac App Store|Education',
@@ -3914,8 +3917,8 @@ my %graphicsMode = (
             15211 => 'Textbooks|Religion & Spirituality|Spirituality',
             15212 => 'Textbooks|Romance',
             15213 => 'Textbooks|Romance|Contemporary',
-            15214 => 'Textbooks|Romance|Erotica',
-            15215 => 'Textbooks|Romance|Fantasy, Futuristic & Ghost',
+            15214 => 'Textbooks|Romance|Erotic Romance',
+            15215 => 'Textbooks|Romance|Paranormal',
             15216 => 'Textbooks|Romance|Historical',
             15217 => 'Textbooks|Romance|Short Stories',
             15218 => 'Textbooks|Romance|Suspense',
@@ -4258,6 +4261,7 @@ my %graphicsMode = (
             50000087 => 'Books|Comics & Graphic Novels|Manga|Sports',
             50000088 => 'Books|Fiction & Literature|Light Novels',
             50000089 => 'Books|Comics & Graphic Novels|Manga|Horror',
+            50000090 => 'Books|Comics & Graphic Novels|Comics',
         },
     },
     grup => 'Grouping', #10
@@ -6054,7 +6058,7 @@ sub ProcessKeys($$$)
         if ($newInfo) {
             $msg or $msg = '';
             AddTagToTable($infoTable, $id, $newInfo);
-            $out and printf $out "$$et{INDENT}Added ItemList Tag $id = $tag$msg\n";
+            $out and print $out "$$et{INDENT}Added ItemList Tag $id = $tag$msg\n";
         }
         $pos += $len;
         ++$index;