exiftool-vendored.pl 12.78.0 → 12.80.0

package/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 27565 tags, with 17308 unique tag names.
+They contain a total of 27593 tags, with 17336 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -1362,6 +1362,7 @@ L<http://www.adobe.com/devnet/xmp/> for the official XMP specification.
   ---------                                     --------
   aas                                           XMP aas
   acdsee                                        XMP acdsee
+  acdsee-rs                                     XMP ACDSeeRegions
   album                                         XMP Album
   apple-fi                                      XMP apple_fi
   ast                                           Nikon ast
@@ -1505,6 +1506,66 @@ These tags belong to the ExifTool XMP-acdsee family 1 group.
   Snapshots                                     string/+
   Tagged                                        boolean/
 
+=head3 XMP ACDSeeRegions Tags
+
+These tags belong to the ExifTool XMP-acdsee-rs family 1 group.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  RegionInfoACDSee                              ACDSeeRegionInfo Struct
+  ACDSeeRegionAppliedToDimensions               ACDSeeDimensions Struct_
+  ACDSeeRegionAppliedToDimensionsH              real/_
+  ACDSeeRegionAppliedToDimensionsUnit           string/_
+  ACDSeeRegionAppliedToDimensionsW              real/_
+  ACDSeeRegion                                  ACDSeeRegion Struct_+
+  ACDSeeRegionALGArea                           ACDSeeArea Struct_+
+  ACDSeeRegionALGAreaH                          real/_+
+  ACDSeeRegionALGAreaW                          real/_+
+  ACDSeeRegionALGAreaX                          real/_+
+  ACDSeeRegionALGAreaY                          real/_+
+  ACDSeeRegionDLYArea                           ACDSeeArea Struct_+
+  ACDSeeRegionDLYAreaH                          real/_+
+  ACDSeeRegionDLYAreaW                          real/_+
+  ACDSeeRegionDLYAreaX                          real/_+
+  ACDSeeRegionDLYAreaY                          real/_+
+  ACDSeeRegionName                              string/_+
+  ACDSeeRegionNameAssignType                    string/_+
+  ACDSeeRegionType                              string/_+
+
+=head3 XMP ACDSeeRegionInfo Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  AppliedToDimensions                           ACDSeeDimensions Struct
+  RegionList                                    ACDSeeRegion Struct+
+
+=head3 XMP ACDSeeDimensions Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  H                                             real
+  Unit                                          string
+  W                                             real
+
+=head3 XMP ACDSeeRegion Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  ALGArea                                       ACDSeeArea Struct
+  DLYArea                                       ACDSeeArea Struct
+  Name                                          string
+  NameAssignType                                string
+  Type                                          string
+
+=head3 XMP ACDSeeArea Struct
+
+  Field Name                                    Writable
+  ----------                                    --------
+  H                                             real
+  W                                             real
+  X                                             real
+  Y                                             real
+
 =head3 XMP Album Tags
 
 Adobe Album namespace tags.
@@ -5149,6 +5210,7 @@ These tags belong to the ExifTool XMP-iptcExt family 1 group.
   LocationCreatedCountryCode                    string_+
   LocationCreatedCountryName                    string_+
   LocationCreatedGPSAltitude                    rational_+
+  LocationCreatedGPSAltitudeRef                 integer_+
   LocationCreatedGPSLatitude                    string_+
   LocationCreatedGPSLongitude                   string_+
   LocationCreatedIdentifier                     string_+
@@ -5162,6 +5224,7 @@ These tags belong to the ExifTool XMP-iptcExt family 1 group.
   LocationShownCountryCode                      string_+
   LocationShownCountryName                      string_+
   LocationShownGPSAltitude                      rational_+
+  LocationShownGPSAltitudeRef                   integer_+
   LocationShownGPSLatitude                      string_+
   LocationShownGPSLongitude                     string_+
   LocationShownIdentifier                       string_+
@@ -5215,6 +5278,7 @@ These tags belong to the ExifTool XMP-iptcExt family 1 group.
   RatingRegionCountryCode                       string_+
   RatingRegionCountryName                       string_+
   RatingRegionGPSAltitude                       rational_+
