exiftool_vendored 10.23.0 → 10.25.0

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/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.53';
+$VERSION = '1.54';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -152,6 +152,10 @@ my %faceCategories = (
             0x303 => 'B&W Green Filter', #PH/8
             0x310 => 'B&W Sepia', #PH (X100)
             0x400 => 'Low 2', #8 ("Color -2")
+            0x500 => 'Acros', #PH (X-Pro2)
+            0x501 => 'Acros Red Filter', #PH (X-Pro2)
+            0x502 => 'Acros Yellow Filter', #PH (X-Pro2)
+            0x503 => 'Acros Green Filter', #PH (X-Pro2)
             0x8000 => 'Film Simulation', #2
         },
     },
@@ -220,6 +224,7 @@ my %faceCategories = (
             2 => 'Off',
             3 => 'Red-eye reduction',
             4 => 'External', #JD
+            16 => 'Commander',
         },
     },
     0x1011 => {
@@ -449,12 +454,12 @@ my %faceCategories = (
         Writable => 'int16u',
         PrintHex => 1,
         PrintConv => {
-            0x000 => 'F0/Standard (Provia)',
+            0x000 => 'F0/Standard (Provia)', # X-Pro2 "Provia/Standard"
             0x100 => 'F1/Studio Portrait',
             0x110 => 'F1a/Studio Portrait Enhanced Saturation',
-            0x120 => 'F1b/Studio Portrait Smooth Skin Tone (Astia)',
+            0x120 => 'F1b/Studio Portrait Smooth Skin Tone (Astia)', # X-Pro2 "Astia/Soft"
             0x130 => 'F1c/Studio Portrait Increased Sharpness',
-            0x200 => 'F2/Fujichrome (Velvia)',
+            0x200 => 'F2/Fujichrome (Velvia)', # X-Pro2 "Velvia/Vivid"
             0x300 => 'F3/Studio Portrait Ex',
             0x400 => 'F4/Velvia',
             0x500 => 'Pro Neg. Std', #PH (X-Pro1)

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Lang/it.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::it;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 %Image::ExifTool::Lang::it::Translate = (
    'A100DataOffset' => 'Offset dati A100',
@@ -6273,7 +6273,7 @@ $VERSION = '1.12';
     },
    'RecordingTime' => 'Tempo registrazione',
    'RedAdjust' => 'Correzione rosso',
-   'RedBalance' => 'Bilanciamento rosso',
+   'RedBalance' => 'Bilanciamento del rosso',
    'RedCurveLimits' => 'Limiti curva rosso',
    'RedCurvePoints' => 'Punti curva rosso',
    'RedEyeCorrection' => {
@@ -6769,7 +6769,7 @@ $VERSION = '1.12';
         'Change parameters' => 'Cambia parametri',
         'ISO speed' => 'Velocità ISO',
         'Normal (disabled)' => 'Normale (disabilitato)',
-        'White balance' => 'Bilanciameno bianco',
+        'White balance' => 'Bilanciamento del bianco',
       },
     },
    'SetCookie' => 'Imposta cookie',
@@ -7314,7 +7314,7 @@ $VERSION = '1.12';
       PrintConv => {
         'Self-timer' => 'Autoscatto',
         'Shooting Mode' => 'Modo scatto',
-        'White Balance' => 'Bilanciameno bianco',
+        'White Balance' => 'Bilanciamento del bianco',
       },
     },
    'TimerLength' => {
@@ -7729,7 +7729,7 @@ $VERSION = '1.12';
     },
    'WCSProfiles' => 'Profilo Windows Color System',
    'WhiteBalance' => {
-      Description => 'Bilanciameno bianco',
+      Description => 'Bilanciamento del bianco',
       PrintConv => {
         'Auto' => 'Equilibrio del bianco automatico',
         'Black & White' => 'Monocromatico',
@@ -7753,7 +7753,7 @@ $VERSION = '1.12';
         'White Fluorescent' => 'Fluorescente bianca',
       },
     },
-   'WhiteBalance2' => 'Bilanciameno bianco 2',
+   'WhiteBalance2' => 'Bilanciamento del bianco 2',
    'WhiteBalanceAdj' => {
       Description => 'Adattamento bilanciamento bianco',
       PrintConv => {

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Leaf.pm

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ProcessLeaf($$$);
 
@@ -340,9 +340,10 @@ sub ProcessLeaf($$$);
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
     NOTES => q{
         Leaf writes a TIFF-format sub-IFD inside IFD0 of a MOS image.  No tags in
-        this sub-IFD are currently known, except for tag 0x8606 which really
-        shouldn't be here anyway (so it doesn't appear in the table below) because
-        it duplicates a reference to the same data of tag 0x8606 in IFD0.
+        this sub-IFD are currently known, except for tags 0x8602 and 0x8606 which
+        really shouldn't be here anyway (so they don't appear in the table below)
+        because they duplicate references to the same data from tags with the same
+        ID in IFD0.
     },
 );
 

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/MakerNotes.pm

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '1.98';
+$VERSION = '1.99';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -89,6 +89,15 @@ my $debug;          # set to 1 to enable debugging code
             FixBase => 1, # necessary for AVI and MOV videos
         },
     },
