exiftool_vendored 12.83.0 → 12.85.0

data/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 27849 tags, with 17438 unique tag names.
+They contain a total of 27859 tags, with 17442 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
@@ -7746,7 +7746,8 @@ These tags are used in Pentax/Asahi cameras.
   0x0229   SerialNumber                         string
   0x022a   FilterInfo                           Pentax FilterInfo
                                                 Pentax FilterInfo
-  0x022b   LevelInfo                            Pentax LevelInfo
+  0x022b   LevelInfoK3III                       Pentax LevelInfoK3III
+           LevelInfo                            Pentax LevelInfo
   0x022d   WBLevels                             Pentax WBLevels
   0x022e   Artist                               string
   0x022f   Copyright                            string
@@ -7919,7 +7920,8 @@ Auto-exposure information for the K-01.
 
 =head3 Pentax AEInfo3 Tags
 
-Auto-exposure information for the K-3, K-30, K-50 and K-500.
+Auto-exposure information for the K-1mkII, K-3, K-30, K-50, K-70, K-500 and
+KP.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -8050,7 +8052,9 @@ Flash information tags for the K10D, K20D and K200D.
   Index1   Tag Name                             Writable
   ------   --------                             --------
     0.1    PowerSource                          int8u & 0x0f
+           Tag01                                int8u & 0x0f
     1.1    BodyBatteryState                     int8u & 0xf0
+           BodyBatteryState?                    int8u & 0xf0
     1.2    GripBatteryState                     int8u & 0x0f
            GripBatteryState?                    int8u & 0x0f
       2    BodyBatteryADNoLoad                  int8u
@@ -8072,6 +8076,7 @@ Flash information tags for the K10D, K20D and K200D.
       6    AFDefocus                            int8u
       7    AFIntegrationTime                    int8u
      11    AFPointsInFocus                      int8u
+    506    LiveView                             int8u
     509    AFHold                               int8u
 
 =head3 Pentax KelvinWB Tags
@@ -8111,6 +8116,7 @@ White balance Blue/Red gains as a function of color temperature.
   ------   --------                             --------
       0    EVSteps                              int8u
       1    SensitivitySteps                     int8u
+      3    LiveView                             int8u
 
 =head3 Pentax ShotInfo Tags
 
@@ -8224,6 +8230,15 @@ used.
     311    DigitalFilter19                      undef[17]
     328    DigitalFilter20                      undef[17]
 
+=head3 Pentax LevelInfoK3III Tags
+
+Tags decoded from the electronic level information for the K-3 III.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      3    RollAngle                            int16s
+      5    PitchAngle                           int16s
+
 =head3 Pentax LevelInfo Tags
 
 Tags decoded from the electronic level information for the K-5.  May not be
@@ -8903,12 +8918,16 @@ Tags extracted from the maker notes of iPhone images.
   0x0019   ImageProcessingFlags?                int32s
   0x001a   QualityHint?                         string
   0x001d   LuminanceNoiseAmplitude              rational64s
+  0x001f   PhotosAppFeatureFlags                int32s
   0x0020   ImageCaptureRequestID?               string
   0x0021   HDRHeadroom                          rational64s
+  0x0023   AFPerformance                        int32s[2]
   0x0025   SceneFlags?                          int32s
   0x0026   SignalToNoiseRatioType?              int32s
   0x0027   SignalToNoiseRatio                   rational64s
   0x002b   PhotoIdentifier                      string
+  0x002d   ColorTemperature                     int32s
+  0x002e   CameraType                           int32s
   0x002f   FocusPosition                        int32s
   0x0030   HDRGain                              rational64s
   0x0038   AFMeasuredDepth                      int32s
@@ -8918,7 +8937,8 @@ Tags extracted from the maker notes of iPhone images.
   0x0040   SemanticStyle                        no
   0x0041   SemanticStyleRenderingVer            no
   0x0042   SemanticStylePreset                  no
-  0x0045   FrontFacingCamera                    int32s
+  0x004e   Apple_0x004e?                        no
+  0x004f   Apple_0x004f?                        no
 
 =head3 Apple RunTime Tags
 
@@ -9333,6 +9353,7 @@ Unknown only to reduce the volume of the normal output.
      41    ManualFlashOutput                    int16s
      42    ColorTone                            int16s
      46    SRAWQuality                          int16s
+     51    Clarity                              int16s
 
 =head3 Canon FocalLength Tags
 
@@ -10455,6 +10476,8 @@ WB tags for the Canon G9.
      11    DigitalGain                          int16s
      12    WBShiftAB                            int16s
      13    WBShiftGM                            int16s
+     14    UnsharpMaskFineness                  int16s
+     15    UnsharpMaskThreshold                 int16s
 
 =head3 Canon ColorBalance Tags
 
@@ -12287,6 +12310,7 @@ below by a decimal appended to the tag ID (.0, .1 or .2).
   0x10002      Rotation                         yes
   0x10003      AngleAdj                         yes
   0x10021      CustomPictureStyle               yes
+  0x10100      Rating                           yes
   0x10101      CheckMark                        yes
   0x10200      WorkColorSpace                   yes
   0x20001      RawBrightnessAdj                 yes
@@ -29122,7 +29146,7 @@ ID3 version 2.2 tags.  (These are the tags written by iTunes 5.0.)
   'TT2'    Title                                no
   'TT3'    Subtitle                             no
   'TXT'    Lyricist                             no
-  'TXX'    UserDefinedText                      no
+  'TXX'    TXX                                  ID3 UserDefined
   'TYE'    Year                                 no
   'ULT'    Lyrics                               no
   'WAF'    FileURL                              no
@@ -29131,7 +29155,7 @@ ID3 version 2.2 tags.  (These are the tags written by iTunes 5.0.)
   'WCM'    CommercialURL                        no
   'WCP'    CopyrightURL                         no
   'WPB'    PublisherURL                         no
-  'WXX'    UserDefinedURL                       no
+  'WXX'    WXX                                  ID3 UserDefined
 
 =head3 ID3 SynLyrics Tags
 
@@ -29143,6 +29167,15 @@ The following tags are extracted from synchronized lyrics/text frames.
   SynchronizedLyricsText                        no+
   SynchronizedLyricsType                        no
 
+=head3 ID3 UserDefined Tags
+
+ID3 user-defined text and URL tags will be dynamically added to this table
+by name when found.
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  [no tags known]
+
 =head3 ID3 v2_3 Tags
 
 ID3 version 2.3 tags.  Includes some non-standard tags written by other
@@ -29212,7 +29245,7 @@ software.
   'TSOC'   ComposerSortOrder                    no
   'TSRC'   ISRC                                 no
   'TSSE'   EncoderSettings                      no
-  'TXXX'   UserDefinedText                      no
+  'TXXX'   TXXX                                 ID3 UserDefined
   'TYER'   Year                                 no
   'USER'   TermsOfUse                           no
   'USLT'   Lyrics                               no
@@ -29225,7 +29258,7 @@ software.
   'WORS'   InternetRadioStationURL              no
   'WPAY'   PaymentURL                           no
   'WPUB'   PublisherURL                         no
-  'WXXX'   UserDefinedURL                       no
+  'WXXX'   WXXX                                 ID3 UserDefined
   'XDOR'   OriginalReleaseTime                  no
   'XOLY'   OlympusDSS                           Olympus DSS
   'XSOA'   AlbumSortOrder                       no
@@ -29336,7 +29369,7 @@ software.
   'TSRC'   ISRC                                 no
   'TSSE'   EncoderSettings                      no
   'TSST'   SetSubtitle                          no
-  'TXXX'   UserDefinedText                      no
+  'TXXX'   TXXX                                 ID3 UserDefined
   'USER'   TermsOfUse                           no
   'USLT'   Lyrics                               no
   'WCOM'   CommercialURL                        no
@@ -29348,7 +29381,7 @@ software.
   'WORS'   InternetRadioStationURL              no
   'WPAY'   PaymentURL                           no
   'WPUB'   PublisherURL                         no
-  'WXXX'   UserDefinedURL                       no
+  'WXXX'   WXXX                                 ID3 UserDefined
   'XDOR'   OriginalReleaseTime                  no
   'XOLY'   OlympusDSS                           Olympus DSS
   'XSOA'   AlbumSortOrder                       no
@@ -30732,6 +30765,7 @@ the config file.
   'RDTC'       RicohRDTC                        Ricoh RDTC
   'RDTG'       RicohRDTG                        Ricoh RDTG
   'RDTL'       RicohRDTL                        Ricoh RDTL
+  'RICO'       RicohInfo                        EXIF
   'RMKN'       RicohRMKN                        EXIF
   'RTHU'       PreviewImage                     no
   'SDLN'       PlayMode                         string
@@ -40057,6 +40091,7 @@ FileName.
   GeolocationCountryCode     ExifTool           no
   GeolocationDistance        ExifTool           no
   GeolocationFeatureCode     ExifTool           no
+  GeolocationFeatureType     ExifTool           no
   GeolocationPopulation      ExifTool           no
   GeolocationPosition        ExifTool           no
   GeolocationRegion          ExifTool           no

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

@@ -876,7 +876,8 @@ sub WriteQuickTime($$$)
                 # --> hold this terminator to the end
                 $term = $hdr;
             } elsif ($n != 0) {
-                $et->Error("Unknown $n bytes at end of file", 1);
+                # warn unless this is 1-3 pad bytes
+                $et->Error("Unknown $n bytes at end of file", 1) if $n > 3 or $hdr ne "\0" x $n;
             }
             last;
         }

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

@@ -29,7 +29,6 @@ sub ConvInv($$$$$;$$);
 sub PushValue($$$;$);
 
 my $loadedAllTables;    # flag indicating we loaded all tables
-my $advFmtSelf;         # ExifTool object during evaluation of advanced formatting expr
 
 # the following is a road map of where we write each directory
 # in the different types of files.
@@ -1271,16 +1270,16 @@ sub SetNewValuesFromFile($$;@)
         $opts{SrcType} = $opts{Type};
         # override PrintConv option with initial Type if given
         $printConv = ($opts{Type} eq 'PrintConv' ? 1 : 0);