+  RatingRegionGPSAltitudeRef                    integer_+
   RatingRegionGPSLatitude                       string_+
   RatingRegionGPSLongitude                      string_+
   RatingRegionIdentifier                        string_+
@@ -5423,6 +5487,7 @@ is to write ImageRegion as a structure with these tags as new fields.
   CountryCode                                   string
   CountryName                                   string
   GPSAltitude                                   rational
+  GPSAltitudeRef                                integer
   GPSLatitude                                   string
   GPSLongitude                                  string
   Identifier                                    string+
@@ -6260,6 +6325,7 @@ These tags belong to the ExifTool XMP-xmpDM family 1 group.
   OutCueScale                                   rational_
   OutCueValue                                   integer_
   PartOfCompilation                             boolean
+  Pick                                          integer
   ProjectName                                   string
   ProjectRef                                    ProjectLink Struct
   ProjectRefPath                                string_
@@ -13099,6 +13165,8 @@ Tags extracted from FLIR Public image Format (FPF) files.
   0x104d   CropMode                             int16u
   0x104e   ColorChromeFXBlue                    int32s
   0x1050   ShutterType                          int16u
+  0x1051   CropTopLeft                          int32u
+  0x1052   CropCenter                           int32u
   0x1100   AutoBracketing                       int16u
   0x1101   SequenceNumber                       int16u
   0x1103   DriveSettings                        FujiFilm DriveSettings
@@ -39661,10 +39729,13 @@ FileName.
   GeolocationCountry         ExifTool           no
   GeolocationCountryCode     ExifTool           no
   GeolocationDistance        ExifTool           no
+  GeolocationFeatureCode     ExifTool           no
   GeolocationPopulation      ExifTool           no
   GeolocationPosition        ExifTool           no
   GeolocationRegion          ExifTool           no
+  GeolocationSubregion       ExifTool           no
   GeolocationTimeZone        ExifTool           no
+  GeolocationWarning         ExifTool           no
   Geosync                    -                  yes
   Geotag                     -                  yes
   Geotime                    -                  yes

package/bin/lib/Image/ExifTool/WriteQuickTime.pl

@@ -148,6 +148,7 @@ sub PrintInvGPSCoordinates($)
         $v[2] = Image::ExifTool::ToFloat($v[2]) * ($below ? -1 : 1) if @v == 3;
         return "@v";
     }
+    return $val if $val =~ /^([-+]?\d+(\.\d*)?)\s+([-+]?\d+(\.\d*)?)$/; # already 2 floats?
     return $val if $val =~ /^([-+]\d+(\.\d*)?){2,3}(CRS.*)?\/?$/; # already in ISO6709 format?
     return undef;
 }

package/bin/lib/Image/ExifTool/WriteXMP.pl

@@ -236,7 +236,7 @@ sub CheckXMP($$$;$)
             return 'Not a floating point number';
         }
         if ($format eq 'rational') {
-            $$valPtr = join('/', Image::ExifTool::Rationalize($$valPtr));
+            $$valPtr = join('/', Image::ExifTool::Rationalize($$valPtr,0xffffffff));
         }
     } elsif ($format eq 'integer') {
         # make sure the value is integer

package/bin/lib/Image/ExifTool/Writer.pl

@@ -1297,6 +1297,9 @@ sub SetNewValuesFromFile($$;@)
         Filter          => $$options{Filter},
         FixBase         => $$options{FixBase},
         Geolocation     => $$options{Geolocation},
+        GeolocFeature   => $$options{GeolocFeature},
+        GeolocMinPop    => $$options{GeolocMinPop},
+        GeolocMaxDist   => $$options{GeolocMaxDist},
         GlobalTimeShift => $$options{GlobalTimeShift},
         HexTagIDs       => $$options{HexTagIDs},
         IgnoreMinorErrors=>$$options{IgnoreMinorErrors},
@@ -3784,6 +3787,53 @@ sub GetWriteGroup1($$)
     return $self->GetGroup($tagInfo, 1);
 }
 
