exiftool-vendored.exe 12.76.0 → 12.80.0

package/bin/exiftool_files/Changes

@@ -7,6 +7,80 @@ 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
+  - Added new config file entry (@Image::ExifTool::UserDefined::Arguments) to
+    allow default command-line arguments to be specified
+  - Added print conversion for TIFF-EPStandardID
+  - Added ability to delete Nextbase information from MP4 videos
+  - Decode timed GPS from MP4 videos written by Nextbase software
+  - Decode a number of new tags from Nextbase MP4 videos
+  - Decode a few new tags from Garmin MP4 videos
+  - Extract PreviewJXL images from DNG 1.7 files
+  - Generate Validate, ImageDataHash and UserParam tags earlier to allow them to
+    be used in UserDefined Composite tags
+  - Enhanced the -c option so a minus sign in the format specification prints a
+    signed coordinate without a leading "+" for positive numbers
+  - Changed formatting of some Accelerometer tags for consistency
+  - Changed behaviour of -ee3 option to do a brute-force scan for freeGPS in the
+    media data even when referenced by 'gps ' atom
+  - Other internal changes to decoding of timed GPS from videos
+  - Fixed problem were ExifTool would give up on extracting some types of timed
+    GPS from videos after 100 void fixes
+  - Fixed bug that could cause runtime error when reading Ogg files
+  - 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
+
+Feb. 16, 2024 - Version 12.77
+
+  - Added new Olympus CameraType and LensType value (thanks herb)
+  - Added a new Canon Irix LensType
+  - Added the ability to delete MacOS XAttrMDItemWhereFroms
+  - Decode a few new Canon DPP tags (thanks John Moyer)
+  - Decode timed GPS from Adzome GS65H MOV videos
+  - Improved handling of XML-unfriendly characters in JSON field names (fixes
+    issue where -X option could produce invalid XML when reading JSON with the
+    -struct option)
+  - Fixed decoding of ShutterCount for Canon G5X-ii CR3 files
+
 Jan. 31, 2024 - Version 12.76 (production release)
 
   - Properly implement patch of 12.45 to avoid duplicating raw data when writing
@@ -19,6 +93,7 @@ Jan. 30, 2024 - Version 12.75 (production release)
   - CORRUPTION WARNING: Fixed bug introduced in 12.45 which could result in
     corrupted Sony ARW images from some newer models when rewriting lossless
     compressed ARW images which were previously edited by 12.44 or earlier
+    (the corruption is repairable, but requires a special version of ExifTool)
   - Added ability to read C2PA JUMBF metadata from PDF and SVG files
   - Added ability to extract JUMBF metadata as a block
   - Added read support for C2PA (JUMBF-format) files
@@ -547,7 +622,7 @@ Oct. 13, 2022 - Version 12.48
     "Z" are actually in Zulu time -- a bit of a mess really)
   - Prevent dynamically-generated Unknown tags from being extracted when the
     -validate option is used without -u
