exiftool_vendored 13.17.0 → 13.19.0

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

@@ -25,7 +25,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.47';
+$VERSION = '1.48';
 
 sub ProcessKodakIFD($$$);
 sub ProcessKodakText($$$);
@@ -2983,7 +2983,8 @@ my %sceneModeUsed = (
         Priority => 0,  # (only integer seconds)
         PrintConv => 'ConvertDuration($val)',
     },
-   'ver '=> { Name => 'KodakVersion' },
+    # (save KodakVersion to recognize Rexing Dashcam video for GPS scaling)
+   'ver '=> { Name => 'KodakVersion', RawConv => '$$self{KodakVersion} = $val' },
     thma => { Name => 'ThumbnailImage', Groups => { 2 => 'Preview' }, Binary => 1 },
     scra => { Name => 'PreviewImage',   Groups => { 2 => 'Preview' }, Binary => 1 },
 );

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.42';
+$VERSION = '4.43';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1370,6 +1370,25 @@ my %retouchValues = ( #PH
     54 => 'Low Key', # (S3500)
 );
 
+# AF points for models with 11 focus points (eg. D3400)
+my %afPoints11 = (
+    0 => '(none)',
+    0x7ff => 'All 11 Points',
+    BITMASK => {
+        0 => 'Center',
+        1 => 'Top',
+        2 => 'Bottom',
+        3 => 'Mid-left',
+        4 => 'Mid-right',
+        5 => 'Upper-left',
+        6 => 'Upper-right',
+        7 => 'Lower-left',
+        8 => 'Lower-right',
+        9 => 'Far Left',
+        10 => 'Far Right',
+    },
+);
+
 # AF point indices for models with 51 focus points, eg. D3 (ref JD/PH)
 #        A1  A2  A3  A4  A5  A6  A7  A8  A9
 #    B1  B2  B3  B4  B5  B6  B7  B8  B9  B10  B11
@@ -4027,23 +4046,7 @@ my %base64coord = (
         Name => 'AFPointsInFocus',
         Format => 'int16u',
         PrintConvColumns => 2,
-        PrintConv => {
-            0 => '(none)',
-            0x7ff => 'All 11 Points',
-            BITMASK => {
-                0 => 'Center',
-                1 => 'Top',
-                2 => 'Bottom',
-                3 => 'Mid-left',
-                4 => 'Mid-right',
-                5 => 'Upper-left',
-                6 => 'Upper-right',
-                7 => 'Lower-left',
-                8 => 'Lower-right',
-                9 => 'Far Left',
-                10 => 'Far Right',
-            },
-        },
+        PrintConv => \%afPoints11,
     },
 );
 