+#------------------------------------------------------------------------------
+# Get list of tags to write for Geolocate feature
+# Inputs: 0) ExifTool ref, 1) group name(s),
+#         2) 0=prefer writing City, 1=prefer writing GPS, undef=deleting tags
+# Returns: list of tags to write/delete
+sub GetGeolocateTags($$;$)
+{
+    my ($self, $wantGroup, $writeGPS) = @_;
+    my @grps = $wantGroup ? map lc, split(/:/, $wantGroup) : ();
+    my %grps = map { $_ => $_ } @grps;   # lookup for specified groups
+    $grps{exif} and not $grps{gps} and $grps{gps} = 'gps', push(@grps, 'gps');
+    my %tagGroups = (
+        'xmp-iptcext'   => [ qw(LocationShownCity LocationShownProvinceState LocationShownCountryCode
+                                LocationShownCountryName LocationShownGPSLatitude LocationShownGPSLongitude) ],
+        'xmp-photoshop' => [ qw(City State Country) ],
+        'xmp-iptccore'  => [ 'CountryCode' ],
+        'iptc'          => [ qw(City Province-State Country-PrimaryLocationCode Country-PrimaryLocationName) ],
+        'gps'           => [ qw(GPSLatitude GPSLongitude GPSLatitudeRef GPSLongitudeRef) ],
+        'xmp-exif'      => [ qw(GPSLatitude GPSLongitude) ],
+        'keys'          => [ 'GPSCoordinates' ],
+        'itemlist'      => [ 'GPSCoordinates' ],
+        'userdata'      => [ 'GPSCoordinates' ],
+        # more general groups not in this lookup: XMP and QuickTime 
+    );
+    my (@tags, $grp);
+    # set specific City and GPS tags
+    foreach $grp (@grps) {
+        $tagGroups{$grp} and push @tags, map("$grp:$_", @{$tagGroups{$grp}});
+    }
+    # set default XMP City tags if necessary
+    if (not $writeGPS and ($grps{xmp} or (not @tags and not $grps{quicktime}))) {
+        push @tags, qw(XMP:City XMP:State XMP:CountryCode XMP:Country);
+    }
+    $writeGPS = 1 unless defined $writeGPS; # (delete both City and GPS)
+    # set default QuickTime tag if necessary
+    my $didQT = grep /Coordinates$/, @tags;
+    if (($grps{quicktime} and not $didQT) or ($writeGPS and not @tags and not $grps{xmp})) {
+        push @tags, 'QuickTime:GPSCoordinates';
+    }
+    # set default GPS tags if necessary
+    if ($writeGPS) {
+        push @tags, qw(XMP:GPSLatitude XMP:GPSLongitude) if $grps{xmp} and not $grps{'xmp-exif'};
+        push @tags, qw(GPSLatitude GPSLongitude GPSLatitudeRef GPSLongitudeRef) if not $wantGroup;
+    }
+    return @tags;
+}
+
 #------------------------------------------------------------------------------
 # Get new value hash for specified tagInfo/writeGroup
 # Inputs: 0) ExifTool object reference, 1) reference to tag info hash

package/bin/lib/Image/ExifTool/XMP.pm

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.63';
+$VERSION = '3.64';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -171,6 +171,7 @@ my %xmpNS = (
     pmi       => 'http://prismstandard.org/namespaces/pmi/2.2/',
     prm       => 'http://prismstandard.org/namespaces/prm/3.0/',
     acdsee    => 'http://ns.acdsee.com/iptc/1.0/',
+   'acdsee-rs'=> 'http://ns.acdsee.com/regions/',
     digiKam   => 'http://www.digikam.org/ns/1.0/',
     swf       => 'http://ns.adobe.com/swf/1.0/',
     cell      => 'http://developer.sonyericsson.com/cell/1.0/',
@@ -802,6 +803,10 @@ my %sRangeMask = (
         Name => 'acdsee',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::acdsee' },
     },
+   'acdsee-rs' => {
+        Name => 'acdsee-rs',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::ACDSeeRegions' },
+    },
     digiKam => {
         Name => 'digiKam',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::digiKam' },
@@ -2554,7 +2559,17 @@ my %sPantryItem = (
             return $val;
         },
     },
-    ApproximateFocusDistance => { Writable => 'rational' }, #PH (LR3)
+    ApproximateFocusDistance => {
+        Writable => 'rational',
+        PrintConv => {
+            4294967295 => 'infinity',
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                return $val eq 'infinity' ? 4294967295 : $val if $inv;
+                return $val eq 4294967295 ? 'infinity' : $val;
+            },
+        },
+    }, #PH (LR3)
     # the following new in LR6 (ref forum6497)
     IsMergedPanorama         => { Writable => 'boolean' },
     IsMergedHDR              => { Writable => 'boolean' },

package/bin/lib/Image/ExifTool/XMP2.pl

@@ -224,6 +224,7 @@ my %sAppInfo = (
     fileDataRate    => { Writable => 'rational' },
     genre           => { },
     good            => { Writable => 'boolean' },
+    pick            => { Writable => 'integer' }, #forum15815
     instrument      => { },
     introTime       => { Struct => \%sTime },
     key => {
@@ -403,6 +404,18 @@ my %sLocationDetails = (
         PrintConv => '$val =~ /^(inf|undef)$/ ? $val : "$val m"',
         PrintConvInv => '$val=~s/\s*m$//;$val',
     },
+    GPSAltitudeRef  => {
+        Writable => 'integer',
+        PrintConv => {
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                return undef unless $inv and $val =~ /^([-+0-9])/;
+                return($1 eq '-' ? 1 : 0);
+            },
+            0 => 'Above Sea Level',
+            1 => 'Below Sea Level',
+        },
+    },
 );
 my %sCVTermDetails = (
     STRUCT_NAME => 'CVTermDetails',
@@ -1373,6 +1386,57 @@ my %sSubVersion = (
     Snapshots           => { List => 'Bag', Binary => 1 },
 );
 
+# ACDSee region tags (ref BKW)
+my %sACDSeeDimensions = (
+    STRUCT_NAME => 'ACDSeeDimensions',
+    NAMESPACE   => {'acdsee-stDim' => 'http://ns.acdsee.com/sType/Dimensions#'},
+    'w'         => { Writable => 'real' },
+    'h'         => { Writable => 'real' },
+    'unit'      => { },
+);
+my %sACDSeeArea = (
+    STRUCT_NAME => 'ACDSeeArea',
+    NAMESPACE => { 'acdsee-stArea' => 'http://ns.acdsee.com/sType/Area#' },
+    'x'     => { Writable => 'real' },
+    'y'     => { Writable => 'real' },
+    w       => { Writable => 'real' },
+    h       => { Writable => 'real' },
+);
+my %sACDSeeRegionStruct = (
+    STRUCT_NAME     => 'ACDSeeRegion',
+    NAMESPACE       => 'acdsee-rs',
+    ALGArea         => { Struct => \%sACDSeeArea },
+    DLYArea         => { Struct => \%sACDSeeArea },
+    Name            => { },
+    NameAssignType  => { },
+    Type            => { },
+);
+%Image::ExifTool::XMP::ACDSeeRegions = (
+    GROUPS => { 0 => 'XMP', 1 => 'XMP-acdsee-rs', 2 => 'Image' },
+    NAMESPACE => 'acdsee-rs',
+    WRITABLE => 'string',
+    AVOID => 1,
+    Regions => {
+        Name => 'RegionInfoACDSee',
+        FlatName => 'ACDSee',
+        # the "Struct" entry defines the structure fields
+        Struct => {
+            # optional structure name (used for warning messages only)
+            STRUCT_NAME => 'ACDSeeRegionInfo',
+            NAMESPACE   => 'acdsee-rs',
+            RegionList => {
+                FlatName => 'Region',
+                Struct => \%sACDSeeRegionStruct,
+                List => 'Bag',
+            },
+            AppliedToDimensions => {
+                FlatName => 'RegionAppliedToDimensions',
+                Struct => \%sACDSeeDimensions,
+            },
+        },
+    },
+);
+
 # Picture Licensing Universal System namespace properties (xmpPLUS)
 %Image::ExifTool::XMP::xmpPLUS = (
     %xmpTableDefaults,