+    {
+        Name => 'MakerNoteDJI',
+        Condition => '$$self{Make} eq "DJI" and $$valPt !~ /^...\@AMBA/s',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::DJI::Main',
+            Start => '$valuePtr',
+            ByteOrder => 'Unknown',
+        },
+    },
     {
         Name => 'MakerNoteFLIR',
         # (starts with IFD, Make is 'FLIR Systems AB' or 'FLIR Systems')

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Minolta.pm

@@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.35';
+$VERSION = '2.36';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -572,16 +572,17 @@ $VERSION = '2.35';
     '65535.47' => 'Zeiss Touit 12mm F2.8', #JR
     '65535.48' => 'Zeiss Touit 32mm F1.8', #JR
     '65535.49' => 'Zeiss Touit 50mm F2.8 Macro', #JR
+    '65535.50' => 'Samyang AF 50mm F1.4 FE', #JR (32789)
 #
 # other lenses
 #
-    '65535.50' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
-    '65535.51' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
-    '65535.52' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
-    '65535.53' => 'Samyang 500mm Mirror F8.0', #19
-    '65535.54' => 'Pentacon Auto 135mm F2.8', #19
-    '65535.55' => 'Pentacon Auto 29mm F2.8', #19
-    '65535.56' => 'Helios 44-2 58mm F2.0', #19
+    '65535.51' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
+    '65535.52' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
+    '65535.53' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
+    '65535.54' => 'Samyang 500mm Mirror F8.0', #19
+    '65535.55' => 'Pentacon Auto 135mm F2.8', #19
+    '65535.56' => 'Pentacon Auto 29mm F2.8', #19
+    '65535.57' => 'Helios 44-2 58mm F2.0', #19
 );
 
 %minoltaTeleconverters = (

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Nikon.pm

@@ -59,7 +59,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.24';
+$VERSION = '3.25';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -274,6 +274,7 @@ sub GetAFPointGrid($$;$);
     'A3 3C 29 44 30 30 A5 0E' => 'AF-S Nikkor 16-35mm f/4G ED VR',
     'A4 54 37 37 0C 0C A6 06' => 'AF-S Nikkor 24mm f/1.4G ED',
     'A5 40 3C 8E 2C 3C A7 0E' => 'AF-S Nikkor 28-300mm f/3.5-5.6G ED VR',
+    'A5 54 6A 6A 0C 0C D0 46' => 'AF-S Nikkor 105mm f/1.4E ED', #IB
     'A6 48 8E 8E 24 24 A8 0E' => 'AF-S VR Nikkor 300mm f/2.8G IF-ED II',
     'A7 4B 62 62 2C 2C A9 0E' => 'AF-S DX Micro Nikkor 85mm f/3.5G ED VR',
     'A8 48 80 98 30 30 AA 0E' => 'AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED II', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3218.msg15495.html#msg15495

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/PanasonicRaw.pm

@@ -20,7 +20,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessJpgFromRaw($$$);
 sub WriteJpgFromRaw($$$);
@@ -425,7 +425,7 @@ sub ProcessDistortionInfo($$$)
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     my $start = $$dirInfo{DirStart} || 0;
-    my $size = $$dirInfo{DataLen} || (length($$dataPt) - $start);
+    my $size = $$dirInfo{DirLen} || (length($$dataPt) - $start);
     if ($size == 32) {
         # verify the checksums (ref 3)
         my $csum1 = Checksum($dataPt, $start +  4, 12, 1);

data/bin/{Image-ExifTool-10.23 → Image-ExifTool-10.25}/lib/Image/ExifTool/Pentax.pm

@@ -57,10 +57,11 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.05';
+$VERSION = '3.06';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
+sub DecodeAFPoints($$$$;$);
 
 # pentax lens type codes (ref 4)
 # The first number gives the lens series, and the 2nd gives the model number
@@ -90,12 +91,13 @@ sub PrintFilter($$$);
     '0 0' => 'M-42 or No Lens', #17
     '1 0' => 'K or M Lens',
     '2 0' => 'A Series Lens', #7 (from smc PENTAX-A 400mm F5.6)
-    '3 0' => 'Sigma', # (includes 'Sigma 30mm F1.4 EX DC' - PH)
-    # (and 'Sigma 105mm F2.8 EX DG Macro', ref 24)
+    '3 0' => 'Sigma',
     # (and 'Sigma 18-50mm F2.8 EX Macro')
-    # (and 'Sigma 180mm F4.5 EX DG Macro')
-    # (and 'Sigma 70mm F2.8 EX DG Macro')
+    # (and 'Sigma 30mm F1.4 EX DC', ref PH)
     # (and 'Sigma 50-500mm F4-6.3 DG APO')
+    # (and 'Sigma 70mm F2.8 EX DG Macro')
+    # (and 'Sigma 105mm F2.8 EX DG Macro', ref 24)
+    # (and 'Sigma 180mm F4.5 EX DG Macro')
     '3 17' => 'smc PENTAX-FA SOFT 85mm F2.8',
     '3 18' => 'smc PENTAX-F 1.7X AF ADAPTER',
     '3 19' => 'smc PENTAX-F 24-50mm F4',
@@ -108,8 +110,8 @@ sub PrintFilter($$$);
     '3 23.3' => 'Tokina 80-200mm F2.8 ATX-Pro', #Exiv2
     '3 24' => 'smc PENTAX-F 35-135mm F3.5-4.5',
     '3 25' => 'smc PENTAX-F 35-105mm F4-5.6 or Sigma or Tokina Lens',
-    '3 25.1' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #11
-    '3 25.2' => 'Sigma 55-200mm F4-5.6 DC', #JD
+    '3 25.1' => 'Sigma 55-200mm F4-5.6 DC', #JD
+    '3 25.2' => 'Sigma AF 28-300mm F3.5-5.6 DL IF', #11
     '3 25.3' => 'Sigma AF 28-300mm F3.5-6.3 DL IF', #Exiv2
     '3 25.4' => 'Sigma AF 28-300mm F3.5-6.3 DG IF Macro', #JD
     '3 25.5' => 'Tokina 80-200mm F2.8 ATX-Pro', #12
@@ -144,6 +146,7 @@ sub PrintFilter($$$);
     '3 44.4' => 'Sigma 18-50mm F3.5-5.6 DC', #4
     '3 44.5' => 'Sigma 17-35mm F2.8-4 EX DG', #29
     '3 44.6' => 'Tamron 35-90mm F4 AF', #12
+    '3 44.7' => 'Sigma AF 18-35mm F3.5-4.5 Aspherical', #29
     '3 46' => 'Sigma or Samsung Lens (3 46)',
     '3 46.1' => 'Sigma APO 70-200mm F2.8 EX',
     '3 46.2' => 'Sigma EX APO 100-300mm F4 IF', #JD
@@ -1827,6 +1830,7 @@ my %binaryDataAttrs = (
             '10 0' => 'Aperture Priority, Off-Auto-Aperture',
             '11 0' => 'Manual, Off-Auto-Aperture',
             '12 0' => 'Bulb, Off-Auto-Aperture',
+            '19 0' => 'Astrotracer', #29
             # extra K10D modes (ref 16)
             '13 0' => 'Shutter & Aperture Priority AE',
             '15 0' => 'Sensitivity Priority AE',
@@ -2113,6 +2117,7 @@ my %binaryDataAttrs = (
             14 => '14 (645Z)',
             15 => '15 (K-S1,K-S2)', #PH
             16 => '16 (K-1)', #PH
+            17 => '17 (K-70)', #29
         },
     },
     0x0067 => { #PH (K-5)
@@ -2426,6 +2431,7 @@ my %binaryDataAttrs = (
             2 => 'HDR 1',
             3 => 'HDR 2',
             4 => 'HDR 3',
+            5 => 'HDR Advanced', #29 (K-1)
         },{ # (K-01)
             0 => 'Auto-align Off',
             1 => 'Auto-align On',
@@ -2788,6 +2794,10 @@ my %binaryDataAttrs = (
         Name => 'PixelShiftInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::PixelShiftInfo' },
     },
+    0x0245 => { #29
+        Name => 'AFPointInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AFPointInfo' },
+    },
     0x03fe => { #PH
         Name => 'DataDump',
         Writable => 0,
@@ -4013,7 +4023,7 @@ my %binaryDataAttrs = (
     },
 );
 
-# lens information for K-01, K-30, K-50, K-500, K-3, K-3II (ref PH)
+# lens information for K-01, K-30, K-50, K-500, K-3, K-3II, K-S1 (ref PH)
 %Image::ExifTool::Pentax::LensInfo5 = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -5333,6 +5343,36 @@ my %binaryDataAttrs = (
     },
 );
 
+# AF point information for the K-1 (ref 29)
+%Image::ExifTool::Pentax::AFPointInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'AF point information written by the K-1.',
+    # 0 - int16u: 1 (version?)
+    2 => {
+        Name => 'NumAFPoints',
+        Format => 'int16u',
+    },
+    4 => {
+        Name => 'AFPointsInFocus',
+        Condition => '$$self{Model} =~ /K-1\b/',
+        Format => 'int8u[9]',
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x02)',
+    },
+    4.1 => {
+        Name => 'AFPointsSelected',
+        Condition => '$$self{Model} =~ /K-1\b/',
+        Format => 'int8u[9]',
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03)',
+    },
+    4.2 => {
+        Name => 'AFPointsSpecial',
+        Condition => '$$self{Model} =~ /K-1\b/',
+        Format => 'int8u[9]',
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03,0x03)',
+    },
+);
+
 # temperature information for some models - PH
 %Image::ExifTool::Pentax::TempInfo = (
     %binaryDataAttrs,
@@ -5928,6 +5968,35 @@ sub PrintFilter($$$)
     }
 }
 
+#------------------------------------------------------------------------------
+# Decode AF bit mask (ref 29)
+# Inputs: 0) raw binary value, 1) number of AF points, 2) number of bits per AF point,
+#         3) bit mask, 4) bit value (undef for any bit set)
+sub DecodeAFPoints($$$$;$)
+{
+    my ($val, $num, $bits, $mask, $bitVal) = @_;
+    my @bytes = split ' ', $val;
+    my $i = 1;  # (starts at AF point number 1)
+    my $shift = 8 - $bits;
+    my $byte = shift @bytes;
+    my @bitList;
+    for (;;) {
+        if ($bitVal) {
+            push @bitList, $i if (($byte >> $shift) & $mask) == $bitVal;
+        } else {
+            push @bitList, $i if ($byte >> $shift) & $mask;
+        }
+        last if ++$i > $num;
+        $shift -= $bits;
+        if ($shift < 0) {
+            last unless @bytes;
+            $byte = shift @bytes;
+            $shift += 8;
+        }
+    }
+    return join(',', @bitList);
+}
+
 #------------------------------------------------------------------------------
 # Convert Pentax hex-based EV (modulo 8) to real number
 # Inputs: 0) value to convert