-        $srcExifTool->Options(PrintConv => $printConv);
     }
     my $srcType = $printConv ? 'PrintConv' : 'ValueConv';
     my $structOpt = defined $$options{Struct} ? $$options{Struct} : 2;
 
     if (ref $srcFile and UNIVERSAL::isa($srcFile,'Image::ExifTool')) {
         $srcExifTool = $srcFile;
-        $info = $srcExifTool->GetInfo();
+        $info = $srcExifTool->GetInfo({ PrintConv => $printConv });
     } else {
         $srcExifTool = Image::ExifTool->new;
+        $srcExifTool->Options(PrintConv => $printConv);
         # set flag to indicate we are being called from inside SetNewValuesFromFile()
         $$srcExifTool{TAGS_FROM_FILE} = 1;
         # synchronize and increment the file sequence number
@@ -3380,7 +3379,7 @@ sub InsertTagValues($$;$$$$)
         if (defined $expr and defined $val) {
             local $SIG{'__WARN__'} = \&SetWarning;
             undef $evalWarning;
-            $advFmtSelf = $self;
+            $advFmtSelf = $self;    # set variable for access to $self in helper functions
             if ($asList) {
                 foreach (@val) {
                     #### eval advanced formatting expression ($_, $self, @val, $tag, $advFmtSelf)
@@ -3477,13 +3476,14 @@ sub NoDups
 #------------------------------------------------------------------------------
 # Utility routine to set in $_ image from current object
 # Inputs: 0-N) list of tags to copy
+# Returns: Return value from WriteInfo
 # Notes: - for use only in advanced formatting expressions
 sub SetTags(@)
 {
     my $self = $advFmtSelf;
     my $et = Image::ExifTool->new;
     $et->SetNewValuesFromFile($self, @_);
-    $et->WriteInfo(\$_);
+    return $et->WriteInfo(\$_);
 }
 
 #------------------------------------------------------------------------------

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

@@ -3794,6 +3794,8 @@ sub ParseXMPElement($$$;$$$$)
                         if ($stdNS) {
                             $val = $try;
                             $et->WarnOnce("Fixed incorrect URI for xmlns:$ns", 1);
+                        } elsif ($val =~ m(^http://ns.nikon.com/BASIC_PARAM)) {
+                            $et->OverrideFileType('NXD','application/x-nikon-nxd');
                         } else {
                             # look for same namespace with different version number
                             $try = quotemeta $val; # (note: escapes slashes too)

data/bin/lib/Image/ExifTool.pm

@@ -27,9 +27,9 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %noWriteFile %magicNumber @langs $defaultLang %langName %charsetName
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
-            %static_vars);
+            %static_vars $advFmtSelf);
 
-$VERSION = '12.83';
+$VERSION = '12.85';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -198,7 +198,7 @@ $defaultLang = 'en';    # default language
                 RAR 7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font
                 JUMBF RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard
                 LRI R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD
-                ICO TXT AAC);
+                NKA ICO TXT AAC);
 
 # file types that we can write (edit)
 my @writeTypes = qw(JPEG TIFF GIF CRW MRW ORF RAF RAW PNG MIE PSD XMP PPM EPS
@@ -210,7 +210,7 @@ my %writeTypes; # lookup for writable file types (hash filled if required)
 # (See here for 3FR reason: https://exiftool.org/forum/index.php?msg=17570)
 %noWriteFile = (
     TIFF => [ qw(3FR DCR K25 KDC SRF) ],
-    XMP  => [ qw(SVG INX) ],
+    XMP  => [ qw(SVG INX NXD) ],
     JP2  => [ qw(J2C JPC) ],
     MOV  => [ qw(INSV) ],
 );
@@ -426,10 +426,12 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
   # NDPI => ['TIFF', 'Hamamatsu NanoZoomer Digital Pathology Image'],
     NEF  => ['TIFF', 'Nikon (RAW) Electronic Format'],
     NEWER => 'COS',
+    NKA  => ['NKA',  'Nikon NX Studio Settings'],
     NKSC => ['XMP',  'Nikon Sidecar'],
     NMBTEMPLATE => ['ZIP','Apple Numbers Template'],
     NRW  => ['TIFF', 'Nikon RAW (2)'],
     NUMBERS => ['ZIP','Apple Numbers spreadsheet'],
+    NXD  => ['XMP',  'Nikon NX-D Settings'],
     O    => ['EXE',  'Relocatable Object'],
     ODB  => ['ZIP',  'Open Document Database'],
     ODC  => ['ZIP',  'Open Document Chart'],
@@ -869,6 +871,7 @@ my %moduleName = (
     MKV  => 'Matroska',
     MP3  => 'ID3',
     MRW  => 'MinoltaRaw',
+    NKA  => 'Nikon',
     OGG  => 'Ogg',
     ORF  => 'Olympus',
     PDB  => 'Palm',
@@ -972,6 +975,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     MRC  => '.{64}[\x01\x02\x03]\0\0\0[\x01\x02\x03]\0\0\0[\x01\x02\x03]\0\0\0.{132}MAP[\0 ](\x44\x44|\x44\x41|\x11\x11)\0\0',
     MRW  => '\0MR[MI]',
     MXF  => '\x06\x0e\x2b\x34\x02\x05\x01\x01\x0d\x01\x02', # (not tested if extension recognized)
+    NKA  => 'NIKONADJ',
     OGG  => '(OggS|ID3)',
     ORF  => '(II|MM)',
   # PCD  =>  signature is at byte 2048
@@ -1176,7 +1180,7 @@ my @defaultWriteGroups = qw(
 
 # group hash for ExifTool-generated tags
 my %allGroupsExifTool = ( 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'ExifTool' );
-my %geoInfo = ( Groups => { 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'Location' }, Priority => 0 );
+my %geoInfo = ( Groups => { 0 => 'ExifTool', 1 => 'ExifTool', 2 => 'Location' } );
 
 # special tag names (not used for tag info)
 %specialTags = map { $_ => 1 } qw(
@@ -1269,6 +1273,7 @@ my %systemTagsNotes = (
         },
         Writable => 1,
         WritePseudo => 1,
+        Priority => 2,
         DelCheck => q{"Can't delete"},
         Protected => 1,
         RawConv => '$self->ConvertFileName($val)',
@@ -1281,6 +1286,7 @@ my %systemTagsNotes = (
         WritePseudo => 1,
         DelCheck => q{"Can't delete"},
         Protected => 1,
+        Priority => 2,
         Notes => q{
             may be written with a full path name to set FileName and Directory in one
             operation.  This is such a powerful feature that a TestName tag is provided
@@ -1293,6 +1299,7 @@ my %systemTagsNotes = (
     },
     BaseName => {
         Groups => { 1 => 'System', 2 => 'Other' },
+        Priority => 2,
         Notes => q{
             file name without extension. Not generated unless specifically requested or
             the API L<RequestAll|../ExifTool.html#RequestAll> option is set
@@ -1362,6 +1369,7 @@ my %systemTagsNotes = (
     },
     FileType => {
         Groups => { 2 => 'Other' },
+        Priority => 2,
         Notes => q{
             a short description of the file type.  For many file types this is the just
             the uppercase file extension
@@ -1995,14 +2003,14 @@ my %systemTagsNotes = (
             return $val if $val =~ /\bgeotag\b/i;
             $val .= ',both';
             my $opts = $$self{OPTIONS};
-            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)) {
+            my ($cities, $dist) = Image::ExifTool::Geolocation::Geolocate($self->Encode($val,'UTF8'), $opts);
+            return '' unless $cities;
+            if (@$cities > 1 and $self->Warn('Multiple matching cities found',2)) {
                 warn "$$self{VALUE}{Warning}\n";
                 return '';
             }
-            my @geo = Image::ExifTool::Geolocation::GetEntry($i, $$opts{Lang});
-            my @tags = $self->GetGeolocateTags($wantGroup, $km ? 0 : 1);
+            my @geo = Image::ExifTool::Geolocation::GetEntry($$cities[0], $$opts{Lang});
+            my @tags = $self->GetGeolocateTags($wantGroup, $dist ? 0 : 1);
             my %geoNum = ( City => 0, Province => 1, State => 1, Code => 3, Country => 4,
                            Coordinates => 89, Latitude => 8, Longitude => 9 );
             my ($tag, $value);
@@ -2049,8 +2057,9 @@ my %systemTagsNotes = (
     GeolocationSubregion=> { %geoInfo, Notes => 'geolocation county or subregion', ValueConv => '$self->Decode($val,"UTF8")' },
     GeolocationCountry  => { %geoInfo, Notes => 'geolocation country name', ValueConv => '$self->Decode($val,"UTF8")' },
     GeolocationCountryCode=>{%geoInfo, Notes => 'geolocation country code' },
-    GeolocationTimeZone => { %geoInfo, Notes => 'geolocation time zone name' },
-    GeolocationFeatureCode=>{%geoInfo, Notes => 'feature code, see L<http://www.geonames.org/export/codes.html#P>' },
+    GeolocationTimeZone => { %geoInfo, Notes => 'geolocation time zone ID' },
+    GeolocationFeatureCode=>{%geoInfo, Notes => 'geolocation feature code, see L<http://www.geonames.org/export/codes.html#P>' },
+    GeolocationFeatureType=>{%geoInfo, Notes => 'geolocation feature type' },
     GeolocationPopulation=>{ %geoInfo, Notes => 'city population rounded to 2 significant digits' },
     GeolocationDistance => { %geoInfo, Notes => 'distance in km from current GPS to city', PrintConv => '"$val km"' },
     GeolocationPosition => { %geoInfo, Notes => 'approximate GPS coordinates of city',
@@ -2556,6 +2565,8 @@ sub Options($$;@)
             } else {
                 warn("Can't set $param to undef\n");
             }
+        } elsif (lc $param eq 'geodir') {
+            $Image::ExifTool::Geolocation::geoDir = $newVal; # (undocumented)
         } else {
             if ($param eq 'Escape') {
                 # set ESCAPE_PROC
@@ -2574,7 +2585,15 @@ sub Options($$;@)
                 delete $$self{GLOBAL_TIME_OFFSET};  # reset our calculated offset
             } elsif ($param eq 'TimeZone' and defined $newVal and length $newVal) {
                 $ENV{TZ} = $newVal;
-                eval { require POSIX; POSIX::tzset() };
+                if ($^O eq 'MSWin32') {
+                    if (eval { require Time::Piece }) {
+                        eval { Time::Piece::_tzset() };
+                    } else {
+                        warn("Install Time::Piece to set time zone in Windows\n");
+                    }
+                } else {
+                    eval { require POSIX; POSIX::tzset() };
+                }
             } elsif ($param eq 'Validate') {
                 # load Validate module if Validate option enabled
                 $newVal and require Image::ExifTool::Validate;
@@ -4362,13 +4381,14 @@ sub DoneExtract($)
             local $SIG{'__WARN__'} = \&SetWarning;
             undef $evalWarning;
             $$opts{GeolocMulti} = $$opts{Duplicates};
-            my ($n, $i, $km, $be) = Image::ExifTool::Geolocation::Geolocate($arg, $opts);
+            my ($cities, $dist) = 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});
+            if ($cities and (@$cities < 2 or $dist or not $self->Warn('Multiple Geolocation cities are possible',2))) {
+                $self->FoundTag(GeolocationWarning => 'Search matched '.scalar(@$cities).' cities') if @$cities > 1;
+                my $city;
+                foreach $city (@$cities) {
+                    $$self{DOC_NUM} = ++$$self{DOC_COUNT} unless $city eq $$cities[0];
+                    my @geo = Image::ExifTool::Geolocation::GetEntry($city, $$opts{Lang});
                     $self->FoundTag(GeolocationCity => $geo[0]);
                     $self->FoundTag(GeolocationRegion => $geo[1]) if $geo[1];
                     $self->FoundTag(GeolocationSubregion => $geo[2]) if $geo[2];
@@ -4376,13 +4396,17 @@ sub DoneExtract($)
                     $self->FoundTag(GeolocationCountry => $geo[4]) if $geo[4];
                     $self->FoundTag(GeolocationTimeZone => $geo[5]) if $geo[5];
                     $self->FoundTag(GeolocationFeatureCode => $geo[6]);
+                    $self->FoundTag(GeolocationFeatureType => $geo[10]) if $geo[10];
                     $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;
+                    if ($dist) {
+                        $self->FoundTag(GeolocationDistance => $$dist[0][0]);
+                        $self->FoundTag(GeolocationBearing => $$dist[0][1]);
+                        shift @$dist;
+                    }
+                    last unless $$opts{Duplicates};
                 }
+                delete $$self{DOC_NUM};
             } elsif ($evalWarning) {
                 $self->Warn(CleanWarning());
             }
@@ -6363,6 +6387,7 @@ sub TimeLocal(@)
     if ($^O eq 'MSWin32') {
         # patch for ActivePerl timezone bug
         my @t2 = localtime($tm);
+        $t2[5] += 1900;
         my $t2 = Time::Local::timelocal(@t2);
         # adjust timelocal() return value to be consistent with localtime()
         $tm += $tm - $t2;