exiftool-vendored.pl 12.78.0 → 12.80.0

package/bin/Changes

@@ -7,6 +7,41 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.76. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Mar. 19, 2024 - Version 12.80
+
+  - Added GeolocationFeatureCode tag
+  - Added XMP-acdsee-rs tags and a new XMP-xmpDM tag
+  - Added ACDSeeRegion2MWGRegion conversion to config_files/acdsee.config
+  - Added GPSAltitudeRef to XMP-iptcExt LocationDetails structure
+  - Added a couple of new FujiFilm tags and a new CropMode value
+  - Added conversion for XMP-aux:ApproximateFocusDistance "infinity"
+  - Improved Geolocation regular expressions to allow negative matches
+  - Improved accuracy of Geolocation distance/bearing calculations
+  - Changed structure of Geolocation database (now version 1.02)
+  - Minor change to key format for user-defined Geolocation name translations
+  - Fixed case/spacing of "C2PA" in some CBOR tag descriptions
+  - Fixed bug extracting binary data from EXR files
+  - API Changes:
+      - Added GeolocFeature option
+
+Mar. 15, 2024 - Version 12.79
+
+  - Improvements to new Geolocation feature:
+      - Added reverse Geolocation ability (obtain GPS coordinates from city
+        name), with support for regular expressions
+      - Added -listgeo option to list the Geolocation database
+      - Added the ability to include user-defined cities in the Geolocation
+        database
+      - Added the ability to write XMP-iptcExt LocationShown tags using Geolocate
+        feature
+      - Added the ability to specify which tags to read from file for the API
+        Geolocation option
+      - Added language translations for Geolocation names
+      - Increased resolution of Geolocation GPS positions and stored populations
+  - API Changes:
+      - Save necessary data members to allow GetInfo to be accessed by
+        user-defined tags
+
 Mar. 5, 2024 - Version 12.78 - "Geolocation"
 
   - Added new Geolocation feature and write-only Geolocate tag
@@ -32,9 +67,7 @@ Mar. 5, 2024 - Version 12.78 - "Geolocation"
   - Fixed issue where some tags from alternate files using the -fileNUM option
     weren't generated as requested
   - API Changes:
-      - Added Geolocation,
-        GeolocMaxDist and
-        GeolocMinPop API options
+      - Added Geolocation, GeolocMaxDist and GeolocMinPop API options
 
 Feb. 16, 2024 - Version 12.77
 

package/bin/MANIFEST

@@ -195,6 +195,7 @@ html/data_members.html
 html/exiftool_pod.html
 html/faq.html
 html/filename.html
+html/geolocation.html
 html/geotag.html
 html/history.html
 html/htmldump.html
@@ -293,6 +294,24 @@ lib/Image/ExifTool/GE.pm
 lib/Image/ExifTool/GIF.pm
 lib/Image/ExifTool/GIMP.pm
 lib/Image/ExifTool/GPS.pm
+lib/Image/ExifTool/GeoLang/cs.pm
+lib/Image/ExifTool/GeoLang/de.pm
+lib/Image/ExifTool/GeoLang/en_ca.pm
+lib/Image/ExifTool/GeoLang/en_gb.pm
+lib/Image/ExifTool/GeoLang/es.pm
+lib/Image/ExifTool/GeoLang/fi.pm
+lib/Image/ExifTool/GeoLang/fr.pm
+lib/Image/ExifTool/GeoLang/it.pm
+lib/Image/ExifTool/GeoLang/ja.pm
+lib/Image/ExifTool/GeoLang/ko.pm
+lib/Image/ExifTool/GeoLang/nl.pm
+lib/Image/ExifTool/GeoLang/pl.pm
+lib/Image/ExifTool/GeoLang/ru.pm
+lib/Image/ExifTool/GeoLang/sk.pm
+lib/Image/ExifTool/GeoLang/sv.pm
+lib/Image/ExifTool/GeoLang/tr.pm
+lib/Image/ExifTool/GeoLang/zh_cn.pm
+lib/Image/ExifTool/GeoLang/zh_tw.pm
 lib/Image/ExifTool/GeoTiff.pm
 lib/Image/ExifTool/Geolocation.dat
 lib/Image/ExifTool/Geolocation.pm