@@ -4515,7 +4518,7 @@ my %base64coord = (
     0x1c => [
         { #PH
             Name => 'ContrastDetectAFInFocus',
-            Condition => '$$self{AFInfo2Version} eq "0100"',
+            Condition => '$$self{AFInfo2Version} eq "0100" and $$self{ContrastDetectAF}',
             PrintConv => { 0 => 'No', 1 => 'Yes' },
         },{ #PH (D500, see forum11190)
             Name => 'AFPointsSelected',
@@ -4525,6 +4528,11 @@ my %base64coord = (
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
+        },{ #PH (D3400) (NC "selected")
+            Name => 'AFPointsSelected',
+            Condition => '$$self{AFInfo2Version} eq "0101" and $$self{PhaseDetectAF} == 2',
+            Format => 'int16u',
+            PrintConv => \%afPoints11,
         },
     ],
     # 0x1d - always zero (with or without live view)
@@ -4573,6 +4581,14 @@ my %base64coord = (
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
+        },{ #PH (D7500) (NC "in focus")
+            Name => 'AFPointsInFocus',
+            Condition => '$$self{AFInfo2Version} eq "0101" and $$self{PhaseDetectAF} == 1',
+            Format => 'undef[7]',
+            ValueConv => 'join(" ", unpack("H2"x7, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPoints(shift, \%afPoints51); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints51); },
         },
     ],
     0x31 => { #28 (Z7)
@@ -4639,6 +4655,16 @@ my %base64coord = (
                 11 => 'Far Right',
             },
         },
+        {
+            Name => 'PrimaryAFPoint',
+            Condition => '$$self{PhaseDetectAF} == 1 and $$self{AFInfo2Version} eq "0101"',
+            PrintConvColumns => 5,
+            PrintConv => {
+                0 => '(none)',
+                %afPoints51,
+                1 => 'C6 (Center)',
+            },
+        },
         {
             Name => 'PrimaryAFPoint',
             Condition => '$$self{AFInfo2Version} eq "0101"',

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.60';
+$VERSION = '1.61';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -141,6 +141,15 @@ my %supportedFilter = (
         PrintConv => '$self->ConvertDateTime($val)',
         PrintConvInv => '$self->InverseDateTime($val)',
     },
+    SourceModified => {
+        Name => 'SourceModified',
+        Writable => 'date',
+        PDF2 => 1,
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val)',
+    },
     Trapped => {
         Protected => 1,
         # remove leading '/' from '/True' or '/False'

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.13';
+$VERSION = '1.14';
 
 sub ExtractObject($$;$);
 sub Get24u($$);
@@ -46,7 +46,7 @@ my %plistType = (
 %Image::ExifTool::PLIST::Main = (
     PROCESS_PROC => \&ProcessPLIST,
     GROUPS => { 0 => 'PLIST', 1 => 'XML', 2 => 'Document' },
-    VARS => { LONG_TAGS => 4 },
+    VARS => { LONG_TAGS => 12 },
     NOTES => q{
         Apple Property List tags.  ExifTool reads both XML and binary-format PLIST
         files, and will extract any existing tags even if they aren't listed below.
@@ -92,6 +92,35 @@ my %plistType = (
         Name => 'GPSMapDatum',
         Groups => { 2 => 'Location' },
     },
+    # slow motion stuff found in AAE files
+    'slowMotion/regions/timeRange/start/flags' => {
+        Name => 'SlowMotionRegionsStartTimeFlags',
+        PrintConv => { BITMASK => {
+            0 => 'Valid',
+            1 => 'Has been rounded',
+            2 => 'Positive infinity',
+            3 => 'Negative infinity',
+            4 => 'Indefinite',
+        }},
+    },
+    'slowMotion/regions/timeRange/start/value'     => 'SlowMotionRegionsStartTimeValue',
+    'slowMotion/regions/timeRange/start/timescale' => 'SlowMotionRegionsStartTimeScale',
+    'slowMotion/regions/timeRange/start/epoch'     => 'SlowMotionRegionsStartTimeEpoch',
+    'slowMotion/regions/timeRange/duration/flags'  => {
+        Name => 'SlowMotionRegionsDurationFlags',
+        PrintConv => { BITMASK => {
+            0 => 'Valid',
+            1 => 'Has been rounded',
+            2 => 'Positive infinity',
+            3 => 'Negative infinity',
+            4 => 'Indefinite',
+        }},
+    },
+    'slowMotion/regions/timeRange/duration/value'     => 'SlowMotionRegionsDurationValue',
+    'slowMotion/regions/timeRange/duration/timescale' => 'SlowMotionRegionsDurationTimeScale',
+    'slowMotion/regions/timeRange/duration/epoch'     => 'SlowMotionRegionsDurationEpoch',
+    'slowMotion/regions' => 'SlowMotionRegions',
+    'slowMotion/rate' => 'SlowMotionRate',
     XMLFileType => {
         # recognize MODD files by their content
         RawConv => q{
@@ -101,6 +130,10 @@ my %plistType = (
             return $val;
         },
     },
+    adjustmentData => { # AAE file
+        Name => 'AdjustmentData',
+        SubDirectory => { TagTable => 'Image::ExifTool::PLIST::Main' },
+    },
 );
 
 #------------------------------------------------------------------------------
@@ -404,8 +437,13 @@ sub ProcessPLIST($$;$)
 
     unless ($result) {
         my $buff;
-        my $raf = $$dirInfo{RAF} or return 0;
-        $raf->Seek(0,0) and $raf->Read($buff, 64) or return 0;
+        my $raf = $$dirInfo{RAF};
+        if ($raf) {
+            $raf->Seek(0,0) and $raf->Read($buff, 64) or return 0;
+        } else {
+            return 0 unless $$dirInfo{DataPt};
+            $buff = ${$$dirInfo{DataPt}};
+        }
         if ($buff =~ /^bplist0/) {
             # binary PLIST file
             my $tagTablePtr = GetTagTable('Image::ExifTool::PLIST::Main');

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

@@ -1165,7 +1165,7 @@ sub ProcessPSD($$)
             $len = Set32u(length $data);
             Write($outfile, $len, $data) or $err = 1;
             # look for trailer and edit if necessary
-            my $trailInfo = Image::ExifTool::IdentifyTrailer($raf);
+            my $trailInfo = $et->IdentifyTrailer($raf);
             if ($trailInfo) {
                 my $tbuf = '';
                 $$trailInfo{OutFile} = \$tbuf;  # rewrite trailer(s)
@@ -1223,7 +1223,7 @@ sub ProcessPSD($$)
         }
         $$et{INDENT} = $oldIndent;
         # process trailers if they exist
-        my $trailInfo = Image::ExifTool::IdentifyTrailer($raf);
+        my $trailInfo = $et->IdentifyTrailer($raf);
         $et->ProcessTrailers($trailInfo) if $trailInfo;
     }
     return $rtnVal;

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

@@ -174,7 +174,7 @@ sub ProcessProtobuf($$$;$)
                 my $dir = { DataPt => \$buff, Pos => 0 };
                 my $num = VarInt($dir);
                 my $den = VarInt($dir);
-                $val = (defined $num and $den) ? "$num/$den" : 'err';
+                $val = (defined $num and $den) ? $num/$den : 'err';
             } else {
                 $val = ReadValue(\$buff, 0, $$tagInfo{Format}, undef, length($buff));
             }