exiftool_vendored 9.71.0 → 9.78.0

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/DICOM.pm

@@ -20,7 +20,7 @@ use strict;
 use vars qw($VERSION %uid);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.18';
+$VERSION = '1.19';
 
 # DICOM VR (Value Representation) format conversions
 my %dicomFormat = (
@@ -3568,7 +3568,7 @@ my %implicitVR = (
 # Extract information from a DICOM (DCM) image
 # Inputs: 0) ExifTool object reference, 1) DirInfo reference
 # Returns: 1 on success, 0 if this wasn't a valid DICOM file
-sub ProcessDICM($$)
+sub ProcessDICOM($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};

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

@@ -39,6 +39,7 @@
 #              26) Jeremy Brown private communication
 #              27) Gregg Lee private communication
 #              28) http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/devnet/cinemadng/pdfs/CinemaDNG_Format_Specification_v1_1.pdf
+#              29) http://www.libtiff.org
 #              JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
 
@@ -51,7 +52,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.66';
+$VERSION = '3.68';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -205,6 +206,7 @@ sub BINARY_DATA_LIMIT { return 10 * 1024 * 1024; }
     32769 => 'Packed RAW', #PH (used by Epson, Nikon, Samsung)
     32770 => 'Samsung SRW Compressed', #PH
     32771 => 'CCIRLEW', #3
+    32772 => 'Samsung SRW Compressed 2', #PH (NX3000,NXmini)
     32773 => 'PackBits',
     32809 => 'Thunderscan', #3
     32867 => 'Kodak KDC Compressed', #PH
@@ -1158,11 +1160,24 @@ my %sampleFormat = (
         Name => 'WangTag4',
         PrintConv => 'length($val) <= 64 ? $val : \$val',
     },
+    # tags 0x80b8-0x80bb are registered to Island Graphics
+    0x80b8 => 'ImageReferencePoints', #29
+    0x80b9 => 'RegionXformTackPoint', #29
+    0x80ba => 'WarpQuadrilateral', #29
+    0x80bb => 'AffineTransformMat', #29
     0x80e3 => 'Matteing', #9
     0x80e4 => 'DataType', #9
     0x80e5 => 'ImageDepth', #9
     0x80e6 => 'TileDepth', #9
-    0x827d => 'Model2',
+    # tags 0x8214-0x8219 are registered to Pixar
+    0x8214 => 'ImageFullWidth', #29
+    0x8215 => 'ImageFullHeight', #29
+    0x8216 => 'TextureFormat', #29
+    0x8217 => 'WrapModes', #29
+    0x8218 => 'FovCot', #29
+    0x8219 => 'MatrixWorldToScreen', #29
+    0x821a => 'MatrixWorldToCamera', #29
+    0x827d => 'Model2', #29 (Eastman Kodak)
     0x828d => 'CFARepeatPatternDim', #12
     0x828e => {
         Name => 'CFAPattern2', #12
@@ -1320,6 +1335,7 @@ my %sampleFormat = (
         },
     },
     0x85b8 => 'PixelMagicJBIGOptions', #20
+    0x85d7 => 'JPLCartoIFD', #exifprobe (NC)
     0x85d8 => {
         Name => 'ModelTransform',
         Groups => { 2 => 'Location' },
@@ -1417,6 +1433,7 @@ my %sampleFormat = (
         Name => 'GeoTiffAsciiParams',
         Binary => 1,
     },
+    0x87be => 'JBIGOptions', #29
     0x8822 => {
         Name => 'ExposureProgram',
         Groups => { 2 => 'Camera' },
@@ -1493,6 +1510,7 @@ my %sampleFormat = (
     0x885c => 'FaxRecvParams', #9
     0x885d => 'FaxSubAddress', #9
     0x885e => 'FaxRecvTime', #9
+    0x8871 => 'FedexEDR', #exifprobe (NC)
     0x888a => { #PH
         Name => 'LeafSubIFD',
         Format => 'int32u',     # Leaf incorrectly uses 'undef' format!
@@ -2173,6 +2191,11 @@ my %sampleFormat = (
             2 => 'Color',
         },
     },
+    # 0xc5d8 - found in CR2 images
+    # 0xc5d9 - found in CR2 images
+    # 0xc5e0 - found in CR2 images
+    0xc640 => 'CR2Slice', #exifprobe
+    0xc6c5 => { Name => 'SRawType', Description => 'SRaw Type' }, #exifprobe
 #
 # DNG tags 0xc6XX and 0xc7XX (ref 2 unless otherwise stated)
 #
@@ -3080,8 +3103,9 @@ my %sampleFormat = (
         },
         # this LensID is only valid if the LensType has a PrintConv or is a model name
         RawConv => q{
-            return $val if ref $$self{TAG_INFO}{LensType}{PrintConv} eq "HASH" or
-                              $val[0] =~ /(mm|\d\/F)/;
+            my $printConv = $$self{TAG_INFO}{LensType}{PrintConv};
+            return $val if ref $printConv eq 'HASH' or (ref $printConv eq 'ARRAY' and
+                ref $$printConv[0] eq 'HASH') or $val[0] =~ /(mm|\d\/F)/;
             return undef;
         },
         ValueConv => '$val',
@@ -3538,9 +3562,15 @@ sub PrintLensID($$@)
     # just copy LensType PrintConv value if it was a lens name
     # (Olympus or Panasonic -- just exclude things like Nikon and Leaf LensType)
     unless (ref $printConv eq 'HASH') {
-        return $lensTypePrt if $lensTypePrt =~ /mm/;
-        return $lensTypePrt if $lensTypePrt =~ s/(\d)\/F/$1mm F/;
-        return undef;
+        if (ref $printConv eq 'ARRAY' and ref $$printConv[0] eq 'HASH') {
+            $printConv = $$printConv[0];
+            $lensTypePrt =~ s/;.*//;
+            $lensType =~ s/ .*//;
+        } else {
+            return $lensTypePrt if $lensTypePrt =~ /mm/;
+            return $lensTypePrt if $lensTypePrt =~ s/(\d)\/F/$1mm F/;
+            return undef;
+        }
     }
     # get LensSpec information if available (Sony)
     my ($sf0, $lf0, $sa0, $la0);
@@ -3867,7 +3897,7 @@ sub ProcessExif($$$)
 
     # patch for Canon EOS 40D firmware 1.0.4 bug (incorrect directory counts)
     # (must do this before parsing directory or CameraSettings offset will be suspicious)
-    if ($inMakerNotes and $$et{Model} eq 'Canon EOS 40D') {
+    if ($inMakerNotes and $$et{Model} eq 'Canon EOS 40D' and $numEntries) {
         my $entry = $dirStart + 2 + 12 * ($numEntries - 1);
         my $fmt = Get16u($dataPt, $entry + 2);
         if ($fmt < 1 or $fmt > 13) {

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

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ProcessFLIR($$;$);
 sub ProcessFLIRText($$$);
@@ -1382,10 +1382,11 @@ sub ProcessFLIR($$;$)
 
     # determine byte ordering by validating version number
     # (in my samples FLIR APP1 is big-endian, FFF files are little-endian)
-    my $ver = Get32u(\$hdr, 0x14);
-    if ($ver != 100) {
-        $ver == 0x64000000 or $et->Warn("Unsupported FLIR $type version"), return 1;
+    for ($i=0; ; ++$i) {
+        my $ver = Get32u(\$hdr, 0x14);
+        last if $ver >= 100 and $ver < 200; # (have seen 100 and 101 - PH)
         ToggleByteOrder();
+        $i and $et->Warn("Unsupported FLIR $type version"), return 1;
     }
 
     # read the FLIR record directory

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/FujiFilm.pm

@@ -26,7 +26,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.45';
+$VERSION = '1.47';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -124,6 +124,7 @@ my %faceCategories = (
             0x304 => 'Living Room Warm White Fluorescent', #2/PH (S5)
             0x400 => 'Incandescent',
             0x500 => 'Flash', #4
+            0x600 => 'Underwater', #forum6109
             0xf00 => 'Custom',
             0xf01 => 'Custom2', #2
             0xf02 => 'Custom3', #2
@@ -359,6 +360,26 @@ my %faceCategories = (
     # 0x1150 - Pro Low-light - val=1; Pro Focus - val=2 (ref 7)
     # 0x1151 - Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7)
     # 0x1152 - Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7)
+    0x1201 => { #forum6109
+        Name => 'AdvancedFilter',
+        Writable => 'int32u',
+        PrintHex => 1,
+        PrintConv => {
+            0x10000 => 'Pop Color',
+            0x20000 => 'Hi Key',
+            0x30000 => 'Toy Camera',
+            0x40000 => 'Miniature',
+            0x50000 => 'Dynamic Tone',
+            0x60001 => 'Partial Color Red',
+            0x60002 => 'Partial Color Yellow',
+            0x60003 => 'Partial Color Green',
+            0x60004 => 'Partial Color Blue',
+            0x60005 => 'Partial Color Orange',
+            0x60006 => 'Partial Color Purple',
+            0x70000 => 'Soft Focus',
+            0x90000 => 'Low Key',
+        },
+    },
     0x1210 => { #2
         Name => 'ColorMode',
         Writable => 'int16u',
@@ -482,6 +503,12 @@ my %faceCategories = (
             2 => 'On (mode 2, shooting only)',
         }],
     },
+    0x1431 => { #forum6109
+        Name => 'Rating',
+        Groups => { 2 => 'Image' },
+        Writable => 'int32u',
+        Priority => 0,
+    },
     0x1436 => { #8
         Name => 'ImageGeneration',
         Writable => 'int16u',

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

@@ -24,7 +24,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.36';
+$VERSION = '1.38';
 
 sub ProcessKodakIFD($$$);
 sub ProcessKodakText($$$);
@@ -1378,6 +1378,14 @@ my %sceneModeUsed = (
         Groups => { 2 => 'Time' },
         Writable => 'string',
     },
+    0x0406 => { #4
+        Name => 'CameraTemperature',
+        # (when count is 2, values seem related to temperature, but are not Celius)
+        Condition => '$count == 1',
+        Writable => 'rational64s',
+        PrintConv => '"$val C"',
+        PrintConvInv => '$val=~s/ ?C//; $val',
+    },
     0x0414 => { Name => 'NCDFileInfo',      Writable => 'string' },
     0x0846 => { #3
         Name => 'ColorTemperature',
@@ -1397,14 +1405,26 @@ my %sceneModeUsed = (
     0x085d => { Name => 'WB_RGBCoeffs1', Binary => 1 }, #3
     0x085e => { Name => 'WB_RGBCoeffs2', Binary => 1 }, #3
     0x085f => { Name => 'WB_RGBCoeffs3', Binary => 1 }, #3
+    0x0903 => { Name => 'BaseISO', Writable => 'rational64u' }, #4 (ISO before digital gain)
     # 0x090d: linear table (ref 3)
+    0x09ce => { Name => 'SensorSerialNumber', Writable => 'string', Groups => { 2 => 'Camera' } }, #4
     # 0x0c81: some sort of date (manufacture date?) - PH
-    # 0x089d => "real" (analogue) ISO values (ref 4)
+    # 0x089d => true analogue ISO values possible (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' },
+    0x0e4c => { #4
+        Name => 'KodakLook',
+        Format => 'undef',
+        Writable => 'string',
+        ValueConv => '$val=~tr/\0/\n/; $val',
+        ValueConvInv => '$val=~tr/\n/\0/; $val',
+    },
+    0x1389 => { Name => 'InputProfile',     Writable => 'undef', Binary => 1 }, #4
+    0x138a => { Name => 'KodakLookProfile', Writable => 'undef', Binary => 1 }, #4
+    0x138b => { Name => 'OutputProfile',    Writable => 'undef', Binary => 1 }, #4
     # 0x1390: value: "DCSProSLRn" (tone curve name?) - PH
     0x1391 => { Name => 'ToneCurveFileName',Writable => 'string' },
     0x1784 => { Name => 'ISO',              Writable => 'int32u' }, #3
@@ -1819,6 +1839,15 @@ my %sceneModeUsed = (
     },
 );
 
+# tags in "frea" atom of Kodak PixPro SP360 MP4 videos (ref PH)
+%Image::ExifTool::Kodak::frea = (
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    NOTES => 'Information stored in the "frea" atom of Kodak PixPro SP360 MP4 videos.',
+    # tima - 4 bytes: 0 0 0 0x20
+    thma => { Name => 'ThumbnailImage', Binary => 1 },
+    scra => { Name => 'PreviewImage',   Binary => 1 },
+);
+
 # preview information in free/Scrn atom of MP4 videos (ref PH)
 %Image::ExifTool::Kodak::Scrn = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },