exiftool-vendored.pl 12.82.0 → 12.84.0

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

@@ -1234,7 +1234,8 @@ WriteAlso:
 
 #------------------------------------------------------------------------------
 # set new values from information in specified file
-# Inputs: 0) ExifTool object reference, 1) source file name or reference, etc
+# Inputs: 0) ExifTool object reference, 1) source file name or reference, etc,
+#         or ExifTool ref to use already-extracted tags from an ExifTool object,
 #         2-N) List of tags to set (or all if none specified), or reference(s) to
 #         hash for options to pass to SetNewValue.  The Replace option defaults
 #         to 1 for SetNewValuesFromFile -- set this to 0 to allow multiple tags
@@ -1245,11 +1246,12 @@ WriteAlso:
 #        be used to represent all tags in a group.  An optional destination tag
 #        may be specified with '>DSTTAG' ('DSTTAG<TAG' also works, but in this
 #        case the source tag may also be an expression involving tag names).
+#        Simple assignments are also allowed: 'DSTTAG[#][+-][^]=[string]'
 sub SetNewValuesFromFile($$;@)
 {
     local $_;
     my ($self, $srcFile, @setTags) = @_;
-    my ($key, $tag, @exclude, @reqTags);
+    my ($srcExifTool, $key, $tag, @exclude, @reqTags, $info);
 
     # get initial SetNewValuesFromFile options
     my %opts = ( Replace => 1 );    # replace existing list items by default
@@ -1261,125 +1263,131 @@ sub SetNewValuesFromFile($$;@)
     }
     # expand shortcuts
     @setTags and ExpandShortcuts(\@setTags);
-    my $srcExifTool = Image::ExifTool->new;
-    # set flag to indicate we are being called from inside SetNewValuesFromFile()
-    $$srcExifTool{TAGS_FROM_FILE} = 1;
-    # synchronize and increment the file sequence number
-    $$srcExifTool{FILE_SEQUENCE} = $$self{FILE_SEQUENCE}++;
     # set options for our extraction tool
     my $options = $$self{OPTIONS};
-    # copy both structured and flattened tags by default (but flattened tags are "unsafe")
-    my $structOpt = defined $$options{Struct} ? $$options{Struct} : 2;
-    # copy structures only if no tags specified (since flattened tags are "unsafe")
-    $structOpt = 1 if $structOpt eq '2' and not @setTags;
-    # +------------------------------------------+
-    # ! DON'T FORGET!!  Must consider each new   !
-    # ! option to decide how it is handled here. !
-    # +------------------------------------------+
-    $srcExifTool->Options(
-        Binary          => 1,
-        ByteUnit        => $$options{ByteUnit},
-        Charset         => $$options{Charset},
-        CharsetEXIF     => $$options{CharsetEXIF},
-        CharsetFileName => $$options{CharsetFileName},
-        CharsetID3      => $$options{CharsetID3},
-        CharsetIPTC     => $$options{CharsetIPTC},
-        CharsetPhotoshop=> $$options{CharsetPhotoshop},
-        Composite       => $$options{Composite},
-        CoordFormat     => $$options{CoordFormat} || '%d %d %.8f', # copy coordinates at high resolution unless otherwise specified
-        DateFormat      => $$options{DateFormat},
-        Duplicates      => 1,
-        Escape          => $$options{Escape},
-      # Exclude (set below)
-        ExtendedXMP     => $$options{ExtendedXMP},
-        ExtractEmbedded => $$options{ExtractEmbedded},
-        FastScan        => $$options{FastScan},
-        Filter          => $$options{Filter},
-        FixBase         => $$options{FixBase},
-        Geolocation     => $$options{Geolocation},
-        GeolocAltNames  => $$options{GeolocAltNames},
-        GeolocFeature   => $$options{GeolocFeature},
-        GeolocMinPop    => $$options{GeolocMinPop},
-        GeolocMaxDist   => $$options{GeolocMaxDist},
-        GlobalTimeShift => $$options{GlobalTimeShift},
-        HexTagIDs       => $$options{HexTagIDs},
-        IgnoreMinorErrors=>$$options{IgnoreMinorErrors},
-        IgnoreTags      => $$options{IgnoreTags},
-        ImageHashType   => $$options{ImageHashType},
-        Lang            => $$options{Lang},
-        LargeFileSupport=> $$options{LargeFileSupport},
-        LimitLongValues => 10000000, # (10 MB)
-        List            => 1,
-        ListItem        => $$options{ListItem},
-        ListSep         => $$options{ListSep},
-        MakerNotes      => $$options{FastScan} && $$options{FastScan} > 1 ? undef : 1,
-        MDItemTags      => $$options{MDItemTags},
-        MissingTagValue => $$options{MissingTagValue},
-        NoPDFList       => $$options{NoPDFList},
-        NoWarning       => $$options{NoWarning},
-        Password        => $$options{Password},
-        PrintConv       => $$options{PrintConv},
-        QuickTimeUTC    => $$options{QuickTimeUTC},
-        RequestAll      => $$options{RequestAll} || 1, # (is this still necessary now that RequestTags are being set?)
-        RequestTags     => $$options{RequestTags},
-        SaveFormat      => $$options{SaveFormat},
-        SavePath        => $$options{SavePath},
-        ScanForXMP      => $$options{ScanForXMP},
-        StrictDate      => defined $$options{StrictDate} ? $$options{StrictDate} : 1,
-        Struct          => $structOpt,
-        StructFormat    => $$options{StructFormat},
-        SystemTags      => $$options{SystemTags},
-        TimeZone        => $$options{TimeZone},
-        Unknown         => $$options{Unknown},
-        UserParam       => $$options{UserParam},
-        Validate        => $$options{Validate},
-        WindowsWideFile => $$options{WindowsWideFile},
-        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) {
-        next if ref $tag;
-        if ($tag =~ /^-(.*)/) {
-            # avoid extracting tags that are excluded
-            push @exclude, $1;
-            next;
-        }
-        # add specified tags to list of requested tags
-        $_ = $tag;
-        if (/(.+?)\s*(>|<)\s*(.+)/) {
-            if ($2 eq '>') {
-                $_ = $1;
-            } else {
-                $_ = $3;
-                /\$/ and push(@reqTags, /\$\{?(?:[-\w]+:)*([-\w?*]+)/g), next;
-            }
-        }
-        push @reqTags, $2 if /(^|:)([-\w?*]+)#?$/;
-    }
-    if (@exclude) {
-        ExpandShortcuts(\@exclude, 1);
-        $srcExifTool->Options(Exclude => \@exclude);
-    }
-    $srcExifTool->Options(RequestTags => \@reqTags) if @reqTags;
     my $printConv = $$options{PrintConv};
     if ($opts{Type}) {
         # save source type separately because it may be different than dst Type
         $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;
 
-    # get all tags from source file (including MakerNotes block)
-    my $info = $srcExifTool->ImageInfo($srcFile);
+    if (ref $srcFile and UNIVERSAL::isa($srcFile,'Image::ExifTool')) {
+        $srcExifTool = $srcFile;
+        $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
+        $$srcExifTool{FILE_SEQUENCE} = $$self{FILE_SEQUENCE}++;
+        # copy both structured and flattened tags by default (but flattened tags are "unsafe")
+        # copy structures only if no tags specified (since flattened tags are "unsafe")
+        $structOpt = 1 if $structOpt eq '2' and not @setTags;
+        # +------------------------------------------+
+        # ! DON'T FORGET!!  Must consider each new   !
+        # ! option to decide how it is handled here. !
+        # +------------------------------------------+
+        $srcExifTool->Options(
+            Binary          => 1,
+            ByteUnit        => $$options{ByteUnit},
+            Charset         => $$options{Charset},
+            CharsetEXIF     => $$options{CharsetEXIF},
+            CharsetFileName => $$options{CharsetFileName},
+            CharsetID3      => $$options{CharsetID3},
+            CharsetIPTC     => $$options{CharsetIPTC},
+            CharsetPhotoshop=> $$options{CharsetPhotoshop},
+            Composite       => $$options{Composite},
+            CoordFormat     => $$options{CoordFormat} || '%d %d %.8f', # copy coordinates at high resolution unless otherwise specified
+            DateFormat      => $$options{DateFormat},
+            Duplicates      => 1,
+            Escape          => $$options{Escape},
+          # Exclude (set below)
+            ExtendedXMP     => $$options{ExtendedXMP},
+            ExtractEmbedded => $$options{ExtractEmbedded},
+            FastScan        => $$options{FastScan},
+            Filter          => $$options{Filter},
+            FixBase         => $$options{FixBase},
+            Geolocation     => $$options{Geolocation},
+            GeolocAltNames  => $$options{GeolocAltNames},
+            GeolocFeature   => $$options{GeolocFeature},
+            GeolocMinPop    => $$options{GeolocMinPop},
+            GeolocMaxDist   => $$options{GeolocMaxDist},
+            GlobalTimeShift => $$options{GlobalTimeShift},
+            HexTagIDs       => $$options{HexTagIDs},
+            IgnoreGroups    => $$options{IgnoreGroups},
+            IgnoreMinorErrors=>$$options{IgnoreMinorErrors},
+            IgnoreTags      => $$options{IgnoreTags},
+            ImageHashType   => $$options{ImageHashType},
+            Lang            => $$options{Lang},
+            LargeFileSupport=> $$options{LargeFileSupport},
+            LimitLongValues => 10000000, # (10 MB)
+            List            => 1,
+            ListItem        => $$options{ListItem},
+            ListSep         => $$options{ListSep},
+            MakerNotes      => $$options{FastScan} && $$options{FastScan} > 1 ? undef : 1,
+            MDItemTags      => $$options{MDItemTags},
+            MissingTagValue => $$options{MissingTagValue},
+            NoPDFList       => $$options{NoPDFList},
+            NoWarning       => $$options{NoWarning},
+            Password        => $$options{Password},
+            PrintConv       => $$options{PrintConv},
+            QuickTimeUTC    => $$options{QuickTimeUTC},
+            RequestAll      => $$options{RequestAll} || 1, # (is this still necessary now that RequestTags are being set?)
+            RequestTags     => $$options{RequestTags},
+            SaveFormat      => $$options{SaveFormat},
+            SavePath        => $$options{SavePath},
+            ScanForXMP      => $$options{ScanForXMP},
+            StrictDate      => defined $$options{StrictDate} ? $$options{StrictDate} : 1,
+            Struct          => $structOpt,
+            StructFormat    => $$options{StructFormat},
+            SystemTags      => $$options{SystemTags},
+            TimeZone        => $$options{TimeZone},
+            Unknown         => $$options{Unknown},
+            UserParam       => $$options{UserParam},
+            Validate        => $$options{Validate},
+            WindowsWideFile => $$options{WindowsWideFile},
+            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) {
+            next if ref $tag;
+            if ($tag =~ /^-(.*)/) {
+                # avoid extracting tags that are excluded
+                push @exclude, $1;
+                next;
+            }
+            # add specified tags to list of requested tags
+            $_ = $tag;
+            if (/(.+?)\s*(>|<)\s*(.+)/) {
+                if ($2 eq '>') {
+                    $_ = $1;
+                } else {
+                    $_ = $3;
+                    /\$/ and push(@reqTags, /\$\{?(?:[-\w]+:)*([-\w?*]+)/g), next;
+                }
+            }
+            push @reqTags, $2 if /(^|:)([-\w?*]+)#?$/;
+        }
+        if (@exclude) {
+            ExpandShortcuts(\@exclude, 1);
+            $srcExifTool->Options(Exclude => \@exclude);
+        }
+        $srcExifTool->Options(RequestTags => \@reqTags) if @reqTags;
+        # get all tags from source file (including MakerNotes block)
+        $info = $srcExifTool->ImageInfo($srcFile);
+    }
     return $info if $$info{Error} and $$info{Error} eq 'Error opening file';
     delete $$srcExifTool{VALUE}{Error}; # delete so we can check this later
 
@@ -1414,6 +1422,7 @@ sub SetNewValuesFromFile($$;@)
 #
     # 1) loop through input list of tags to set, and build @setList
     my (@setList, $set, %setMatches, $t, %altFiles);
+    my $assign = 0;
     foreach $t (@setTags) {
         if (ref $t eq 'HASH') {
             # update current options
@@ -1428,18 +1437,22 @@ sub SetNewValuesFromFile($$;@)
         $tag = lc $t;   # change tag/group names to all lower case
         my (@fg, $grp, $dst, $dstGrp, $dstTag, $isExclude);
         # handle redirection to another tag
-        if ($tag =~ /(.+?)\s*(>|<)\s*(.+)/) {
+        if ($tag =~ /(.+?)\s*(>|<|=)(\s*)(.*)/) {
             $dstGrp = '';
-            my $opt;
+            my ($opt, $op, $spc);
             if ($2 eq '>') {
-                ($tag, $dstTag) = ($1, $3);
+                ($tag, $dstTag) = ($1, $4);
                 # flag add and delete (eg. '+<' and '-<') redirections
                 $opt = $1 if $tag =~ s/\s*([-+])$// or $dstTag =~ s/^([-+])\s*//;
             } else {
-                ($tag, $dstTag) = ($3, $1);
+                ($dstTag, $op, $spc, $tag) = ($1, $2, $3, $4);
                 $opt = $1 if $dstTag =~ s/\s*([-+])$//;
-                # handle expressions
-                if ($tag =~ /\$/) {
+                if ($op eq '=') {
+                    # simple assignment ($tag will be the new value)
+                    $tag = $spc . $tag;
+                    undef $tag unless $dstTag =~ s/\^$// or length $tag;
+                    $$opts{ASSIGN} = ++$assign;
+                } elsif ($tag =~ /\$/) {    # handle expressions
                     $tag = $t;  # restore original case
                     # recover leading whitespace (except for initial single space)
                     $tag =~ s/(.+?)\s*(>|<) ?//;
@@ -1452,7 +1465,7 @@ sub SetNewValuesFromFile($$;@)
             }
             $$opts{Replace} = 0 if $dstTag =~ s/^\+//;
             # validate tag name(s)
-            unless ($$opts{EXPR} or ValidTagName($tag)) {
+            unless ($$opts{EXPR} or $$opts{ASSIGN} or ValidTagName($tag)) {
                 $self->Warn("Invalid tag name '${tag}'. Use '=' not '<' to assign a tag value");
                 next;
             }
@@ -1470,7 +1483,7 @@ sub SetNewValuesFromFile($$;@)
         } else {
             $$opts{Replace} = 0 if $tag =~ s/^\+//;
         }
-        unless ($$opts{EXPR}) {
+        unless ($$opts{EXPR} or $$opts{ASSIGN}) {
             $isExclude = ($tag =~ s/^-//);
             if ($tag =~ /(.*):(.+)/) {
                 ($grp, $tag) = ($1, $2);
@@ -1540,6 +1553,8 @@ sub SetNewValuesFromFile($$;@)
     foreach $set (@setList) {
         $$set[2] and $setMatches{$set} = [ ];
     }
+    # no need to search source tags if doing only assignments
+    undef @tags if $assign == @setList;
     # 3) loop through all tags in source image and save tags matching each setTag
     my (%rtnInfo, $isAlt);
     foreach $tag (@tags) {
@@ -1592,21 +1607,26 @@ SET:    foreach $set (@setList) {
         # get options for SetNewValue
         my $opts = $$set[3];
         # handle expressions
-        if ($$opts{EXPR}) {
-            my $val = $srcExifTool->InsertTagValues($$set[1], \@tags, 'Error');
-            my $err = $$srcExifTool{VALUE}{Error};
-            if ($err) {
-                # pass on any error as a warning unless it is suppressed
-                my $noWarn = $$srcExifTool{OPTIONS}{NoWarning};
-                unless ($noWarn and (eval { $err =~ /$noWarn/ } or
-                    # (also apply expression to warning without "[minor] " prefix)
-                    ($err =~ s/^\[minor\] //i and eval { $err =~ /$noWarn/ })))
-                {
-                    $tag = NextFreeTagKey(\%rtnInfo, 'Warning');
-                    $rtnInfo{$tag} = $$srcExifTool{VALUE}{Error};
+        if ($$opts{EXPR} or $$opts{ASSIGN}) {
+            my $val;
+            if ($$opts{EXPR}) {
+                $val = $srcExifTool->InsertTagValues($$set[1], \@tags, 'Error');
+                my $err = $$srcExifTool{VALUE}{Error};
+                if ($err) {
+                    # pass on any error as a warning unless it is suppressed
+                    my $noWarn = $$srcExifTool{OPTIONS}{NoWarning};
+                    unless ($noWarn and (eval { $err =~ /$noWarn/ } or
+                        # (also apply expression to warning without "[minor] " prefix)
+                        ($err =~ s/^\[minor\] //i and eval { $err =~ /$noWarn/ })))
+                    {
+                        $tag = NextFreeTagKey(\%rtnInfo, 'Warning');
+                        $rtnInfo{$tag} = $$srcExifTool{VALUE}{Error};
+                    }
+                    delete $$srcExifTool{VALUE}{Error};
+                    next unless defined $val;
                 }
-                delete $$srcExifTool{VALUE}{Error};
-                next unless defined $val;
+            } else {
+                $val = $$set[1];
             }
             my ($dstGrp, $dstTag) = @{$$set[2]};
             $$opts{Protected} = 1 unless $dstTag =~ /[?*]/ and $dstTag ne '*';
@@ -3454,6 +3474,19 @@ sub NoDups
     $_ = ($_[0] and $new eq $_) ? undef : $new;
 }
 
+#------------------------------------------------------------------------------
+# 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, @_);
+    return $et->WriteInfo(\$_);
+}
+
 #------------------------------------------------------------------------------
 # Is specified tag writable
 # Inputs: 0) tag name, case insensitive (optional group name currently ignored)

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

@@ -1941,6 +1941,9 @@ my %sACDSeeRegionStruct = (
         ValueConv => 'Image::ExifTool::XMP::DecodeBase64($val)',
         ValueConvInv => 'Image::ExifTool::XMP::EncodeBase64($val)',
     },
+    MotionPhoto        => { Writable => 'integer' },
+    MotionPhotoVersion => { Writable => 'integer' },
+    MotionPhotoPresentationTimestampUs => { Writable => 'integer' },
 );
 
 # Google creations namespace (ref PH)

package/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.82';
+$VERSION = '12.84';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1118,6 +1118,7 @@ my @availableOptions = (
     [ 'HexTagIDs',        0,      'use hex tag ID\'s in family 7 group names' ],
     [ 'HtmlDump',         0,      'HTML dump (0-3, higher # = bigger limit)' ],
     [ 'HtmlDumpBase',     undef,  'base address for HTML dump' ],
+    [ 'IgnoreGroups',     undef,  'list of groups to ignore when extracting' ],
     [ 'IgnoreMinorErrors',undef,  'ignore minor errors when reading/writing' ],
     [ 'IgnoreTags',       undef,  'list of tags to ignore when extracting' ],
     [ 'ImageHashType',    'MD5',  'image hash algorithm' ],
@@ -1175,7 +1176,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(
@@ -1994,14 +1995,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);
@@ -2048,7 +2049,7 @@ 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' },
+    GeolocationTimeZone => { %geoInfo, Notes => 'geolocation time zone ID' },
     GeolocationFeatureCode=>{%geoInfo, Notes => 'feature code, see L<http://www.geonames.org/export/codes.html#P>' },
     GeolocationPopulation=>{ %geoInfo, Notes => 'city population rounded to 2 significant digits' },
     GeolocationDistance => { %geoInfo, Notes => 'distance in km from current GPS to city', PrintConv => '"$val km"' },
@@ -2470,12 +2471,12 @@ sub Options($$;@)
             } else {
                 $$options{$param} = undef;  # clear the list
             }
-        } elsif ($param eq 'IgnoreTags') {
+        } elsif ($param =~ /^(IgnoreTags|IgnoreGroups)$/) {
             if (defined $newVal) {
                 # parse list from delimited string if necessary
-                my @ignoreList = (ref $newVal eq 'ARRAY') ? @$newVal : ($newVal =~ /[-\w?*:]+/g);
-                ExpandShortcuts(\@ignoreList);
-                # add to existing tags to ignore
+                my @ignoreList = (ref $newVal eq 'ARRAY') ? @$newVal : ($newVal =~ /[-\w?*:#]+/g);
+                ExpandShortcuts(\@ignoreList) if $param eq 'IgnoreTags';
+                # add to existing tags/groups to ignore
                 $$options{$param} or $$options{$param} = { };
                 foreach (@ignoreList) {
                     /^(.*:)?([-\w?*]+)#?$/ or next;
@@ -2555,6 +2556,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
@@ -2573,7 +2576,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;
@@ -4361,13 +4372,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];
@@ -4377,11 +4389,14 @@ sub DoneExtract($)
                     $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;
+                    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());
             }
@@ -6362,6 +6377,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;
@@ -8936,6 +8952,12 @@ sub FoundTag($$$;@)
     }
     $grps[0] or $grps[0] = $$self{SET_GROUP0};
     $grps[1] or $grps[1] = $$self{SET_GROUP1};
+    if ($$options{IgnoreGroups}) {
+        foreach (0..1) {
+            my $g = lc($grps[$_] || $$tagInfo{Groups}{$_} || $$tagInfo{Table}{GROUPS}{$_});
+            return undef if $$options{IgnoreGroups}{$g} or $$options{IgnoreGroups}{"$_$g"};
+        }
+    }
     my $valueHash = $$self{VALUE};
 
     if ($$tagInfo{RawConv}) {

package/bin/lib/Image/ExifTool.pod

@@ -738,9 +738,10 @@ use of the alternate names.  Default is 1.
 
 Comma-separated list of feature codes to include in city search, or exclude
 if the list begins with a dash (-).  Valid feature codes are PPL, PPLA,
-PPLA2, PPLA3, PPLA4, PPLA5, PPLC, PPLCH, PPLF, PPLG, PPLL, PPLR, PPLS, STLMT
-and Other.  See L<http://www.geonames.org/export/codes.html#P> for a
-description of these codes.  Default is undef.
+PPLA2, PPLA3, PPLA4, PPLA5, PPLC, PPLCH, PPLF, PPLG, PPLH, PPLL, PPLQ, PPLR,
+PPLS, PPLW, PPLX, STLMT and Other, plus possible user-include codes if an
+alternate database is used.  See L<http://www.geonames.org/export/codes.html#P>
+for a description of these codes.  Default is undef.
 
 =item GeolocMaxDist
 
@@ -825,6 +826,12 @@ goes to the file specified by the TextOut option (\*STDOUT by default).
 Base for HTML dump offsets.  If not defined, the EXIF/TIFF base offset is
 used.  Set to 0 for absolute offsets.  Default is undef.
 
+=item IgnoreGroups
+
+Comma-separated list of group names to ignore when reading.  The group names
+are case insensitive and may be preceeded by a family number.  Set to undef
+to clear the previous IgnoreGroups list.  Default is undef.
+
 =item IgnoreMinorErrors
 
 Flag to ignore minor errors.  Causes minor errors to be downgraded to
@@ -838,12 +845,12 @@ warnings are denoted by "[minor]" at the start of the message, or "[Minor]"
 
 =item IgnoreTags
 
-List of tag names to ignore when reading.  This may help in situations where
-memory is limited because the ignored tag values are not stored in memory.
-The tag names are case insensitive and group names and wildcards are not
-allowed.  A special tag name of "All" may be used to ignore all tags except
-those specified by the L</RequestTags> option.  Set to undef to clear the
-previous IgnoreTags list.  Default is undef.
+Comma-separated list of tag names to ignore when reading.  This may help in
+situations where memory is limited because the ignored tag values are not
+stored in memory. The tag names are case insensitive and group names and
+wildcards are not allowed.  A special tag name of "All" may be used to
+ignore all tags except those specified by the L</RequestTags> option.  Set
+to undef to clear the previous IgnoreTags list.  Default is undef.
 
 =item ImageHashType
 
@@ -1099,10 +1106,12 @@ Output file reference for Verbose and HtmlDump options.  Default is
 
 =item TimeZone
 
-Time zone for local date/time values.  May be set to any valid TZ string.
-Uses the system time zone if not specified.  Default is undef.  (Requires
-POSIX::tzset, which may not be available in Windows.  A work-around in
-Windows is to C<set TZ=E<lt>zoneE<gt>> before running ExifTool.)
+Set the time zone for local date/time values.  The value is a time zone
+offset like "+05:00" (but note that the offset is to UTC, not from UTC, so
+it is positive for western time zones), or a time zone name like "EST5EDT".
+For Unix-based systems, the value may also be a time zone ID like
+"America/New_York".  Requires Time::Piece on Windows, or POSIX::tzset on
+other systems.  Default is undef.
 
 =item Unknown
 
@@ -1226,7 +1235,7 @@ L</ExtractInfo>:
 
 Binary, Charset, CharsetEXIF, CharsetFileName, CharsetID3, CharsetIPTC,
 CharsetPhotoshop, CharsetQuickTime, CharsetRIFF, Composite, ExtendedXMP,
-ExtractEmbedded, FastScan, FixBase, HtmlDump, HtmlDumpBase,
+ExtractEmbedded, FastScan, FixBase, HtmlDump, HtmlDumpBase, IgnoreGroups,
 IgnoreMinorErrors, IgnoreTags, Lang, LargeFileSupport, MakerNotes,
 MDItemTags, NoPDFList, Password, QuickTimeUTC (enforced 1904 time zero),
 RequestAll, RequestTags, SaveFormat, SavePath, ScanForXMP, Struct, TextOut,

package/bin/perl-Image-ExifTool.spec

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

package/bin/pp_build_exe.args

@@ -21,10 +21,10 @@
 #           10) Copy zip archive to web servers.
 #           11) Update zip file version in link and text of html/index.html.
 #------------------------------------------------------------------------------
--T exiftool-12.82
-#--info=FileVersion=12.8.2.0
-#--info=ProductVersion=12.8.2.0
-##"--info=Build Date=2024:04:05 12:05:25-04:00"
+-T exiftool-12.84
+#--info=FileVersion=12.8.4.0
+#--info=ProductVersion=12.8.4.0
+##"--info=Build Date=2024:04:23 11:39:08-04:00"
 ##"--info=Bundled Perl Version=ActivePerl 5.24.0"
 ##"--info=LegalCopyright=Copyright (c) 2003-2024, Phil Harvey"
 ##"--info=ProductName=ExifTool"