@@ -545,7 +564,6 @@ t/ExifTool_32.out
 t/ExifTool_33.out
 t/ExifTool_34.out
 t/ExifTool_35.out
-t/ExifTool_36.out
 t/ExifTool_4.out
 t/ExifTool_5.out
 t/ExifTool_6.out
@@ -602,6 +620,12 @@ t/GeoTiff.t
 t/GeoTiff_2.out
 t/GeoTiff_3.out
 t/GeoTiff_4.out
+t/Geolocation.t
+t/Geolocation_2.out
+t/Geolocation_3.out
+t/Geolocation_4.out
+t/Geolocation_5.out
+t/Geolocation_6.out
 t/Geotag.t
 t/Geotag_10.out
 t/Geotag_11.out
@@ -923,7 +947,6 @@ t/Writer_58.out
 t/Writer_59.out
 t/Writer_6.out
 t/Writer_60.out
-t/Writer_61.out
 t/Writer_7.out
 t/Writer_9.out
 t/XISF.t

package/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.78"
+   "version" : "12.80"
 }

package/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.78
+version: 12.80

package/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.78.tar.gz | tar -xf -
-  cd Image-ExifTool-12.78
+  gzip -dc Image-ExifTool-12.80.tar.gz | tar -xf -
+  cd Image-ExifTool-12.80
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/config_files/acdsee.config

@@ -41,7 +41,8 @@
 #               type tags to ACDSee regions.
 #                   MPRegion2ACDSeeRegion : Converts a Microsoft RegionInfoMP
 #                   IPTCRegion2ACDSeeRegion : Converts an IPTC ImageRegion
-#                   MWGRegion2ACDSeeRegion : Converts a MWG RegionInfo
+#                   MWGRegion2ACDSeeRegion : Converts from a MWG RegionInfo
+#                   ACDSeeRegion2MWGRegion : Converts to a MWG RegionInfo
 #
 # Usage:        To set individual tags
 #               exiftool -config acdsee.config -ACDSEETAG=VALUE FILE ...
@@ -52,6 +53,8 @@
 #               exiftool -config acdsee.config "-RegionInfoACDSee<IPTCRegion2ACDSeeRegion" File ...
 #               To convert MWG Regions to ACDSee regions
 #               exiftool -config acdsee.config "-RegionInfoACDSee<MWGRegion2ACDSeeRegion" File ...
+#               To convert ACDSee Regions to MWG regions
+#               exiftool -config acdsee.config "-RegionInfo<ACDSeeRegion2MWGRegion" File ...
 #
 # Requires:     ExifTool version 10.28 or later
 #
@@ -64,45 +67,12 @@
 #                            "RegionInfoACDSeeAppliedToDimensions*" -> "ACDSeeRegionAppliedToDimensions*"
 #                            "RegionInfoACDSeeRegionList* -> "ACDSeeRegion*"
 #               2022/10/03 - PH Set group name properly to XMP-acdsee-rs
+#               2024/03/19 - PH Moved XMP-acdsee-rs tags into the standard distribution,
+#                            and added ACDSeeRegion2MWGRegion conversion
 #------------------------------------------------------------------------------
 use Data::Dumper;
 
-my %sACDSeeDimensions = (
-    STRUCT_NAME => 'ACDSee Dimensions',
-    NAMESPACE   => {'acdsee-stDim' => 'http://ns.acdsee.com/sType/Dimensions#'},
-    'w'         => { Writable => 'real' },
-    'h'         => { Writable => 'real' },
-    'unit'      => { },
-);
-
-my %sACDSeeArea = (
-    STRUCT_NAME => 'ACDSee Area',
-    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     => 'ACDSee Regions',
-    NAMESPACE => { 'acdsee-rs' => 'http://ns.acdsee.com/regions/' },
-    ALGArea         => { Struct => \%sACDSeeArea },
-    DLYArea         => { Struct => \%sACDSeeArea },
-    Name            => { },
-    NameAssignType  => { },
-    Type            => { },
-);
-
 %Image::ExifTool::UserDefined = (
-    # new XMP namespaces for ACDSee regions
-    'Image::ExifTool::XMP::Main' => {
-        'acdsee-rs' => { # <-- must be the same as the NAMESPACE prefix
-            SubDirectory => {
-                TagTable => 'Image::ExifTool::UserDefined::ACDSeeRegions'
-            },
-        },
-    },
     'Image::ExifTool::Composite' => {
     # create an ACDSee RegionInfo structure from a Microsoft RegionInfoMP structure
         MPRegion2ACDSeeRegion => {
@@ -176,7 +146,7 @@ my %sACDSeeRegionStruct = (
             },
         },
 
-        # create an MWG RegionInfo structure from an IPTC ImageRegion list
+        # create an ACDSee RegionInfo structure from an MWG RegionInfo structure
         MWGRegion2ACDSeeRegion => {
             Require => {
                 0 => 'RegionInfo',
@@ -207,29 +177,39 @@ my %sACDSeeRegionStruct = (
                 }
             },
         },
-        ####
-    },
-);
 
-%Image::ExifTool::UserDefined::ACDSeeRegions = (
-    GROUPS => { 0 => 'XMP', 1 => 'XMP-acdsee-rs', 2 => 'Image' },
-    NAMESPACE => { 'acdsee-rs' => 'http://ns.acdsee.com/regions/' },
-    WRITABLE => 'string', # (default to string-type tags)
-    Regions => {
-        Name => 'RegionInfoACDSee',
-        FlatName => 'ACDSee',
-        # the "Struct" entry defines the structure fields
-        Struct => {
-            # optional structure name (used for warning messages only)
-            STRUCT_NAME => 'ACDSee RegionInfo',
-            RegionList => {
-                FlatName => 'Region',
-                Struct => \%sACDSeeRegionStruct,
-                List => 'Bag',
+        # create an MWG RegionInfo structure from an ACDSee RegionInfo
+        ACDSeeRegion2MWGRegion => {
+            Require => {
+                0 => 'RegionInfoACDSee',
+                1 => 'ImageWidth',
+                2 => 'ImageHeight',
+            },
+            ValueConv => q{
+                my ($rgn, @newRgns);
+                my %newRgn;
+                foreach $rgn (@{$val[0]{RegionList}}) {
+                    next unless $$rgn{Area} or defined $$rgn{Name};
+                    my %newRgn;
+                    if ($$rgn{DLYArea}) {
+                        $newRgn{Area} = {
+                            'X' => $$rgn{DLYArea}{'X'},
+                            'Y' => $$rgn{DLYArea}{'Y'},
+                            'W' => $$rgn{DLYArea}{'W'},
+                            'H' => $$rgn{DLYArea}{'H'},
+                        };
+                    };
+                    $newRgn{Name} = $$rgn{Name} if defined $$rgn{Name};
+                    $newRgn{'Type'} = $$rgn{'Type'} if defined $$rgn{'Type'};
+                    push @newRgns, \%newRgn;
+                }
+                return {
+                    'AppliedToDimensions' => $val[0]{'AppliedToDimensions'},
+                    RegionList => \@newRgns,
+                }
             },
-            AppliedToDimensions => {
-            FlatName => 'RegionAppliedToDimensions',Struct => \%sACDSeeDimensions },
         },
+        ####
     },
 );
 

package/bin/config_files/example.config

@@ -362,5 +362,11 @@ $Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
     '-i', 'HIDDEN', # ignore hidden files by default (names beginning with ".")
 );
 
+# Add user-defined cities to the Geolocation lookup
+@Image::ExifTool::UserDefined::Geolocation = (
+    # (city,region,country code,country,timezone,population,lat,lon)
+    ['Sinemorets','Burgas','BG','Bulgaria','Europe/Sofia',400,42.06115,27.97833],
+);
+
 #------------------------------------------------------------------------------
 1;  #end

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.78';
+my $version = '12.80';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -670,7 +670,7 @@ for (;;) {
         next;
     }
     my $a = lc $_;
-    if (/^list([wfrdx]|wf|g(\d*))?$/i) {
+    if (/^list([wfrdx]|wf|g(\d*)|geo)?$/i) {
         $pass or push @nextPass, "-$_";
         my $type = lc($1 || '');
         if (not $type or $type eq 'w' or $type eq 'x') {
@@ -719,6 +719,23 @@ for (;;) {
             PrintTagList('Recognized file extensions', GetFileType(undef, 0));
         } elsif ($type eq 'd') {
             PrintTagList('Deletable groups', GetDeleteGroups());
+        } elsif ($type eq 'geo') {
+            require Image::ExifTool::Geolocation;
+            my ($i, $entry);
+            print "Geolocation database:\n" unless $quiet;
+            print "City,Region,Subregion,CountryCode,Country,TimeZone,FeatureCode,Population,Latitude,Longitude\n";
+            Image::ExifTool::Geolocation::SortDatabase('City') if $sortOpt;
+            my $minPop = $mt->Options('GeolocMinPop');
+            my $feature = $mt->Options('GeolocFeature') || '';
+            my $neg = $feature =~ s/^-//;
+            my %fcodes = map { lc($_) => 1 } split /\s*,\s*/, $feature;
+            for ($i=0; ; ++$i) {
+                my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt) or last;
+                next if $minPop and $entry[7] < $minPop;
+                next if %fcodes and $neg ? $fcodes{lc $entry[6]} : not $fcodes{lc $entry[6]};
+                $_ = defined $_ ? $mt->Decode($_, 'UTF8') : '' foreach @entry[0,1,2,4];
+                print join(',', @entry), "\n";
+            }
         } else { # 'g(\d*)'
             # list all groups in specified family
             my $family = $2 || 0;
@@ -1109,7 +1126,7 @@ for (;;) {
         } else {
             $pass or push(@nextPass, '-lang'), next;
         }
-        my $langs = "Available languages:\n";
+        my $langs = $quiet ? '' : "Available languages:\n";
         $langs .= "  $_ - $Image::ExifTool::langName{$_}\n" foreach @Image::ExifTool::langs;
         $langs =~ tr/_/-/;  # display dashes instead of underlines in language codes
         $langs = Image::ExifTool::HTML::EscapeHTML($langs) if $escapeHTML;
@@ -1425,11 +1442,11 @@ if ($useMWG and not defined $mt->Options('CharsetEXIF')) {
 if (not @files and not $outOpt and not @newValues) {
     my $loc = $mt->Options('Geolocation');
     # use undocumented feature to input JSON file directly from command line
-    $loc and $loc =~ /,/ and push(@files, qq(\@JSON:{})), $geoOnly = 1;
+    $loc and $loc ne '1' and push(@files, qq(\@JSON:{})), $geoOnly = 1;
 }
 
 # print help
-unless ((@tags and not $outOpt) or @files or @newValues) {
+unless ((@tags and not $outOpt) or @files or @newValues or $geoOnly) {
     if ($doGlob and $doGlob == 2) {
         Warn "No matching files\n";
         $rtnVal = 1;
@@ -2131,7 +2148,7 @@ sub GetImageInfo($$)
         # read JSON file from command line
         my $dat = $2;
         $info = $et->ImageInfo(\$dat, \@foundTags);
-        if ($geoOnly) { /^Geolocation/ or delete $$info{$_} foreach keys %$info }
+        if ($geoOnly) { /^Geolocation/ or delete $$info{$_} foreach keys %$info; $file = ' ' }
     }
     if (defined $deleteOrig) {
         Progress($vout, "======== $file") if defined $verbose;
@@ -4648,7 +4665,7 @@ B<exiftool> [I<OPTIONS>] B<-tagsFromFile> I<SRCFILE>
 =head2 Other
 
 B<exiftool> [ B<-ver> |
-B<-list>[B<w>|B<f>|B<r>|B<wf>|B<g>[I<NUM>]|B<d>|B<x>] ]
+B<-list>[B<w>|B<f>|B<r>|B<wf>|B<g>[I<NUM>]|B<d>|B<x>|B<geo>] ]
 
 For specific examples, see the L<EXAMPLES|/READING EXAMPLES> sections below.
 
@@ -5640,7 +5657,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.78 --
+    -- Generated by ExifTool 12.80 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -6402,22 +6419,24 @@ prevent the command window from closing when run as a Windows drag and drop
 application.
 
 =item B<-list>, B<-listw>, B<-listf>, B<-listr>, B<-listwf>,
-B<-listg>[I<NUM>], B<-listd>, B<-listx>
+B<-listg>[I<NUM>], B<-listd>, B<-listx>, B<-listgeo>
 
 Print a list of all valid tag names (B<-list>), all writable tag names
 (B<-listw>), all supported file extensions (B<-listf>), all recognized file
 extensions (B<-listr>), all writable file extensions (B<-listwf>), all tag
 groups [in a specified family] (B<-listg>[I<NUM>]), all deletable tag groups
-(B<-listd>), or an XML database of tag details including language
-translations (B<-listx>).  The B<-list>, B<-listw> and B<-listx> options may
-be followed by an additional argument of the form C<-GROUP:All> to list only
-tags in a specific group, where C<GROUP> is one or more family 0-2 group
-names (excepting EXIF IFD groups) separated by colons.  With B<-listg>,
-I<NUM> may be given to specify the group family, otherwise family 0 is
-assumed.  The B<-l> option may be combined with B<-listf>, B<-listr> or
-B<-listwf> to add file descriptions to the list.  The B<-lang> option may be
-combined with B<-listx> to output descriptions in a single language.  Here
-are some examples:
+(B<-listd>), an XML database of tag details including language translations
+(B<-listx>), or the Geolocation database (B<-listgeo>).  The B<-list>,
+B<-listw> and B<-listx> options may be followed by an additional argument of
+the form C<-GROUP:All> to list only tags in a specific group, where C<GROUP>
+is one or more family 0-2 group names (excepting EXIF IFD groups) separated
+by colons.  With B<-listg>, I<NUM> may be given to specify the group family,
+otherwise family 0 is assumed.  The B<-l> option may be combined with
+B<-listf>, B<-listr> or B<-listwf> to add file descriptions to the list. 
+The B<-lang> option may be combined with B<-listx> to output descriptions in
+a single language, and the B<-sort> and/or B<-lang> options may be combined
+with B<-listgeo>.  Also, the API GeolocMinPop and GeolocFeature options
+apply to the B<-listgeo> output.  Here are some examples:
 
     -list               # list all tag names
     -list -EXIF:All     # list all EXIF tags
@@ -6430,6 +6449,7 @@ are some examples:
     -listd              # list all deletable groups
     -listx -EXIF:All    # list database of EXIF tags in XML format
     -listx -XMP:All -s  # list short XML database of XMP tags
+    -listgeo -lang de   # list geolocation database in German
 
 When combined with B<-listx>, the B<-s> option shortens the output by
 omitting the descriptions and values (as in the last example above), and

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

@@ -528,6 +528,7 @@ my %faceCategories = (
             1 => 'Full-frame on GFX', #IB
             2 => 'Sports Finder Mode', # (mechanical shutter)
             4 => 'Electronic Shutter 1.25x Crop', # (continuous high)
+            8 => 'Digital Tele-Conv', #forum15784
         },
     },
     0x104e => { #forum10800 (X-Pro3)
@@ -549,6 +550,8 @@ my %faceCategories = (
             3 => 'Electronic Front Curtain', #10
         },
     },
+    0x1051 => { Name => 'CropTopLeft', Writable => 'int32u' }, #forum15784
+    0x1052 => { Name => 'CropCenter',  Writable => 'int32u' }, #forum15784
     # 0x1100 - This may not work well for newer cameras (ref forum12682)
     0x1100 => [{
         Name => 'AutoBracketing',