-  - Patched to better handle irregular timestamps in streaming GPS of NextBase
+  - Patched to better handle irregular timestamps in streaming GPS of Nextbase
     dashcam videos
   - Fixed incompatibility with Sigma Photo Pro which could result in Sigma Photo
     Pro corrupting an ExifTool-edited X3F image (the section length in the
@@ -1419,7 +1494,7 @@ Mar. 19, 2020 - Version 11.92
   - Added a new Nikon LensID (thanks Wolfgang Exler)
   - Decode a few new Leica tags (thanks Tim Gray)
   - Decode AccelerometerData from Samsung Gear 360 videos
-  - Fixed a couple of problems decoding timed GPS metadata from NextBase dashcam
+  - Fixed a couple of problems decoding timed GPS metadata from Nextbase dashcam
     videos
   - Fixed problem where -X option could produce invalid XML when reading
     corrupted XMP
@@ -2308,7 +2383,7 @@ Oct. 16, 2018 - Version 11.14
 
 Oct. 9, 2018 - Version 11.13
 
-  - Decode GPS from NextBase 512G dashcam MOV videos (different than 512GW)
+  - Decode GPS from Nextbase 512G dashcam MOV videos (different than 512GW)
   - Added a new Canon LensType (thanks LibRaw)
   - Minor improvements to verbose dump of streaming GPS metadata
   - Reverted change of version 10.71 which resulted in Windows not recognizing
@@ -2327,7 +2402,7 @@ Oct. 2, 2018 - Version 11.12
   - Added a new Sony/Minolta LensType (thanks LibRaw and Jos Roost)
   - Added a new Nikon LensID
   - Decode a few new Sony SRF2 tags (thanks LibRaw)
-  - Decode GPS from NextBase 512GW dashcam MOV videos
+  - Decode GPS from Nextbase 512GW dashcam MOV videos
   - Validate MS-DOC FIB before extracting contained tags
   - Fixed bug extracting GPSSpeed for some dashcam models
 

package/bin/exiftool_files/README

@@ -20,7 +20,7 @@ supported by ExifTool (r = read, w = write, c = create):
   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     | OGV   r     | SEQ   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
@@ -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.76.tar.gz | tar -xf -
-  cd Image-ExifTool-12.76
+  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/exiftool_files/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/exiftool_files/config_files/example.config

@@ -6,7 +6,8 @@
 # Notes:        This example file shows how to define your own shortcuts and
 #               add new EXIF, IPTC, XMP, PNG, MIE and Composite tags, as well
 #               as how to specify preferred lenses for the LensID tag, and
-#               define new file types and default ExifTool option values.
+#               define new file types and default ExifTool API options and
+#               command-line arguments.
 #
 #               Note that unknown tags may be extracted even if they aren't
 #               defined, but tags must be defined to be written.  Also note
@@ -345,7 +346,7 @@ use Image::ExifTool::MIE;
 use Image::ExifTool::QuickTime;
 $Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
 
-# Specify default ExifTool option values
+# Specify default ExifTool API options
 # (see the Options function documentation for available options)
 %Image::ExifTool::UserDefined::Options = (
     CoordFormat => '%.6f',  # change default GPS coordinate format
@@ -354,5 +355,18 @@ $Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
     RequestAll => 3,        # request additional tags not normally generated
 );
 
+# Specify default exiftool command-line arguments
+# - inserted before all other options except -config
+# - applies to all -execute'd commands
+@Image::ExifTool::UserDefined::Arguments = (
+    '-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_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.76';
+my $version = '12.80';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -158,6 +158,7 @@ my $filtered;       # flag indicating file was filtered by name
 my $filterFlag;     # file filter flag (0x01=deny extensions, 0x02=allow extensions, 0x04=add ext)
 my $fixLen;         # flag to fix description lengths when writing alternate languages
 my $forcePrint;     # string to use for missing tag values (undef to not print them)
+my $geoOnly;        # flag to extract Geolocation tags only
 my $helped;         # flag to avoid printing help if no tags specified
 my $html;           # flag for html-formatted output (2=html dump)
 my $interrupted;    # flag set if CTRL-C is pressed during a critical process
@@ -503,6 +504,7 @@ undef $fileHeader;
 undef $filtered;
 undef $fixLen;
 undef $forcePrint;
+undef $geoOnly;
 undef $ignoreHidden;
 undef $joinLists;
 undef $langOpt;
@@ -600,6 +602,11 @@ if (not $preserveTime and $^O eq 'MSWin32') {
     $preserveTime = 2 if  eval { require Win32::API } and eval { require Win32API::File };
 }
 
+# add user-defined command-line arguments
+if (@Image::ExifTool::UserDefined::Arguments) {
+    unshift @ARGV, @Image::ExifTool::UserDefined::Arguments;
+}
+
 # parse command-line options in 2 passes...
 # pass 1: set all of our ExifTool options
 # pass 2: print all of our help and informational output (-list, -ver, etc)
@@ -676,7 +683,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') {
@@ -725,6 +732,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;
@@ -1115,7 +1139,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;
@@ -1427,8 +1451,15 @@ if ($useMWG and not defined $mt->Options('CharsetEXIF')) {
     $mt->Options(CharsetEXIF => 'UTF8');
 }
 
+# allow geolocation without input file if set to a position
+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 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;
@@ -2110,6 +2141,11 @@ sub GetImageInfo($$)
         # can't make use of $info if verbose because we must reprocess
         # the file anyway to generate the verbose output
         undef $info if $verbose or defined $fastCondition;
+    } elsif ($file =~ s/^(\@JSON:)(.*)/$1/) {
+        # read JSON file from command line
+        my $dat = $2;
+        $info = $et->ImageInfo(\$dat, \@foundTags);
+        if ($geoOnly) { /^Geolocation/ or delete $$info{$_} foreach keys %$info; $file = ' ' }
     }
     if (defined $deleteOrig) {
         Progress($vout, "======== $file") if defined $verbose;
@@ -2166,7 +2202,7 @@ sub GetImageInfo($$)
     }
 
     # extract information from this file
-    unless ($file eq '-' or $et->Exists($file)) {
+    unless ($file eq '-' or $et->Exists($file) or $info) {
         Warn "Error: File not found - $file\n";
         FileNotFound($file);
         defined $outfile and close($fp), undef($tmpText), $et->Unlink($outfile);
@@ -2351,7 +2387,7 @@ sub GetImageInfo($$)
                 # set delimiters for JSON or PHP output
                 ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
                 print $fp ",\n" if $comma;
-                print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file));
+                print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file),1);
                 $comma = 1;
                 $ind = (defined $showGroup and not $allGroup) ? '    ' : '  ';
             } elsif ($csv) {
@@ -3369,7 +3405,22 @@ sub FormatXML($$$)
         my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
         foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
-            my $tok = /:/ ? $_ : ($grp . ':' . $_);
+            my ($ns, $tg) = ($grp, $_);
+            if (/^(.*?):(.*)/) {
+                if ($grp eq 'JSON') {
+                    $tg =~ tr/:/_/; # colons in JSON structure elements are not namespaces
+                } else {
+                    ($ns, $tg) = ($1, $2);
+                }
+            }
+            # validate XML attribute name
+            my $name;
+            foreach $name ($ns, $tg) {
+                # make sure name is valid for XML
+                $name =~ tr/-_A-Za-z0-9.//dc;
+                $name = '_' . $name if $name !~ /^[_A-Za-z]/;
+            }
+            my $tok = $ns . ':' . $tg;
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
         }
         $val = "$val2\n$ind";
@@ -3512,7 +3563,7 @@ sub PrintCSV()
 }
 
 #------------------------------------------------------------------------------
-# Add tag groups from structure fields to a list
+# Add tag groups from structure fields to a list for xmlns
 # Inputs: 0) tag value, 1) parent group, 2) group hash ref, 3) group list ref
 sub AddGroups($$$$)
 {
@@ -3520,7 +3571,7 @@ sub AddGroups($$$$)
     my ($key, $val2);
     if (ref $val eq 'HASH') {
         foreach $key (sort keys %$val) {
-            if ($key =~ /(.*?):/ and not $$groupHash{$1}) {
+            if ($key =~ /^(.*?):/ and not $$groupHash{$1} and $grp ne 'JSON') {
                 $$groupHash{$1} = $grp;
                 push @$groupList, $1;
             }
@@ -4622,7 +4673,7 @@ SYNOPSIS
     *FILE*...
 
   Other
-    exiftool [ -ver | -list[w|f|r|wf|g[*NUM*]|d|x] ]
+    exiftool [ -ver | -list[w|f|r|wf|g[*NUM*]|d|x|geo] ]
 
     For specific examples, see the EXAMPLES sections below.
 
@@ -4663,7 +4714,7 @@ DESCRIPTION
       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     | OGV   r     | SEQ   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
@@ -4831,7 +4882,7 @@ OPTIONS
       -common_args                     Define common arguments
       -config CFGFILE                  Specify configuration file name
       -echo[NUM] TEXT                  Echo text to stdout or stderr
-      -efile[NUM][!] ERRFILE           Save names of files with errors
+      -efile[NUM][!] TXTFILE           Save names of files with errors
       -execute[NUM]                    Execute multiple commands on one line
       -fileNUM ALTFILE                 Load tags from alternate file
       -list_dir                        List directories, not their contents
@@ -5229,8 +5280,10 @@ OPTIONS
          different when copying tags using the -tagsFromFile option.
 
          2) If the hemisphere is known, a reference direction (N, S, E or W)
-         is appended to each printed coordinate, but adding a "+" to the
-         format specifier (eg. "%+.6f") prints a signed coordinate instead.
+         is appended to each printed coordinate, but adding a "+" or "-" to
+         the format specifier (eg. "%+.6f" or "%-.6f") prints a signed
+         coordinate instead. ("+" adds a leading "+" for positive
+         coordinates, but "-" does not.)
 
          3) This print formatting may be disabled with the -n option to
          extract coordinates as signed decimal degrees.
@@ -5627,7 +5680,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.76 --
+             -- 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
@@ -6392,21 +6445,25 @@ OPTIONS
          This option is used to prevent the command window from closing when
          run as a Windows drag and drop application.
 
-    -list, -listw, -listf, -listr, -listwf, -listg[*NUM*], -listd, -listx
+    -list, -listw, -listf, -listr, -listwf, -listg[*NUM*], -listd, -listx,
+    -listgeo
          Print a list of all valid tag names (-list), all writable tag names
          (-listw), all supported file extensions (-listf), all recognized
          file extensions (-listr), all writable file extensions (-listwf),
          all tag groups [in a specified family] (-listg[*NUM*]), all
-         deletable tag groups (-listd), or an XML database of tag details
-         including language translations (-listx). The -list, -listw and
-         -listx options may be followed by an additional argument of the
-         form "-GROUP:All" to list only tags in a specific group, where
-         "GROUP" is one or more family 0-2 group names (excepting EXIF IFD
-         groups) separated by colons. With -listg, *NUM* may be given to
-         specify the group family, otherwise family 0 is assumed. The -l
-         option may be combined with -listf, -listr or -listwf to add file
-         descriptions to the list. The -lang option may be combined with
-         -listx to output descriptions in a single language. Here are some
+         deletable tag groups (-listd), an XML database of tag details
+         including language translations (-listx), or the Geolocation
+         database (-listgeo). The -list, -listw and -listx options may be
+         followed by an additional argument of the form "-GROUP:All" to list
+         only tags in a specific group, where "GROUP" is one or more family
+         0-2 group names (excepting EXIF IFD groups) separated by colons.
+         With -listg, *NUM* may be given to specify the group family,
+         otherwise family 0 is assumed. The -l option may be combined with
+         -listf, -listr or -listwf to add file descriptions to the list. The
+         -lang option may be combined with -listx to output descriptions in
+         a single language, and the -sort and/or -lang options may be
+         combined with -listgeo. Also, the API GeolocMinPop and
+         GeolocFeature options apply to the -listgeo output. Here are some
          examples:
 
              -list               # list all tag names
@@ -6420,6 +6477,7 @@ OPTIONS
              -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 -listx, the -s option shortens the output by
          omitting the descriptions and values (as in the last example
@@ -6601,14 +6659,14 @@ OPTIONS
          -echo4, "${status}" may be used in the *TEXT* string to represent
          the numerical exit status of the command (see "EXIT STATUS").
 
-    -efile[*NUM*][!] *ERRFILE*
+    -efile[*NUM*][!] *TXTFILE*
          Save the names of files giving errors (*NUM* missing or 1), files
          that were unchanged (*NUM* is 2), files that fail the -if condition
          (*NUM* is 4), files that were updated (*NUM* is 8), files that were
          created (*NUM* is 16), or any combination thereof by summing *NUM*
          (eg. -efile3 is the same has having both -efile and -efile2 options
-         with the same *ERRFILE*). By default, file names are appended to
-         any existing *ERRFILE*, but *ERRFILE* is overwritten if an
+         with the same *TXTFILE*). By default, file names are appended to
+         any existing *TXTFILE*, but *TXTFILE* is overwritten if an
          exclamation point is added to the option (eg. -efile!). Saves the
          name of the file specified by the -srcfile option if applicable.
 

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.73';
+$VERSION = '4.74';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -203,7 +203,8 @@ $VERSION = '4.73';
     52 => 'Canon EF-S 18-55mm f/3.5-5.6 IS II', #PH
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
     54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
-    60 => 'Irix 11mm f/4', #50
+    60 => 'Irix 11mm f/4 or 15mm f/2.4', #50
+    60.1 => 'Irix 15mm f/2.4', #forum15655
     63 => 'Irix 30mm F1.4 Dragonfly', #IB
     80 => 'Canon TS-E 50mm f/2.8L Macro', #42
     81 => 'Canon TS-E 90mm f/2.8L Macro', #42
@@ -4731,6 +4732,7 @@ my %ciMaxFocal = (
     NOTES => 'CameraInfo tags for the PowerShot G5 X Mark II.',
     0x0293 => {
         Name => 'ShutterCount',
+        Condition => '$$self{FileType} eq "JPEG"',
         Format => 'int32u',
         Notes => 'includes electronic + mechanical shutter',
         # - advances by 1 for each photo file, regardless of mechanical or electronic shutter
@@ -4738,26 +4740,27 @@ my %ciMaxFocal = (
         # - advances for time lapse video files
         # - creating a new directory or resetting the counter from the menu doesn't affect this shutter count
     },
+    0x0a95 => {
+        Name => 'ShutterCount',
+        Condition => '$$self{FileType} eq "CR3"',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+    },
     0x0b21 => {
         Name => 'DirectoryIndex',
+        Condition => '$$self{FileType} eq "JPEG"',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
     },
     0x0b2d => {
         Name => 'FileIndex',
+        Condition => '$$self{FileType} eq "JPEG"',
         Format => 'int32u',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
         ValueConv => '$val + 1',
         ValueConvInv => '$val - 1',
     },
-    #0x0b39 => {
-    #    Name => 'DirectoryIndex',
-    #    Groups => { 2 => 'Image' },
-    #    Format => 'int32u',
-    #    ValueConv => '$val - 1',
-    #    ValueConvInv => '$val + 1',
-    #},
 );
 
 # Canon camera information for 70D (MakerNotes tag 0x0d) (ref PH)