exiftool_vendored 12.80.0 → 12.81.0

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

@@ -785,6 +785,7 @@ sub WriteQuickTime($$$)
     $et or return 1;    # allow dummy access to autoload this package
     my ($mdat, @mdat, @mdatEdit, $edit, $track, $outBuff, $co, $term, $delCount);
     my (%langTags, $canCreate, $delGrp, %boxPos, %didDir, $writeLast, $err, $atomCount);
+    my ($tag, $lastTag, $errStr);
     my $outfile = $$dirInfo{OutFile} || return 0;
     my $raf = $$dirInfo{RAF};       # (will be null for lower-level atoms)
     my $dataPt = $$dirInfo{DataPt}; # (will be null for top-level atoms)
@@ -857,7 +858,10 @@ sub WriteQuickTime($$$)
     }
     $atomCount = $$tagTablePtr{VARS}{ATOM_COUNT} if $$tagTablePtr{VARS};
 
+    $tag = $lastTag = '';
+
     for (;;) {      # loop through all atoms at this level
+        $lastTag = $tag if $$tagTablePtr{$tag};    # keep track of last known tag
         if (defined $atomCount and --$atomCount < 0 and $dataPt) {
             # stop processing now and just copy the rest of the atom
             Write($outfile, substr($$dataPt, $raf->Tell())) or $rtnVal=$rtnErr, $err=1;
@@ -876,15 +880,15 @@ sub WriteQuickTime($$$)
             last;
         }
         my $size = Get32u(\$hdr, 0) - 8;    # (atom size without 8-byte header)
-        my $tag = substr($hdr, 4, 4);
+        $tag = substr($hdr, 4, 4);
         if ($size == -7) {
             # read the extended size
-            $raf->Read($buff, 8) == 8 or $et->Error('Truncated extended atom'), last;
+            $raf->Read($buff, 8) == 8 or $errStr = 'Truncated extended atom', last;
             $hdr .= $buff;
             my ($hi, $lo) = unpack('NN', $buff);
             if ($hi or $lo > 0x7fffffff) {
                 if ($hi > 0x7fffffff) {
-                    $et->Error('Invalid atom size');
+                    $errStr = 'Invalid atom size';
                     last;
                 } elsif (not $et->Options('LargeFileSupport')) {
                     $et->Error('End of processing at large atom (LargeFileSupport not enabled)');
@@ -892,7 +896,7 @@ sub WriteQuickTime($$$)
                 }
             }
             $size = $hi * 4294967296 + $lo - 16;
-            $size < 0 and $et->Error('Invalid extended atom size'), last;
+            $size < 0 and $errStr = 'Invalid extended atom size', last;
         } elsif ($size == -8) {
             if ($dataPt) {
                 last if $$dirInfo{DirName} eq 'CanonCNTH';  # (this is normal for Canon CNTH atom)
@@ -908,7 +912,7 @@ sub WriteQuickTime($$$)
             }
             last;
         } elsif ($size < 0) {
-            $et->Error('Invalid atom size');
+            $errStr = 'Invalid atom size';
             last;
         }
 
@@ -952,11 +956,11 @@ sub WriteQuickTime($$$)
                 $tag = PrintableTagID($tag,3);
                 if ($size > $maxReadLen and $got == 0x10000) {
                     my $mb = int($size / 0x100000 + 0.5);
-                    $et->Error("'${tag}' atom is too large for rewriting ($mb MB)");
+                    $errStr = "'${tag}' atom is too large for rewriting ($mb MB)";
                 } else {
-                    $et->Error("Truncated '${tag}' atom");
+                    $errStr = "Truncated '${tag}' atom";
                 }
-                return $rtnVal;
+                last;
             }
         }
         # save the handler type for this track
@@ -1446,6 +1450,22 @@ sub WriteQuickTime($$$)
             Write($outfile, $hdr, $buff) or $rtnVal=$rtnErr, $err=1, last;
         }
     }
+    # ($errStr is set if there was an error that could possibly be due to an unknown trailer)
+    if ($errStr) {
+        if ($lastTag eq 'mdat' and not $dataPt and not $$tagTablePtr{$tag}) {
+            my $nvTrail = $et->GetNewValueHash($Image::ExifTool::Extra{Trailer});
+            if ($$et{DEL_GROUP}{Trailer} or ($nvTrail and not ($$nvTrail{Value} and $$nvTrail{Value}[0]))) {
+                $errStr =~ s/ is too large.*//;
+                $et->Warn('Deleted unknown trailer with ' . lcfirst($errStr));
+            } else {
+                $et->Warn('Unknown trailer with ' . lcfirst($errStr));
+                $et->Error('Use "-trailer=" to delete unknown trailer');
+            }
+        } else {
+            $et->Error($errStr);
+            return $dataPt ? undef : 1;
+        }
+    }
     $et->VPrint(0, "  [deleting $delCount $dirName tag".($delCount==1 ? '' : 's')."]\n") if $delCount;
 
     $createKeys &= ~0x01 unless $$addDirs{Keys};   # (Keys may have been written)

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

