exiftool-vendored.exe 12.78.0 → 12.82.0

package/bin/exiftool_files/Changes

@@ -7,6 +7,85 @@ 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.)
 
+Apr. 5, 2024 - Version 12.82 - "GM PDR"
+
+  - Added support for reading GM PDR data from MP4 videos written by cars such
+    as Corvettes and Cameros
+  - Added support for reading timed GPS from Wolfbox dashcam videos
+  - Added "Unknown trailer" to QuickTime warnings originating from an unknown
+    trailer
+  - Added a new Nikon LensID
+  - Extract PreviewImage from Chigee AIO-5 dashcam videos
+  - Changed name and print conversion of a recently added FujiFilm tag
+  - Only issue "Tag not defined" warnings for the first sub-document when using
+    the -p option
+  - Fixed a Nikon Z lens name (github #250)
+  - Fixed Windows version so -sort works properly with -listgeo
+  - API Changes:
+      - Added PrintCSV option for optimized extraction of GM PDR data in CSV
+        format
+
+Mar. 27, 2024 - Version 12.81
+
+  - Added ability to read EXIF and XMP from EXR images
+  - Added ability to delete unknown trailer when writing MOV/MP4 videos
+  - Added ability to write a couple of Stable Diffusion PNG tags
+  - Added ability to write one of the Microsoft Xtra Description tags (github
+    #248)
+  - Added support for using alternate city names in reverse Geolocation
+  - Added support for reading timed GPS from DOD LS600W TS videos
+  - Added support for new version of Canon DR4 files
+  - Added a number of new iTunesInfo tags
+  - Added a new Olympus LensType
+  - Decode a number of new Nikon tags (thanks Warren Hatch)
+  - Allow regular expressions to be used when writing Geolocate tag
+  - Enhanced writing of Geolocate tag to also write Keys:LocationName
+  - Cache the results of the last reverse geolocation search to speed batch
+    processing when multiple files have the same search parameters
+  - Patched problem that could cause runtime errors with some invaid tag names
+  - Fixed a couple of newly added FujiFilm tags
+  - Fixed decoding of FujiFilm AFAreaZoneSize
+  - API Changes:
+      - Added GeolocAltNames option
+
+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
+  - Ignore API Geolocation option when copying tags if none of the Geolocation
+    tags are being copied
+  - 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 ability to geolocate while geotagging
+      - 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 +111,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/exiftool_files/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.82.tar.gz | tar -xf -
+  cd Image-ExifTool-12.82
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -238,6 +238,7 @@ information:
   html/ExifTool.html        - API documentation
   html/TagNames/index.html  - Tag name documentation
   html/geotag.html          - Geotag feature
+  html/geolocation.html     - Geolocation feature
   html/faq.html             - Frequently asked questions
   html/filename.html        - Renaming/moving files
   html/metafiles.html       - Working with metadata sidecar files

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

@@ -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_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.78';
+my $version = '12.82';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -209,7 +209,7 @@ my $tmpFile;        # temporary file to delete on exit
 my $tmpText;        # temporary text file
 my $validFile;      # flag indicating we processed a valid file
 my $verbose;        # verbose setting
-my $vout;           # verbose output file reference (\*STDOUT or \*STDERR)
+my $vout;           # verbose output file reference (\*STDOUT or \*STDERR by default)
 my $windowTitle;    # title for console window
 my %wroteHEAD;      # list of output txt files to which we wrote HEAD
 my $xml;            # flag for XML-formatted output
@@ -683,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') {
@@ -732,6 +732,29 @@ 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;
+            my $isAlt = $mt->Options('GeolocAltNames') ? ',AltNames' : '';
+            $isAlt = '' if $isAlt and not Image::ExifTool::Geolocation::ReadAltNames();
+            print "City,Region,Subregion,CountryCode,Country,TimeZone,FeatureCode,Population,Latitude,Longitude$isAlt\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;
+            my @isUTF8 = (0,1,2,4);   # items that need converting from UTF8
+            push @isUTF8, 10 if $isAlt;
+            for ($i=0; ; ++$i) {
+                my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt,1) or last;
+                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;
+                $_ = defined $_ ? $mt->Decode($_, 'UTF8') : '' foreach @entry[@isUTF8];
+                pop @entry if $isAlt and not $entry[10];
+                print join(',', @entry), "\n";
+            }
         } else { # 'g(\d*)'
             # list all groups in specified family
             my $family = $2 || 0;
@@ -1122,7 +1145,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;
@@ -1361,11 +1384,11 @@ for (;;) {
             $useMWG = 1;
         } elsif (/^([-\w]+:)*(filename|directory|testname)\b/i) {
             $doSetFileName = 1;
-        } elsif (/^([-\w]+:)*(geotag|geotime|geosync)\b/i) {
+        } elsif (/^([-\w]+:)*(geotag|geotime|geosync|geolocate)\b/i) {
             if (lc $2 eq 'geotime') {
                 $addGeotime = '';
             } else {
-                # add geotag/geosync commands first
+                # add geotag/geosync/geolocate commands first
                 unshift @newValues, pop @newValues;
                 if (lc $2 eq 'geotag' and (not defined $addGeotime or $addGeotime) and length $val) {
                     $addGeotime = ($1 || '') . 'Geotime<DateTimeOriginal#';
@@ -1438,11 +1461,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;
@@ -2128,7 +2151,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;
@@ -2155,7 +2178,7 @@ sub GetImageInfo($$)
 
     my $lineCount = 0;
     my ($fp, $outfile, $append);
-    if ($textOut and $verbose and not $tagOut) {
+    if ($textOut and ($verbose or $et->Options('PrintCSV')) and not $tagOut) {
         ($fp, $outfile, $append) = OpenOutputFile($orig);
         $fp or EFile($file), ++$countBad, return;
         # delete file if we exit prematurely (unless appending)
@@ -2278,7 +2301,7 @@ sub GetImageInfo($$)
             $lastDoc = 0;
         }
         for ($doc=0; $doc<=$lastDoc; ++$doc) {
-            my $skipBody;
+            my ($skipBody, $opt);
             foreach $type (qw(HEAD SECT IF BODY ENDS TAIL)) {
                 my $prf = $printFmt{$type} or next;
                 if ($type eq 'HEAD' and defined $outfile) {
@@ -2286,6 +2309,12 @@ sub GetImageInfo($$)
                     $wroteHEAD{$outfile} = 1;
                 }
                 next if $type eq 'BODY' and $skipBody;
+                # silence "IF" warnings and warnings for subdocuments > 1
+                if ($type eq 'IF' or ($doc > 1 and not $$et{OPTIONS}{IgnoreMinorErrors})) {
+                    $opt = 'Silent';
+                } else {
+                    $opt = 'Warn';
+                }
                 if ($lastDoc) {
                     if ($doc) {
                         next if $type eq 'HEAD' or $type eq 'TAIL'; # only repeat SECT/IF/BODY/ENDS
@@ -2295,7 +2324,6 @@ sub GetImageInfo($$)
                     }
                 }
                 my @lines;
-                my $opt = $type eq 'IF' ? 'Silent' : 'Warn'; # silence "IF" warnings
                 foreach (@$prf) {
                     my $line = $et->InsertTagValues($_, \@foundTags, $opt, $grp, $cache);
                     if ($type eq 'IF') {
@@ -4656,7 +4684,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.
 
@@ -5663,7 +5691,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.78 --
+             -- Generated by ExifTool 12.82 --
              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
@@ -6428,22 +6456,26 @@ 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
-         examples:
+         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, GeolocFeature
+         and GeolocAltNames options apply to the -listgeo output. Here are
+         some examples:
 
              -list               # list all tag names
              -list -EXIF:All     # list all EXIF tags
@@ -6456,6 +6488,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
@@ -6539,6 +6572,11 @@ OPTIONS
          full ExifTool distribution and the Image::ExifTool Options for more
          details and for information about geotag configuration options.
 
+         The API Geolocation option may be set to the value "geotag" to also
+         write the name, province/state and country of the nearest city
+         while geotagging. See <https://exiftool.org/geolocation.html> for
+         details.
+
     -globalTimeShift *SHIFT*
          Shift all formatted date/time values by the specified amount when
          reading. Does not apply to unformatted (-n) output. *SHIFT* takes
@@ -7334,6 +7372,12 @@ GEOTAGGING EXAMPLES
          value of DateTimeOriginal is used for geotagging. Local system time
          is assumed unless DateTimeOriginal contains a timezone.
 
+    exiftool -geotag track.log -geolocate=geotag a.jpg
+         Geotag an image and also write geolocation information of the
+         nearest city (city name, state/province and country). Read here for
+         more details about the Geolocation feature:
+         <https://exiftool.org/geolocation.html#Write>
+
     exiftool -geotag t.log -geotime="2009:04:02 13:41:12-05:00" a.jpg
          Geotag an image with the GPS position for a specific time.
 

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.54';
+$VERSION = '3.55';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -95,16 +95,9 @@ my %tweakOrder = (
     Lytro   => 'SigmaRaw',
     PhotoMechanic => 'FotoStation',
     Microsoft     => 'PhotoMechanic',
-   'Microsoft::MP'=> 'Microsoft::MP1',
     GIMP    => 'Microsoft',
-   'Nikon::CameraSettingsD300' => 'Nikon::ShotInfoD300b',
-   'Pentax::LensData' => 'Pentax::LensInfo2',
-   'Sony::SRF2' => 'Sony::SRF',
     DarwinCore => 'AFCP',
-   'MWG::Regions' => 'MWG::Composite',
-   'MWG::Keywords' => 'MWG::Regions',
-   'MWG::Collections' => 'MWG::Keywords',
-   'GoPro::fdsc' => 'GoPro::KBAT',
+    MWG     => 'Shortcuts',
 );
 
 # list of all recognized Format strings
@@ -671,6 +664,15 @@ will extract all available information even for tags not listed.
 Tags in these tables are referred to as "pseudo" tags because their
 information is not stored in the file itself.  As such, B<Writable> tags in
 these tables may be changed without having to rewrite the file.
+},
+    GM => q{
+These tags are extracted from GM/Cosworth PDR (Performance Data Recorder)
+information found in videos from General Motors cars such as Corvette and
+Camero.
+
+Use the API L<PrintCSV|../ExifTool.html#PrintCSV> option to output all timed
+PDR data in CSV format at greatly increased speed and with much lower memory
+usage.
 },
     PodTrailer => q{
 ~head1 NOTES
@@ -708,7 +710,7 @@ my %shortcutNotes = (
         color space when deleting all other metadata
     },
     CommonIFD0 => q{
-        common metadata tags found in IFD0 of TIFF-format images.  Used to simpify
+        common metadata tags found in IFD0 of TIFF-format images.  Used to simplify
         deletion of all metadata from these images.  See
         L<FAQ number 7|../faq.html#Q7> for details
     },
@@ -852,7 +854,7 @@ sub new
         my ($tagID, $binaryTable, $noID, $hexID, $isIPTC, $isXMP);
         $isIPTC = 1 if $writeProc and $writeProc eq \&Image::ExifTool::IPTC::WriteIPTC;
         # generate flattened tag names for structure fields if this is an XMP table
-        if ($$table{GROUPS} and $$table{GROUPS}{0} eq 'XMP') {
+        if ($$table{GROUPS} and $$table{GROUPS}{0} eq 'XMP' or $$vars{ADD_FLATTENED}) {
             Image::ExifTool::XMP::AddFlattenedTags($table);
             $isXMP = 1;
         }
@@ -1526,7 +1528,8 @@ TagID:  foreach $tagID (@keys) {
         my $fullName = ($strName =~ / / ? '' : 'XMP ') . "$strName Struct";
         my $info = $tagNameInfo{$fullName} = [ ];
         my $tag;
-        foreach $tag (sort keys %$struct) {
+        my $order = $$struct{SORT_ORDER} || [ sort keys %$struct ];
+        foreach $tag (@$order) {
             my $tagInfo = $$struct{$tag};
             next unless ref $tagInfo eq 'HASH' and $tag ne 'NAMESPACE' and $tag ne 'GROUPS';
             warn "WARNING: $strName Struct containes $tag\n" if $Image::ExifTool::specialTags{$tag};
@@ -1539,6 +1542,8 @@ TagID:  foreach $tagID (@keys) {
                     push @vals, $writable;
                     $structs{$writable} = 1;
                     $writable = "=$writable";
+                } elsif (defined $$tagInfo{Writable}) {
+                    $writable = 'no';
                 } else {
                     $writable = 'string';
                 }
@@ -1548,7 +1553,7 @@ TagID:  foreach $tagID (@keys) {
             # handle PrintConv lookups in Structure elements
             my $printConv = $$tagInfo{PrintConv};
             if (ref $printConv eq 'HASH') {
-                foreach (sort keys %$printConv) {
+                foreach (sort { NumbersFirst($a,$b) } keys %$printConv) {
                     next if /^(OTHER|BITMASK)$/;
                     push @vals, "$_ = $$printConv{$_}";
                 }
@@ -1822,24 +1827,7 @@ sub TweakOrder($$)
     local $_;
     my ($sortedTables, $tweakOrder) = @_;
     my @tweak = sort keys %$tweakOrder;
-    my (%addedMain, @sorted);
-    # flag files which have a "Main" table
-    foreach (@$sortedTables) {
-        $addedMain{$1} = 0 if /^Image::ExifTool::(\w+)::(\w+)/ and $2 eq 'Main';
-    }
-    # make sure that the main table always comes first in each file
-    foreach (@$sortedTables) {
-        if (/^Image::ExifTool::(\w+)::(\w+)/) {
-            if ($addedMain{$1}) {
-                next if $2 eq 'Main';   # don't add again
-            } elsif (defined $addedMain{$1}) {
-                push @sorted, "Image::ExifTool::${1}::Main" if $2 ne 'Main';
-                $addedMain{$1} = 1;
-            }
-        }
-        push @sorted, $_;
-    }
-    @$sortedTables = @sorted;
+    my (@sorted, %hasMain, %module, $entry);
     # apply manual tweaks
     while (@tweak) {
         my $table = shift @tweak;
@@ -1858,6 +1846,31 @@ sub TweakOrder($$)
         }
         @$sortedTables = (@notMoving, @moving, @after);
     }
+    # flag modules which have a "Main" table, and organize tables by module name
+    foreach (@$sortedTables) {
+        if (not /^Image::ExifTool::(\w+)::(\w+)/) {
+            push @sorted, $_;
+        } else {
+            $hasMain{$1} = 1 if $2 eq 'Main';
+            push @sorted, $module{$1} = [ ] unless $module{$1};
+            push @{$module{$1}}, $_;
+        }
+    }
+    # force MWG::Composite table first
+    my @mwg = ( 'Image::ExifTool::MWG::Composite' );
+    /Composite/ or push @mwg, $_ foreach @{$module{MWG}};
+    @{$module{MWG}} = @mwg;
+    # make sure that the main table always comes first in each file
+    # and that all other tables from this group follow
+    @$sortedTables = ( );
+    foreach $entry (@sorted) {
+        ref $entry or push(@$sortedTables, $entry), next;
+        $$entry[0] =~ /^Image::ExifTool::(\w+)::(\w+)/ or die 'Internal error';
+        my $main = "Image::ExifTool::$1::Main";
+        # main table must come first (even if it doesn't exist)
+        push @$sortedTables, $main if $hasMain{$1};
+        $_ eq $main or push(@$sortedTables, $_) foreach @$entry;
+    }
 }
 
 #------------------------------------------------------------------------------

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

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.38';
+$VERSION = '1.39';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -1758,7 +1758,7 @@ sub ProcessDR4($$;$)
     } else {
         # load DR4 file into memory
         my $buff;
-        $raf->Read($buff, 8) == 8 and $buff eq "IIII\x04\0\x04\0" or return 0;
+        $raf->Read($buff, 8) == 8 and $buff =~ /^IIII[\x04|\x05]\0\x04\0/ or return 0;
         $et->SetFileType();
         $raf->Seek(0, 2) or return $err = 1;
         $dirLen = $raf->Tell();