exiftool_vendored 12.83.0 → 12.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce9ba4475bbab2af98e446daf68e2ebc3e20f5f8babe75cb6c4c30c2d64e249
-  data.tar.gz: 3f9168ef86dba7aeeaaf05175e9ca061555aef3c265fca25e4716bfb201f37c4
+  metadata.gz: 545516d00429f2217884ee7dd4339504e84b836ee2b778fa44707a637bc4184c
+  data.tar.gz: a3737fb33959d687603b58ec0062ae907853bbae9bcc856ca10d1ac560368658
 SHA512:
-  metadata.gz: 2c1d039efa83cb5365e55ae6b75c55076afaf93ef816798a221918c99ae65279c7cbdf53aaff59e76168c9cb5c859f05317ad1d286087386ebb351bc848b32bb
-  data.tar.gz: 9481aa26a7f459d1bc5c9c6cb9fd752ecb1d7ba4a9c5fb0e16b4147e819c5e5c6b0d8dc4efe6571a9a0e32abf49b386c3b03d485993be98ec3ec18d03efefc5f
+  metadata.gz: a88fe3c5bad722bbc5e7bf0e0bd07edf8f4dc4707ed6af4895db6eaeacb0a28f14bd1ed72ad90dbfe43fb52eb86c9b569ac858ab5491c3910dfbe79d84cff75a
+  data.tar.gz: c9fbb0c789ce33da188841f7d0e37de4fcfac563508941fd1ebcaace1d2c6d074c9d8b9bf0e6c5a570aba8601db0b361c6e66b0243923d1fe54ee918509d3cce

data/bin/Changes

@@ -7,6 +7,56 @@ 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.)
 
+June 7, 2024 - Version 12.86
+
+  - Added a new value for a couple of Olympus tags (thanks Herb)
+  - Improved handling of ID3 user-defined tags
+  - Decode all JPEG segments from RICO box in Ricoh MOV videos
+  - Decode a few new values for some tags written by Canon EOS R cameras
+  - Patched some Olympus WB_RBLevels tags to allow 4 values to be written as per
+    some newer models
+  - Fixed issue when writing IPTC date tags with a date/time value containing
+subseconds with 4 or more digits
+
+May 21, 2024 - Version 12.85
+
+  - Added GeolocationFeatureType tag
+  - Added read support for Nikon NKA and NXD adjustment files
+  - Added a new Apple:ImageCaptureType value, and changed another one
+  - Decode a few new Pentax tags
+  - Decode a few new Canon tags
+  - Decode some Ricoh Exif metadata from MOV videos
+  - Extract ID3 UserDefinedText and UserDefinedURL tags by name
+  - Make $advFmtSelf available for user-defined helper functions
+  - Documented API GeoDir pseudo option feature
+  - Tolerate pad byte at end of HIF file when writing
+  - Raised priority of FileName, BaseName, Directory and FileType tags so they
+    don't get hidden by other tags in the file which may have these names
+  - Changed decoding of QuickTime Rotation (irot) to correspond with
+    EXIF:Orientation (previously this was oddly reported as degrees of
+    counterclockwise rotation)
+  - Fixed a typo in the print conversion value for a couple of DPX tags
+  - Fixed problem writing some QuickTime tags with very large (> 16 MB) values
+  - Fixed bug in build_geolocation utility that resulted in incorrect population
+    numbers when run under ActivePerl
+
+Apr. 23, 2024 - Version 12.84
+
+  - Added ability to read speed and accuracy_horizontal when geotagging from
+    OpenTracks GPX files
+  - Decode a few more Apple tags and a new CanonVRD tag
+  - Enhanced Geolocation feature with the ability to return any number of nearby
+    cities
+  - Fixed long-standing bug in Windows version that didn't properly handle dates
+    older than 50 years when writing FileModifyDate or FileCreateDate
+  - Fixed API TimeZone option to work in Windows
+  - Fixed problem where the SetTags helper function didn't properly copy tags
+    which have print conversions
+  - Fixed problem where a new subregion couldn't be added through a user-defined
+    Geolocation database entry
+  - Fixed problem where the API GeolocFeature option didn't work for some
+    features if a user-generated custom database was used
+
 Apr. 18, 2024 - Version 12.83
 
   - Added SetTags helper function for use in advanced formatting expressions
@@ -14,7 +64,7 @@ Apr. 18, 2024 - Version 12.83
   - Added a new Nikon Z lens
   - Added a couple of new QuickTime tags
   - Added a few more XMP-GCamera tags
-  - Added build_geolocation to the full distribution
+  - Added build_geolocation utility to the full distribution
   - Decode a new CanonVRD tag and rename another one
   - Updates to Sony maker note decoding for newer models (thanks Jos Roost)
   - Minor change in -p option to avoid adding the trailing newline if the -b

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.83"
+   "version" : "12.86"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.83
+version: 12.86

data/bin/README

@@ -14,50 +14,50 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ITC   r     | O     r     | RSRC  r
-  3FR   r     | DPX   r     | J2C   r     | ODP   r     | RTF   r
-  3G2   r/w   | DR4   r/w/c | JNG   r/w   | ODS   r     | RW2   r/w
-  3GP   r/w   | DSS   r     | JP2   r/w   | ODT   r     | RWL   r/w
-  7Z    r     | DV    r     | JPEG  r/w   | OFR   r     | RWZ   r
-  A     r     | DVB   r/w   | JSON  r     | OGG   r     | RM    r
-  AA    r     | DVR-MS r    | JXL   r/w   | OGV   r     | SEQ   r
-  AAC   r     | DYLIB r     | K25   r     | ONP   r     | SKETCH r
-  AAE   r     | EIP   r     | KDC   r     | OPUS  r     | SO    r
-  AAX   r/w   | EPS   r/w   | KEY   r     | ORF   r/w   | SR2   r/w
-  ACR   r     | EPUB  r     | LA    r     | ORI   r/w   | SRF   r
-  AFM   r     | ERF   r/w   | LFP   r     | OTF   r     | SRW   r/w
-  AI    r/w   | EXE   r     | LIF   r     | PAC   r     | SVG   r
-  AIFF  r     | EXIF  r/w/c | LNK   r     | PAGES r     | SWF   r
-  APE   r     | EXR   r     | LRV   r/w   | PBM   r/w   | THM   r/w
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PCD   r     | TIFF  r/w
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCX   r     | TORRENT r
-  ASF   r     | FFF   r/w   | MACOS r     | PDB   r     | TTC   r
-  AVI   r     | FITS  r     | MAX   r     | PDF   r/w   | TTF   r
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PEF   r/w   | TXT   r
-  AZW   r     | FLAC  r     | MIE   r/w/c | PFA   r     | VCF   r
-  BMP   r     | FLIF  r/w   | MIFF  r     | PFB   r     | VNT   r
-  BPG   r     | FLV   r     | MKA   r     | PFM   r     | VRD   r/w/c
-  BTF   r     | FPF   r     | MKS   r     | PGF   r     | VSD   r
-  C2PA  r     | FPX   r     | MKV   r     | PGM   r/w   | WAV   r
-  CHM   r     | GIF   r/w   | MNG   r/w   | PLIST r     | WDP   r/w
-  COS   r     | GLV   r/w   | MOBI  r     | PICT  r     | WEBP  r/w
-  CR2   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WEBM  r
-  CR3   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WMA   r
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WMV   r
-  CRW   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WPG   r
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PPTX  r     | WTV   r
-  CSV   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WV    r
-  CUR   r     | HTML  r     | MPC   r     | PSB   r/w   | X3F   r/w
-  CZI   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | XCF   r
-  DCM   r     | ICO   r     | MPO   r/w   | PSP   r     | XISF  r
-  DCP   r/w   | ICS   r     | MQV   r/w   | QTIF  r/w   | XLS   r
-  DCR   r     | IDML  r     | MRC   r     | R3D   r     | XLSX  r
-  DFONT r     | IIQ   r/w   | MRW   r/w   | RA    r     | XMP   r/w/c
-  DIVX  r     | IND   r/w   | MXF   r     | RAF   r/w   | ZIP   r
-  DJVU  r     | INSP  r/w   | NEF   r/w   | RAM   r     |
-  DLL   r     | INSV  r     | NKSC  r/w   | RAR   r     |
-  DNG   r/w   | INX   r     | NRW   r/w   | RAW   r/w   |
-  DOC   r     | ISO   r     | NUMBERS r   | RIFF  r     |
+  360   r/w   | DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w
+  3FR   r     | DPX   r     | J2C   r     | NXD   r     | RIFF  r
+  3G2   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RSRC  r
+  3GP   r/w   | DSS   r     | JP2   r/w   | ODP   r     | RTF   r
+  7Z    r     | DV    r     | JPEG  r/w   | ODS   r     | RW2   r/w
+  A     r     | DVB   r/w   | JSON  r     | ODT   r     | RWL   r/w
+  AA    r     | DVR-MS r    | JXL   r/w   | OFR   r     | RWZ   r
+  AAC   r     | DYLIB r     | K25   r     | OGG   r     | RM    r
+  AAE   r     | EIP   r     | KDC   r     | OGV   r     | SEQ   r
+  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | SKETCH r
+  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SO    r
+  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SR2   r/w
+  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SRF   r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SRW   r/w
+  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SVG   r
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SWF   r
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | THM   r/w
+  ASF   r     | FFF   r/w   | MACOS r     | PCD   r     | TIFF  r/w
+  AVI   r     | FITS  r     | MAX   r     | PCX   r     | TORRENT r
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TTC   r
+  AZW   r     | FLAC  r     | MIE   r/w/c | PDF   r/w   | TTF   r
+  BMP   r     | FLIF  r/w   | MIFF  r     | PEF   r/w   | TXT   r
+  BPG   r     | FLV   r     | MKA   r     | PFA   r     | VCF   r
+  BTF   r     | FPF   r     | MKS   r     | PFB   r     | VNT   r
+  C2PA  r     | FPX   r     | MKV   r     | PFM   r     | VRD   r/w/c
+  CHM   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VSD   r
+  COS   r     | GLV   r/w   | MOBI  r     | PGM   r/w   | WAV   r
+  CR2   r/w   | GPR   r/w   | MODD  r     | PLIST r     | WDP   r/w
+  CR3   r/w   | GZ    r     | MOI   r     | PICT  r     | WEBP  r/w
+  CRM   r/w   | HDP   r/w   | MOS   r/w   | PMP   r     | WEBM  r
+  CRW   r/w   | HDR   r     | MOV   r/w   | PNG   r/w   | WMA   r
+  CS1   r/w   | HEIC  r/w   | MP3   r     | PPM   r/w   | WMV   r
+  CSV   r     | HEIF  r/w   | MP4   r/w   | PPT   r     | WPG   r
+  CUR   r     | HTML  r     | MPC   r     | PPTX  r     | WTV   r
+  CZI   r     | ICC   r/w/c | MPG   r     | PS    r/w   | WV    r
+  DCM   r     | ICO   r     | MPO   r/w   | PSB   r/w   | X3F   r/w
+  DCP   r/w   | ICS   r     | MQV   r/w   | PSD   r/w   | XCF   r
+  DCR   r     | IDML  r     | MRC   r     | PSP   r     | XISF  r
+  DFONT r     | IIQ   r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
+  DIVX  r     | IND   r/w   | MXF   r     | R3D   r     | XLSX  r
+  DJVU  r     | INSP  r/w   | NEF   r/w   | RA    r     | XMP   r/w/c
+  DLL   r     | INSV  r     | NKA   r     | RAF   r/w   | ZIP   r
+  DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
+  DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -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.83.tar.gz | tar -xf -
-  cd Image-ExifTool-12.83
+  gzip -dc Image-ExifTool-12.86.tar.gz | tar -xf -
+  cd Image-ExifTool-12.86
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/build_geolocation

@@ -10,6 +10,11 @@
 #
 # Created:      2024-03-03 - P. Harvey
 #               2024-04-15 - PH Clean up and add options for public release
+#               2024-04-22 - PH Increased number of possible feature codes from
+#                               32 to 64. Convert backslashes in directory names
+#               2024-04-24 - PH Fixed problem with population exponent when run
+#                               under ActivePerl
+#               2024-04-29 - PH Added feature types and default to db v1.03
 #
 # Notes:        Requires these files from https://download.geonames.org/export/
 #
@@ -17,6 +22,7 @@
 #               countryInfo.txt
 #               admin1CodesASCII.txt
 #               admin2Codes.txt
+#               featureCodes_XX.txt (optional)
 #               alternateNamesV2.txt (optional)
 #
 # Output datbase format (Geolocation.dat):
@@ -35,7 +41,7 @@
 #        9   int16u - v1.02: 0x7fff = index in subregion (admin2), 0x8000 = high bit of time zone
 #        9   int16u - v1.03: index in subregion (admin2)
 #       11   int8u  - low byte of time zone index
-#       12   int8u  - 0x1f = feature code index (see below), v1.03: 0x80 = high bit of time zone
+#       12   int8u  - 0x3f = feature code index (see below), v1.03: 0x80 = high bit of time zone
 #       13   string - UTF8 City name, terminated by newline
 #   "\0\0\0\0\x01"
 #   Country entries:
@@ -52,7 +58,7 @@
 #       1. Time zone name, terminated by newline
 #   "\0\0\0\0\x05" (feature codes added in v1.03)
 #   Feature codes:
-#       1. Feature code, terminated by newline
+#       1. Feature code, optional space-followed-by-feature-name, then newline
 #   "\0\0\0\0\0"
 #
 # Feature Codes v1.02: (see http://www.geonames.org/export/codes.html#P for descriptions)
@@ -66,12 +72,12 @@
 
 use strict;
 
-my $dbVer        = '1.02'; # database version
-
+my $dbVer        = '1.03';                  # default output database version
 my $dbFile       = 'allCountries.txt';      # default database file
 my $countryFile  = 'countryInfo.txt';       # mandatory country names file
 my $regionFile   = 'admin1CodesASCII.txt';  # mandatory region names file
 my $admin2File   = 'admin2Codes.txt';       # mandatory subregion names file
+my $featureFile  = 'featureCodes_en.txt';   # optional feature names file
 my $altNamesFile = 'alternateNamesV2.txt';  # optional alternate names file
 my $outFile      = 'Geolocation.dat';       # output ExifTool database file
 my $outAltNames  = 'AltNames.dat';          # output alternate names file
@@ -101,6 +107,7 @@ my @fc103 = qw(
 my $i = 0;
 my @featureCodes = $dbVer eq '1.02' ? @fc102 : @fc103;
 my %featureCodes = map { $_ => $i++ } @featureCodes;
+my %featureNames;
 
 my ($dbfile, @dbfiles, $outDir, $verbose, $noLang, %needRgn);
 my %optArgs = ( p => 1, c => 1, cp => 1, l => 1, o => 1, ver => 1 );
@@ -110,6 +117,9 @@ my $opts = { };
 while (@ARGV) {
     my $opt = shift;
     if (not $opt =~ s/^-//) {
+        $opt = '.' unless length $opt;
+        $opt =~ tr(\\)(/);  # use forward slashes
+        $opt =~ s(/$)();    # remove trailing slash
         $opt = "$opt/$defaults{file}" if -d $opt;
         -e $opt or die "Error opening database $opt\n";
         push @dbfiles, { %defaults, %$opts, file => $opt };
@@ -235,12 +245,13 @@ Options:
   -h        - Show this help.
 
 Input files (download from https://download.geonames.org/export/dump/):
-  allCountries.txt      - default database file (smaller files with names
+  $dbFile      - default database file (smaller files with names
                           like "cities###.txt" may be specified instead)
-  countryInfo.txt       - mandatory country names file
-  admin1CodesASCII.txt  - mandatory region names file
-  admin2Codes.txt       - mandatory subregion names file
-  alternateNamesV2.txt  - optional alternate names file (must exist to
+  $countryFile       - mandatory country names file
+  $regionFile  - mandatory region names file
+  $admin2File       - mandatory subregion names file
+  $featureFile   - optional feature codes file
+  $altNamesFile  - optional alternate names file (must exist to
                           to generate $outAltNames and $geoLang files)
 
 Output files:
@@ -369,7 +380,7 @@ my @supportedLangs = qw(cs de en-ca en-gb es fi fr it ja ko nl pl ru sk sv tr zh
 
 # supported country-specific languages
 my %ccLang = ( TW => 'zh', CN => 'zh', CA => 'en', GB => 'en' );
-my (%lang, %haveCountry, %cityFlags, %rgnFlags, %subFlags, %ccFlags, %flags);
+my (%lang, %featureLang, %haveCountry, %cityFlags, %rgnFlags, %subFlags, %ccFlags, %flags);
 my (%haveRegion, %haveSubRgn, $filesize, $percent);
 
 sub GetFileSize($)
@@ -381,7 +392,8 @@ sub GetFileSize($)
     return $size;
 }
 
-# pre-scan database to determine which countries, regions and subregions we will be using
+# pre-scan database to determine which countries, regions subregions and
+# feature codes we will be using
 foreach $dbfile (@dbfiles) {
     my $database = $$dbfile{file};
     my $upgraded;
@@ -417,7 +429,7 @@ foreach $dbfile (@dbfiles) {
         }
         # keep regardless of population
         if ($needRgn{$cc} and $$dbfile{keep}{"$cc$rgn"}) {
-            $keep = $$dbfile{keep}{"$cc$rgn"}{$code};#TEST
+            $keep = $$dbfile{keep}{"$cc$rgn"}{$code};
         } elsif ($$dbfile{keep}{$cc}) {
             $keep = $$dbfile{keep}{$cc}{$code};
         } else {
@@ -437,8 +449,8 @@ foreach $dbfile (@dbfiles) {
         $haveCountry{$cc} = 1;
         $haveRegion{"$cc$rgn"} = 1;
         $haveSubRgn{"$cc$rgn.$sub"} = 1;
-        # add new feature codes (up to maximum index of 0x1f)
-        unless ($featureCodes{$code} or @featureCodes > 0x1f) {
+        # add new feature codes (up to maximum index of 0x3f)
+        unless ($featureCodes{$code} or @featureCodes > 0x3f) {
             if ($dbVer eq '1.02') {
                 next if $code =~ /^(PPLH|PPLQ|PPLW)$/; # (stored as "Other" in v1.02)
                 $dbVer = '1.03';
@@ -457,9 +469,27 @@ foreach $dbfile (@dbfiles) {
     warn "Some feature codes not supported by version 1.02, writing as 1.03 instead.\n" if $upgraded;
 }
 
+# read feature names
+if (open INFILE, '<', "$dbdir/$featureFile") {
+    print "Reading $dbdir/$featureFile\n";
+    while (<INFILE>) {
+        my @items = split /\t/;
+        $items[0] =~ s/^.\.//;  # remove feature group and "." separator
+        next unless $featureCodes{$items[0]};
+        my $name = ucfirst $items[1];
+        $name =~ s/ ([a-z])/ \U$1/g;
+        $featureNames{$items[0]} = $name;
+    }
+    close INFILE;
+} else {
+    print "Not found: $dbdir/$featureFile\n";
+    print "--> Not storing feature type names\n";
+}
+
 # read country names
 $i = 0;
 open INFILE, '<', "$dbdir/$countryFile" or die "Error opening $dbdir/$countryFile\n";
+print "Reading $dbdir/$countryFile\n";
 while (<INFILE>) {
     next if /^#/;
     my @items = split /\t/;
@@ -474,6 +504,7 @@ die "Too many countries!\n" if $i > 0x100;  # (no default 0 entry)
 # read region (admin1) names
 $i = 0;
 open REGION, '<', "$dbdir/$regionFile" or die "Error opening $dbdir/$regionFile\n";
+print "Reading $dbdir/$regionFile\n";
 while (<REGION>) {
     chomp;
     my @items = split /\t/;
@@ -489,6 +520,7 @@ die "Too many regions!\n" if $i > 0x0fff;   # (account for default 0 entry)
 # read subregion (admin2) names
 $i = 0;
 open ADMIN2, '<', "$dbdir/$admin2File" or die "Error opening $dbdir/$admin2File\n";
+print "Reading $dbdir/$admin2File\n";
 while (<ADMIN2>) {
     chomp;
     my @items = split /\t/;
@@ -539,8 +571,35 @@ if (not $noLang and open INFILE, '<', "$dbdir/$altNamesFile") {
     }
     print "\b\b\b\bDone.\n";
     close INFILE;
+    # read alternate feature names
+    if (%featureNames) {
+        my $lng;
+        foreach $lng (@languages) {
+            next if $lng eq 'en' or not $languages{$lng};
+            my $file = "$dbdir/$featureFile";
+            $file =~ s/_en\./_$lng./ or next;
+            next unless open INFILE, '<', $file;
+            print "Reading $file\n";
+            while (<INFILE>) {
+                my @items = split /\t/;
+                $items[0] =~ s/^.\.//;  # remove feature group and "." separator
+                next unless $featureNames{$items[0]};
+                utf8::decode($items[1]);
+                my $name = ucfirst $items[1];
+                $name =~ s/ (.)/ \U$1/g;
+                # change $name back to byte string
+                if ($] >= 5.006 and (eval { require Encode; Encode::is_utf8($name) } or $@)) {
+                    $name = $@ ? pack('C*',unpack($] < 5.010000 ? 'U0C*' : 'C0C*',$name)) : Encode::encode('utf8',$name);
+                }
+                next if $name eq $featureNames{$items[0]};
+                $featureLang{$lng}{$items[0]} = $name;
+            }
+            close INFILE;
+        }
+    }
 } else {
-    print "Not writing alternate languages ($dbdir/$altNamesFile not found)\n";
+    print "Not found: $dbdir/$altNamesFile\n--> " unless $noLang;
+    print "Not writing alternate languages\n";
     $noLang = 1;
 }
 
@@ -549,7 +608,7 @@ my (%coords, %langLookups);
 foreach $dbfile (@dbfiles) {
     my $database = $$dbfile{file};
 
-    print "Processing $database...   0%";
+    print "Processing database entries...   0%";
     my $i = 0;
     my $num = scalar @{$$dbfile{kept}};
 
@@ -618,6 +677,7 @@ foreach (sort { $a cmp $b } keys %coords) {
     my $items = $coords{$_};
     # @$items=(0.lat,1.lon,2.city,3.cc,4.rgn,5.admin2,6.population,7.timezone,8.feature code,9.alt names)
     my $iCC = $orderCC{$$items[3]};
+    defined $iCC or warn("Unknown country code $$items[3]\n"), next;
     my $iRgn = $orderRgn{"$$items[3]$$items[4]"} || 0;
     my $iSub = $orderSub{"$$items[3]$$items[4].$$items[5]"} || 0;
     my $tn = $tz{$$items[7]};
@@ -626,9 +686,12 @@ foreach (sort { $a cmp $b } keys %coords) {
         $tn = $tz{$$items[7]} = $tzNum++;
     }
     # convert population to our binary format
-    my $pop = sprintf('%.1e',$$items[6]); # format: "3.1e+04"
+    # Note: format in ActivePerl is "3.1e+004", but "3.1+04" in other Perls,
+    # but other Perls will round 34500 to "3.4e+04", so add 1 to get "3.5e+04"
+    $$items[6] += 1 if $$items[6] > 100 and not $$items[6] % 10;
+    my $pop = sprintf('%.1e',$$items[6]);
     # pack CC, population and region index into a 32-bit integer
-    my $code = ($iCC << 24) | (substr($pop,6,1)<<20) | (substr($pop,0,1)<<16) | (substr($pop,2,1)<<12) | $iRgn;
+    my $code = ($iCC << 24) | (substr($pop,-1,1)<<20) | (substr($pop,0,1)<<16) | (substr($pop,2,1)<<12) | $iRgn;
     $fcodes{$$items[8]} = ($fcodes{$$items[8]} || 0) + 1;
     my $fc = $featureCodes{$$items[8]} || 0;
     # store high bit of timezone index
@@ -756,8 +819,12 @@ print OUTFILE $_,"\n" foreach @tz;
 
 print OUTFILE "\0\0\0\0\x05\n"; # section terminator
 
-# write feature codes
-print OUTFILE $_,"\n" foreach @featureCodes;
+# write feature codes and optional names
+foreach (@featureCodes) {
+    print OUTFILE $_;
+    print OUTFILE ' ', $featureNames{$_} if $featureNames{$_};
+    print OUTFILE "\n";
+}
 
 # write terminator and close Geolocation.dat
 print OUTFILE "\0\0\0\0\0\n";   # file terminator
@@ -769,7 +836,9 @@ my $langSize = 0;
 my $langDir = "$outDir/$geoLang";
 # delete existing languages
 unlink <"$langDir/*.pm">;
-unless ($noLang) {
+if ($noLang) {
+    rmdir $langDir;
+} else {
     my $n = scalar(keys %langLookups);
     print "Writing $n language files to $outDir/$geoLang...\n";
     mkdir $langDir, 0777;
@@ -780,6 +849,7 @@ unless ($noLang) {
         my $lkup = $langLookups{$lng};
         my $file = "$myLng.pm";
         open OUT, ">$langDir/$file" or die "Error creating $file\n";
+        binmode OUT;
         print OUT "# Geolocation language translations for $myLng\n";
         print OUT "#\n# Based on Creative Commons database from geonames.org\n\n";
         print OUT "%Image::ExifTool::GeoLang::${myLng}::Translate = (\n";
@@ -837,6 +907,14 @@ unless ($noLang) {
                 }
             }
         }
+        if ($featureLang{$lng}) {
+            print OUT "\n\t# feature types\n";
+            foreach (sort keys %{$featureLang{$lng}}) {
+                my $ftype = $featureLang{$lng}{$_};
+                $ftype =~ s/'/\\'/g;
+                print OUT "\t$_ => '$ftype',\n" 
+            }
+        }
         print OUT ");\n\n1; #end\n";
         $langSize += tell OUT;
         close OUT;

data/bin/config_files/example.config

@@ -293,6 +293,11 @@
     NewXMPxxxStructX => { Name => 'SomeOtherName', Flat => 1 },
 );
 
+# the namespace may be registered so ExifTool generates the expected family 1
+# group names when reading if the UserDefined namespace uses a different prefix
+require Image::ExifTool::XMP;
+Image::ExifTool::XMP::RegisterNamespace(\%Image::ExifTool::UserDefined::xxx);
+
 # Adding a new MIE group requires a few extra definitions
 use Image::ExifTool::MIE;
 %Image::ExifTool::UserDefined::MIETest = (
@@ -364,8 +369,8 @@ $Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
 
 # 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],
+    # (city,region,subregion,country_code,country,timezone,feature_code,population,lat,lon)
+    ['Sinemorets','burgas','Obshtina Tsarevo','BG','','Europe/Sofia','PPL',400,42.06115,27.97833],
 );
 
 #------------------------------------------------------------------------------