exiftool_vendored 9.59.0 → 9.60.0

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/GPS.pm

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 my %coordConv = (
     ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
@@ -38,7 +38,11 @@ my %coordConv = (
     0x0001 => {
         Name => 'GPSLatitudeRef',
         Writable => 'string',
-        Notes => 'tags 0x0001-0x0006 used for camera location according to MWG 2.0',
+        Notes => q{
+            tags 0x0001-0x0006 used for camera location according to MWG 2.0. ExifTool
+            will also accept a number when writing GPSLatitude -- positive for north
+            latitudes, or negative for south
+        },
         Count => 2,
         PrintConv => {
             # extract N/S if written from Composite:GPSLatitude
@@ -64,6 +68,10 @@ my %coordConv = (
         Name => 'GPSLongitudeRef',
         Writable => 'string',
         Count => 2,
+        Notes => q{
+            ExifTool will also accept a number when writing this tag -- positive for
+            east longitudes or negative for west
+        },
         PrintConv => {
             # extract E/W if written from Composite:GPSLongitude
             # (also allow writing from a signed number)
@@ -87,6 +95,10 @@ my %coordConv = (
     0x0005 => {
         Name => 'GPSAltitudeRef',
         Writable => 'int8u',
+        Notes => q{
+            ExifTool will also accept a signed number when writing this tag, beginning
+            with "+" for above sea level, or "-" for below
+        },
         PrintConv => {
             OTHER => sub {
                 my ($val, $inv) = @_;

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/JPEG.pm

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.22';
+$VERSION = '1.23';
 
 sub ProcessOcad($$$);
 sub ProcessJPEG_HDR($$$);
@@ -399,13 +399,19 @@ sub ProcessJPEG_HDR($$$);
     0 => 'DCTEncodeVersion',
     1 => {
         Name => 'APP14Flags0',
-        PrintConv => { BITMASK => {
-            15 => 'Encoded with Blend=1 downsampling'
-        } },
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                15 => 'Encoded with Blend=1 downsampling'
+            },
+        },
     },
     2 => {
         Name => 'APP14Flags1',
-        PrintConv => { BITMASK => { } },
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => { },
+        },
     },
     3 => {
         Name => 'ColorTransform',

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/Lang/de.pm

@@ -169,7 +169,7 @@ $VERSION = '1.29';
       },
     },
    'AFAperture' => 'AF-Blende',
-   'AFArea' => 'AF-Feld',
+   'AFArea' => 'AF Bereich',
    'AFAreaHeight' => 'AF-Bereichshöhe',
    'AFAreaHeights' => 'AF-Bereichshöhe',
    'AFAreaIllumination' => {
@@ -617,7 +617,7 @@ $VERSION = '1.29';
       },
     },
    'AFPointSelected' => {
-      Description => 'Gewählter AF-Punkt',
+      Description => 'AF gewählter Punkt',
       PrintConv => {
         'Auto' => 'Automatisch',
         'Automatic Tracking AF' => 'Nachführ AF',
@@ -651,7 +651,7 @@ $VERSION = '1.29';
       },
     },
    'AFPointSelected2' => {
-      Description => 'Gewählter AF-Punkt 2',
+      Description => 'AF gewählter Punkt 2',
       PrintConv => {
         'Auto' => 'Automatisch',
         'Bottom' => 'Unten',
@@ -751,7 +751,7 @@ $VERSION = '1.29';
         'Upper-right' => 'Rechts oben',
       },
     },
-   'AFPointsSelected' => 'Gewählte AF-Punkte',
+   'AFPointsSelected' => 'AF gewählte Punkte',
    'AFPointsUnknown1' => {
       Description => 'AF-Punkte Unbekannt 1',
       PrintConv => {

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/Minolta.pm

@@ -52,7 +52,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.12';
+$VERSION = '2.13';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -1365,17 +1365,20 @@ my %afStatusInfo = (
     },
     0x10 => {
         Name => 'AFPoints',
-        PrintConv => { BITMASK => {
-            0 => 'Center',
-            1 => 'Top',
-            2 => 'Top-Right',
-            3 => 'Right',
-            4 => 'Bottom-Right',
-            5 => 'Bottom',
-            6 => 'Bottom-Left',
-            7 => 'Left',
-            8 => 'Top-Left',
-        } },
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                0 => 'Center',
+                1 => 'Top',
+                2 => 'Top-Right',
+                3 => 'Right',
+                4 => 'Bottom-Right',
+                5 => 'Bottom',
+                6 => 'Bottom-Left',
+                7 => 'Left',
+                8 => 'Top-Left',
+            },
+        },
     },
     0x15 => {
         Name => 'Flash',

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/Nikon.pm

@@ -56,7 +56,7 @@ use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.87';
+$VERSION = '2.88';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1796,6 +1796,13 @@ my %binaryDataAttrs = (
         Flags => [ 'Binary', 'Protected' ],
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::PictureControl' },
     },
+    0x00c3 => {
+        Name => 'BarometerInfo',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Nikon::BarometerInfo',
+            ByteOrder => 'LittleEndian',
+        },
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',
@@ -2342,7 +2349,11 @@ my %binaryDataAttrs = (
     },
     4 => {
         Name => 'AutoDistortionControl',
-        PrintConv => \%offOn,
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+            2 => 'On (underwater)', # (1AW1)
+        },
     },
 );
 
@@ -2414,6 +2425,7 @@ my %binaryDataAttrs = (
         Format => 'int16u',
         PrintConvColumns => 2,
         PrintConv => {
+            0 => '(none)',
             0x7ff => 'All 11 Points',
             BITMASK => {
                 0 => 'Center',
@@ -2588,6 +2600,7 @@ my %binaryDataAttrs = (
             ValueConvInv => 'pack("v",$val)',
             PrintConvColumns => 2,
             PrintConv => {
+                0 => '(none)',
                 0x7ff => 'All 11 Points',
                 BITMASK => {
                     0 => 'Center',
@@ -2736,6 +2749,24 @@ my %binaryDataAttrs = (
     },
 );
 
+# ref PH
+%Image::ExifTool::Nikon::BarometerInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    0 => {
+        Name => 'BarometerInfoVersion',
+        Format => 'undef[4]',
+        Writable => 0,
+    },
+    6 => {
+        Name => 'Altitude',
+        Format => 'int32s',
+        PrintConv => '"$val m"', # (always stored as metres)
+        PrintConvInv => '$val=~s/\s*m$//; $val',
+    },
+    # 10: int16u - values: 0 (display in metres?), 18 (display in feet?)
+);
+
 # ref PH
 %Image::ExifTool::Nikon::CaptureOffsets = (
     PROCESS_PROC => \&ProcessNikonCaptureOffsets,
@@ -4345,12 +4376,14 @@ my %nikonFocalConversions = (
     },
     8 => {
         Name => 'ExternalFlashFlags',
-        PrintConv => { BITMASK => {
-            0 => 'Fired', #28
-            2 => 'Bounce Flash', #PH
-            4 => 'Wide Flash Adapter',
-            5 => 'Dome Diffuser', #28
-        }},
+        PrintConv => { 0 => '(none)',
+            BITMASK => {
+                0 => 'Fired', #28
+                2 => 'Bounce Flash', #PH
+                4 => 'Wide Flash Adapter',
+                5 => 'Dome Diffuser', #28
+            },
+        },
     },
     9.1 => {
         Name => 'FlashCommanderMode',
@@ -4979,12 +5012,14 @@ my %nikonFocalConversions = (
         },
         PrintConv => \%Image::ExifTool::Nikon::nikonTextEncoding,
     },
-    # the following tag names chosen to correspond with XMP::iptcCore
+    # (the CountryCode and Location tag names chosen to correspond with XMP::iptcCore)
     5 => {
         Name => 'CountryCode',
-        Format => 'string[3]',
+        Format => 'undef[3]',
+        ValueConv => '$val=~s/\0.*//s; $val', # truncate at null
+        ValueConvInv => '$val',
     },
-    # 8 - value: 6 (what is this for?)
+    8 => 'POILevel', #forum5782
     9 => {
         Name => 'Location',
         Format => 'undef[70]',
@@ -5784,7 +5819,7 @@ my @xlat = (
     0xc6,0x67,0x4a,0xf5,0xa5,0x12,0x65,0x7e,0xb0,0xdf,0xaf,0x4e,0xb3,0x61,0x7f,0x2f ]
 );
 
-# decrypt Nikon data block (ref 4)
+# Decrypt Nikon data block (ref 4)
 # Inputs: 0) reference to data block, 1) serial number key, 2) shutter count key
 #         4) optional start offset (default 0)
 #         5) optional number of bytes to decode (default to the end of the data)
@@ -6050,7 +6085,7 @@ sub ProcessNikonCaptureEditVersions($$$)
 }
 
 #------------------------------------------------------------------------------
-# process Nikon Capture Offsets IFD (ref PH)
+# Process Nikon Capture Offsets IFD (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 # Notes: This isn't a normal IFD, but is close...