exiftool-vendored.exe 12.84.0 → 12.85.0

package/bin/exiftool_files/Changes

@@ -7,12 +7,34 @@ 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.)
 
+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 option with the ability to return any number of nearby
+  - 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
@@ -21,8 +43,8 @@ Apr. 23, 2024 - Version 12.84
     which have print conversions
   - Fixed problem where a new subregion couldn't be added through a user-defined
     Geolocation database entry
-  - Fixed problem where GeolocFeature option didn't work for some features if a
-    user-generated custom database was used
+  - 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
 

package/bin/exiftool_files/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.84.tar.gz | tar -xf -
-  cd Image-ExifTool-12.84
+  gzip -dc Image-ExifTool-12.85.tar.gz | tar -xf -
+  cd Image-ExifTool-12.85
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/exiftool_files/build_geolocation

@@ -12,6 +12,9 @@
 #               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/
 #
@@ -19,6 +22,7 @@
 #               countryInfo.txt
 #               admin1CodesASCII.txt
 #               admin2Codes.txt
+#               featureCodes_XX.txt (optional)
 #               alternateNamesV2.txt (optional)
 #
 # Output datbase format (Geolocation.dat):
@@ -54,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)
@@ -68,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
@@ -103,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 );
@@ -240,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:
@@ -374,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($)
@@ -386,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;
@@ -422,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 {
@@ -462,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/;
@@ -479,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/;
@@ -494,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/;
@@ -544,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;
 }
 
@@ -554,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}};
 
@@ -623,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]};
@@ -631,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
@@ -761,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
@@ -774,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;
@@ -785,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";
@@ -842,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;

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.84';
+my $version = '12.85';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -748,6 +748,7 @@ for (;;) {
             push @isUTF8, 10 if $isAlt;
             for ($i=0; ; ++$i) {
                 my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt,1) or last;
+                $#entry = 9;    # remove everything after latitude (eg. feature type)
                 next if $minPop and $entry[7] < $minPop;
                 next if %fcodes and $neg ? $fcodes{lc $entry[6]} : not $fcodes{lc $entry[6]};
                 push @entry, Image::ExifTool::Geolocation::GetAltNames($i,1) if $isAlt;
@@ -4728,50 +4729,50 @@ DESCRIPTION
 
       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
       ----------------------+----------------------+---------------------
@@ -5700,7 +5701,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.84 --
+             -- Generated by ExifTool 12.85 --
              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
@@ -5941,11 +5942,12 @@ OPTIONS
          a sequential number to be added to output file names, even if the
          names are different. For %C, a copy number of zero is not omitted
          as it is with %c. A leading '-' causes the number to be reset at
-         the start of each new directory, and '+' has no effect. The number
-         before the decimal place gives the starting index, the number after
-         the decimal place gives the field width. The following examples
-         show the output filenames when used with the command "exiftool
-         rose.jpg star.jpg jet.jpg ...":
+         the start of each new directory (in the original directory
+         structure if the files are being moved), and '+' has no effect. The
+         number before the decimal place gives the starting index, the
+         number after the decimal place gives the field width. The following
+         examples show the output filenames when used with the command
+         "exiftool rose.jpg star.jpg jet.jpg ...":
 
              -w %C%f.txt       # 0rose.txt, 1star.txt, 2jet.txt
              -w %f-%10C.txt    # rose-10.txt, star-11.txt, jet-12.txt

package/bin/exiftool_files/lib/Image/ExifTool/Apple.pm

@@ -128,7 +128,8 @@ sub ConvertPLIST($$);
             1 => 'ProRAW',
             2 => 'Portrait',
             10 => 'Photo',
-            12 => 'Photo (12)', #PH (NC)
+            11 => 'Manual Focus', #forum16044
+            12 => 'Scene', #forum16044
         },
     },
     0x0015 => { # (ImageGroupIdentifier, ref 2)

package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.74';
+$VERSION = '4.75';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -2590,6 +2590,13 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     },
     # 47 - related to aspect ratio: 100=4:3,70=1:1/16:9,90=3:2,60=4:5 (PH G12)
     #      (roughly image area in percent - 4:3=100%,1:1/16:9=75%,3:2=89%,4:5=60%)
+    51 => { #forum16036 (EOS R models)
+        Name => 'Clarity',
+        PrintConv => {
+            OTHER => sub { shift },
+            0x7fff => 'n/a',
+        },
+    },
 );
 
 # focal length information (MakerNotes tag 0x02)
@@ -7031,7 +7038,7 @@ my %ciMaxFocal = (
         },
     },
     2 => { #12
-        Name => 'Sharpness',
+        Name => 'Sharpness', # (unsharp mask strength for the EOS R5)
         Notes => 'all models except the 20D and 350D',
         Condition => '$$self{Model} !~ /\b(20D|350D|REBEL XT|Kiss Digital N)\b/',
         Priority => 0,  # (maybe not as reliable as other sharpness values)
@@ -7077,6 +7084,8 @@ my %ciMaxFocal = (
         Name => 'WBShiftGM',
         Notes => 'positive is a shift toward green',
     },
+    14 => 'UnsharpMaskFineness', #forum16036
+    15 => 'UnsharpMaskThreshold', #forum16036
 );
 
 # Color balance information (MakerNotes tag 0xa9) (ref PH)

package/bin/exiftool_files/lib/Image/ExifTool/DPX.pm

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # DPX tags
 %Image::ExifTool::DPX::Main = (
@@ -97,7 +97,7 @@ $VERSION = '1.06';
             3 => 'Logarithmic',
             4 => 'Unspecified video',
             5 => 'SMPTE 274M',
-            6 => 'ITU-R 704-4',
+            6 => 'ITU-R 709-4',
             7 => 'ITU-R 601-5 system B or G (625)',
             8 => 'ITU-R 601-5 system M (525)',
             9 => 'Composite video (NTSC)',
@@ -124,7 +124,7 @@ $VERSION = '1.06';
             1 => 'Printing density',
             4 => 'Unspecified video',
             5 => 'SMPTE 274M',
-            6 => 'ITU-R 704-4',
+            6 => 'ITU-R 709-4',
             7 => 'ITU-R 601-5 system B or G (625)',
             8 => 'ITU-R 601-5 system M (525)',
             9 => 'Composite video (NTSC)',