@@ -1297,6 +1297,7 @@ sub SetNewValuesFromFile($$;@)
         Filter          => $$options{Filter},
         FixBase         => $$options{FixBase},
         Geolocation     => $$options{Geolocation},
+        GeolocAltNames  => $$options{GeolocAltNames},
         GeolocFeature   => $$options{GeolocFeature},
         GeolocMinPop    => $$options{GeolocMinPop},
         GeolocMaxDist   => $$options{GeolocMaxDist},
@@ -1336,6 +1337,11 @@ sub SetNewValuesFromFile($$;@)
         XAttrTags       => $$options{XAttrTags},
         XMPAutoConv     => $$options{XMPAutoConv},
     );
+    # reset Geolocation option if we aren't copying any geolocation tags
+    if ($$options{Geolocation} and not grep /\bGeolocation/i, @setTags) {
+        $self->VPrint(0, '(resetting unnecessary Geolocation option)');
+        $$srcExifTool{OPTIONS}{Geolocation} = undef;
+    }
     $$srcExifTool{GLOBAL_TIME_OFFSET} = $$self{GLOBAL_TIME_OFFSET};
     $$srcExifTool{ALT_EXIFTOOL} = $$self{ALT_EXIFTOOL};
     foreach $tag (@setTags) {
@@ -3806,7 +3812,7 @@ sub GetGeolocateTags($$;$)
         'iptc'          => [ qw(City Province-State Country-PrimaryLocationCode Country-PrimaryLocationName) ],
         'gps'           => [ qw(GPSLatitude GPSLongitude GPSLatitudeRef GPSLongitudeRef) ],
         'xmp-exif'      => [ qw(GPSLatitude GPSLongitude) ],
-        'keys'          => [ 'GPSCoordinates' ],
+        'keys'          => [ 'GPSCoordinates', 'LocationName' ],
         'itemlist'      => [ 'GPSCoordinates' ],
         'userdata'      => [ 'GPSCoordinates' ],
         # more general groups not in this lookup: XMP and QuickTime 
@@ -3818,7 +3824,7 @@ sub GetGeolocateTags($$;$)
     }
     # 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);
+        push @tags, qw(XMP:City XMP:State XMP:CountryCode XMP:Country Keys:LocationName);
     }
     $writeGPS = 1 unless defined $writeGPS; # (delete both City and GPS)
     # set default QuickTime tag if necessary

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

@@ -2587,6 +2587,7 @@ my %sPantryItem = (
     EnhanceDenoiseAlreadyApplied    => { Writable => 'boolean' }, #forum14760
     EnhanceDenoiseVersion           => { }, #forum14760 integer?
     EnhanceDenoiseLumaAmount        => { }, #forum14760 integer?
+    # FujiRatingAlreadyApplied - boolean written by LR classic 13.2 (forum15815)
 );
 
 # IPTC Core namespace properties (Iptc4xmpCore) (ref 4)

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars);
 
-$VERSION = '12.80';
+$VERSION = '12.81';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -921,7 +921,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     DICOM=> '(.{128}DICM|\0[\x02\x04\x06\x08]\0[\0-\x20]|[\x02\x04\x06\x08]\0[\0-\x20]\0)',
     DOCX => 'PK\x03\x04',
     DPX  => '(SDPX|XPDS)',
-    DR4  => 'IIII\x04\0\x04\0',
+    DR4  => 'IIII[\x04|\x05]\0\x04\0',
     DSS  => '(\x02dss|\x03ds2)',
     DV   => '\x1f\x07\0[\x3f\xbf]', # (not tested if extension recognized)
     DWF  => '\(DWF V\d',
@@ -1103,6 +1103,7 @@ my @availableOptions = (
     [ 'FilterW',          undef,  'input filter when writing tag values' ],
     [ 'FixBase',          undef,  'fix maker notes base offsets' ],
     [ 'Geolocation',      undef,  'generate geolocation tags' ],
+    [ 'GeolocAltNames',   1,      'search alternate city names if available' ],
     [ 'GeolocFeature',    undef,  'regular expression of geolocation features to match' ],
     [ 'GeolocMinPop',     undef,  'minimum geolocation population' ],
     [ 'GeolocMaxDist',    undef,  'maximum geolocation distance' ],
@@ -1691,7 +1692,7 @@ my %systemTagsNotes = (
         Flags => ['Writable' ,'Protected', 'Binary'],
         Permanent => 0, # (this is 1 by default for MakerNotes tags)
         WriteCheck => q{
-            return undef if $val =~ /^IIII\x04\0\x04\0/;
+            return undef if $val =~ /^IIII[\x04|\x05]\0\x04\0/;
             return 'Invalid CanonDR4 data';
         },
     },
@@ -1988,27 +1989,34 @@ my %systemTagsNotes = (
         },
         ValueConvInv => q{
             require Image::ExifTool::Geolocation;
-            return $val if lc($val) eq 'geotag';
+            # write this tag later if geotagging
+            return $val if $val =~ /\bgeotag\b/i;
+            $val .= ',both';
             my $opts = $$self{OPTIONS};
-            my $geo = Image::ExifTool::Geolocation::Geolocate($self->Encode($val,'UTF8'),
-                $$opts{GeolocMinPop}, $$opts{GeolocMaxDist}, $$opts{Lang}, undef, $$opts{GeolocFeature});
-            return '' unless $geo;
-            if ($$geo[12] and $self->Warn('Multiple matching cities found',2)) {
+            my ($n, $i, $km, $be) = Image::ExifTool::Geolocation::Geolocate($self->Encode($val,'UTF8'), $opts);
+            return '' unless $n;
+            if ($n > 1 and $self->Warn('Multiple matching cities found',2)) {
                 warn "$$self{VALUE}{Warning}\n";
                 return '';
             }
-            my @tags = $self->GetGeolocateTags($wantGroup, defined $$geo[10] ? 0 : 1);
+            my @geo = Image::ExifTool::Geolocation::GetEntry($i, $$opts{Lang});
+            my @tags = $self->GetGeolocateTags($wantGroup, $km ? 0 : 1);
             my %geoNum = ( City => 0, Province => 1, State => 1, Code => 3, Country => 4,
                            Coordinates => 89, Latitude => 8, Longitude => 9 );
             my ($tag, $value);
             foreach $tag (@tags) {
                 if ($tag =~ /GPS(Coordinates|Latitude|Longitude)?/) {
-                    $value = $geoNum{$1} == 89 ? "$$geo[8],$$geo[9]" : $$geo[$geoNum{$1}];
+                    $value = $geoNum{$1} == 89 ? "$geo[8],$geo[9]" : $geo[$geoNum{$1}];
                 } elsif ($tag =~ /(Code)/ or $tag =~ /(City|Province|State|Country)/) {
-                    $value = $$geo[$geoNum{$1}];
+                    $value = $geo[$geoNum{$1}];
                     next unless defined $value;
                     $value = $self->Decode($value,'UTF8');
                     $value .= ' ' if $tag eq 'iptc:Country-PrimaryLocationCode'; # (IPTC requires 3-char code)
+                } elsif ($tag =~ /LocationName/) {
+                    $value = $geo[0] or next;
+                    $value .= ', ' . $geo[1] if $geo[1];
+                    $value .= ', ' . $geo[4] if $geo[4];
+                    $value = $self->Decode($value, 'UTF8');
                 } else {
                     next; # (shouldn't happen)
                 }
@@ -2017,13 +2025,15 @@ my %systemTagsNotes = (
             return '';
         },
         PrintConvInv => q{
-            return $val unless $val =~ /^([-+]?\d.*?[NS]?), ?([-+]?\d.*?[EW]?)$/ or
-                $val =~ /^\s*(-?\d+(?:\.\d+)?)\s*(-?\d+(?:\.\d+)?)\s*$/;
-            my ($lat, $lon) = ($1, $2);
-            require Image::ExifTool::GPS;
-            $lat = Image::ExifTool::GPS::ToDegrees($lat, 1, "lat");
-            $lon = Image::ExifTool::GPS::ToDegrees($lon, 1, "lon");
-            return "$lat, $lon";
+            my @args = split /\s*,\s*/, $val;
+            my $lat = 1;
+            foreach (@args) {
+                next unless /^[-+]?\d/;
+                require Image::ExifTool::GPS;
+                $_ = Image::ExifTool::GPS::ToDegrees($_, 1, $lat ? 'lat' : 'lon');
+                $lat ^= 1;
+            }
+            return join(',', @args);
         },
     },        
     GeolocationBearing  => { %geoInfo, 
@@ -4338,25 +4348,27 @@ sub DoneExtract($)
             }
             local $SIG{'__WARN__'} = \&SetWarning;
             undef $evalWarning;
-            my $geo = Image::ExifTool::Geolocation::Geolocate($arg, $$opts{GeolocMinPop},
-                                $$opts{GeolocMaxDist}, $$opts{Lang}, $$opts{Duplicates},
-                                $$opts{GeolocFeature});
-            # ($$geo[0] will be an ARRAY ref if multiple matches were found and the Duplicates option is set)
-            if ($geo and (ref $$geo[0] or not $$geo[12] or not $self->Warn('Multiple Geolocation cities are possible',2))) {
-                my $geoList = ref $$geo[0] ? $geo : [ $geo ];  # make a list if not done alreaday
-                foreach $geo (@$geoList) {
-                    $self->FoundTag(GeolocationCity => $$geo[0]);
-                    $self->FoundTag(GeolocationRegion => $$geo[1]) if $$geo[1];
-                    $self->FoundTag(GeolocationSubregion => $$geo[2]) if $$geo[2];
-                    $self->FoundTag(GeolocationCountryCode => $$geo[3]);
-                    $self->FoundTag(GeolocationCountry => $$geo[4]) if $$geo[4];
-                    $self->FoundTag(GeolocationTimeZone => $$geo[5]) if $$geo[5];
-                    $self->FoundTag(GeolocationFeatureCode => $$geo[6]);
-                    $self->FoundTag(GeolocationPopulation => $$geo[7]);
-                    $self->FoundTag(GeolocationPosition => "$$geo[8] $$geo[9]");
-                    $self->FoundTag(GeolocationDistance => $$geo[10]) if defined $$geo[10];
-                    $self->FoundTag(GeolocationBearing => $$geo[11]) if defined $$geo[11];
-                    $self->FoundTag(GeolocationWarning => "Search matched $$geo[12] cities") if $$geo[12] and $geo eq $$geoList[0];
+            $$opts{GeolocMulti} = $$opts{Duplicates};
+            my ($n, $i, $km, $be) = Image::ExifTool::Geolocation::Geolocate($arg, $opts);
+            delete $$opts{GeolocMulti};
+            # ($i will be an ARRAY ref if multiple matches were found and the Duplicates option is set)
+            if ($n and (ref $i or $n < 2 or not $self->Warn('Multiple Geolocation cities are possible',2))) {
+                my $list = ref $i ? $i : [ $i ];  # make a list if not done alreaday
+                foreach $i (@$list) {
+                    my @geo = Image::ExifTool::Geolocation::GetEntry($i, $$opts{Lang});
+                    $self->FoundTag(GeolocationCity => $geo[0]);
+                    $self->FoundTag(GeolocationRegion => $geo[1]) if $geo[1];
+                    $self->FoundTag(GeolocationSubregion => $geo[2]) if $geo[2];
+                    $self->FoundTag(GeolocationCountryCode => $geo[3]);
+                    $self->FoundTag(GeolocationCountry => $geo[4]) if $geo[4];
+                    $self->FoundTag(GeolocationTimeZone => $geo[5]) if $geo[5];
+                    $self->FoundTag(GeolocationFeatureCode => $geo[6]);
+                    $self->FoundTag(GeolocationPopulation => $geo[7]);
+                    $self->FoundTag(GeolocationPosition => "$geo[8] $geo[9]");
+                    next if $i != $$list[0];
+                    $self->FoundTag(GeolocationDistance => $km) if defined $km;
+                    $self->FoundTag(GeolocationBearing => $be) if defined $be;
+                    $self->FoundTag(GeolocationWarning => "Search matched $n cities") if $n > 1;
                 }
             } elsif ($evalWarning) {
                 $self->Warn(CleanWarning());
@@ -5040,6 +5052,7 @@ sub SetFoundTags($)
                 $allTag = 1;
             } elsif ($tag =~ /[*?]/) {
                 # allow wildcards in tag names
+                $tag =~ tr/-_A-Za-z0-9*?//dc; # sterilize
                 $tag =~ s/\*/[-\\w]*/g;
                 $tag =~ s/\?/[-\\w]/g;
                 $tag .= '( \\(.*)?' if $doDups or $allGrp;
@@ -5047,6 +5060,7 @@ sub SetFoundTags($)
                 next unless @matches;   # don't want entry in list for wildcard tags
                 $allTag = 1;
             } elsif ($doDups or defined $group) {
+                $tag =~ tr/-_A-Za-z0-9//dc; # sterilize
                 # must also look for tags like "Tag (1)"
                 # (but be sure not to match temporary ValueConv entries like "Tag #")
                 @matches = grep(/^$tag( \(|$)/i, keys %$tagHash);

data/bin/lib/Image/ExifTool.pod

@@ -728,6 +728,12 @@ to use for the geolocation input.  May also include regular expressions for
 more flexible matching.  See L<https://exiftool.org/geolocation.html> for
 more details.  Default is undef.
 
+=item GeolocAltNames
+
+Flag to search alternate Geolocation city names if available (ie. if
+$Image::ExifTool::Geolocation::altDir has been set).  Set to 0 to disable
+use of the alternate names.  Default is 1.
+
 =item GeolocFeature
 
 Comma-separated list of feature codes to include in city search, or exclude

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.80
+Version: 12.81
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('12.80.0')
+  VERSION = Gem::Version.new('12.81.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.80.0
+  version: 12.81.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool