exiftool-vendored.pl 12.80.0 → 12.84.0

package/bin/config_files/example.config

@@ -364,8 +364,8 @@ $Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
 
 # Add user-defined cities to the Geolocation lookup
 @Image::ExifTool::UserDefined::Geolocation = (
-    # (city,region,country code,country,timezone,population,lat,lon)
-    ['Sinemorets','Burgas','BG','Bulgaria','Europe/Sofia',400,42.06115,27.97833],
+    # (city,region,subregion,country_code,country,timezone,feature_code,population,lat,lon)
+    ['Sinemorets','burgas','Obshtina Tsarevo','BG','','Europe/Sofia','PPL',400,42.06115,27.97833],
 );
 
 #------------------------------------------------------------------------------

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.80';
+my $version = '12.84';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -217,7 +217,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
@@ -723,17 +723,23 @@ for (;;) {
             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";
+            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) or last;
+                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]};
-                $_ = defined $_ ? $mt->Decode($_, 'UTF8') : '' foreach @entry[0,1,2,4];
+                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*)'
@@ -1160,7 +1166,7 @@ for (;;) {
     if (/^p(-?)$/ or /^printformat(-?)$/i) {
         my $fmt = shift;
         if ($pass) {
-            LoadPrintFormat($fmt, $1);
+            LoadPrintFormat($fmt, $1 || $binaryOutput);
             # load MWG module now if necessary
             if (not $useMWG and grep /^mwg:/i, @requestTags) {
                 $useMWG = 1;
@@ -1365,11 +1371,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#';
@@ -2175,7 +2181,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)
@@ -2238,6 +2244,14 @@ sub GetImageInfo($$)
         if (%printFmt) {
             $et->Options(Duplicates => 1);
             $et->Options(RequestTags => \@requestTags);
+            if ($printFmt{SetTags}) {
+                # initialize options so we can set any tags we want
+                $$et{TAGS_FROM_FILE} = 1;
+                $et->Options(MakerNotes => 1);
+                $et->Options(Struct => 2);
+                $et->Options(List => 1);
+                $et->Options(CoordFormat => '%d %d %.8f') unless $et->Options('CoordFormat');
+            }
         } else {
             @foundTags = @tags;
         }
@@ -2290,15 +2304,15 @@ sub GetImageInfo($$)
         # output using print format file (-p) option
         my ($type, $doc, $grp, $lastDoc, $cache);
         $fileTrailer = '';
-        # repeat for each embedded document if necessary
-        if ($et->Options('ExtractEmbedded')) {
+        # repeat for each sub-document if necessary
+        if ($$et{DOC_COUNT}) {
             # (cache tag keys if there are sub-documents)
             $lastDoc = $$et{DOC_COUNT} and $cache = { };
         } else {
             $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) {
@@ -2306,6 +2320,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
@@ -2315,7 +2335,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') {
@@ -4110,6 +4129,7 @@ sub AddPrintFormat($)
     push @{$printFmt{$type}}, $expr;
     # add to list of requested tags
     push @requestTags, $expr =~ /\$\{?((?:[-\w]+:)*[-\w?*]+)/g;
+    $printFmt{SetTags} = 1 if $expr =~ /\bSetTags\b/;
 }
 
 #------------------------------------------------------------------------------
@@ -5631,7 +5651,7 @@ it from subsequent text (and must be used if subsequent text begins with an
 alphanumeric character, hyphen, underline, colon or number sign).  Use C<$$>
 to represent a C<$> symbol, and C<$/> for a newline.  When the string
 argument is used (ie. I<STR>), a newline is added to the end of the string
-unless B<-p-> is specified.
+unless B<-p-> is specified or the B<-b> option is used.
 
 Multiple B<-p> options may be used.  Lines beginning with C<#[HEAD]> and
 C<#[TAIL]> are output before the first processed file and after the last
@@ -5657,7 +5677,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.80 --
+    -- Generated by ExifTool 12.84 --
     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
@@ -6435,8 +6455,9 @@ otherwise family 0 is assumed.  The B<-l> option may be combined with
 B<-listf>, B<-listr> or B<-listwf> to add file descriptions to the list. 
 The B<-lang> option may be combined with B<-listx> to output descriptions in
 a single language, and the B<-sort> and/or B<-lang> options may be combined
-with B<-listgeo>.  Also, the API GeolocMinPop and GeolocFeature options
-apply to the B<-listgeo> output.  Here are some examples:
+with B<-listgeo>.  Also, the API GeolocMinPop, GeolocFeature and
+GeolocAltNames options apply to the B<-listgeo> output.  Here are some
+examples:
 
     -list               # list all tag names
     -list -EXIF:All     # list all EXIF tags
@@ -6538,6 +6559,10 @@ examples. Also see "geotag.html" in the full ExifTool distribution and the
 L<Image::ExifTool Options|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 L<https://exiftool.org/geolocation.html> for details.
+
 =item B<-globalTimeShift> I<SHIFT>
 
 Shift all formatted date/time values by the specified amount when reading. 
@@ -6886,6 +6911,19 @@ sources.  An equivalent to the above commands using this feature would be:
 
     exiftool -tagsfromfile @ -keywords -api nodups a.jpg
 
+C<SetTags>
+
+Used to set tags in extracted images.  With no arguments, copies all tags
+from the source file to the embedded image:
+
+    exiftool -p '${previewimage;SetTags}' -b a.arw > preview.jpg
+
+Arguments may be added to copy or set specific tags.  Arguments take exactly
+the same form as those on the command line when copying or writing tags,
+but without the leading dash.  For example:
+
+    exiftool -p '${previewimage;SetTags("comment=test","title<filename")}' ...
+
 =head1 WINDOWS UNICODE FILE NAMES
 
 In Windows, command-line arguments are specified using the current code page
@@ -7435,6 +7473,12 @@ Geotag an image (C<a.jpg>) from position information in a GPS track log
 DateTimeOriginal is used for geotagging.  Local system time is assumed
 unless DateTimeOriginal contains a timezone.
 
+=item 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: L<https://exiftool.org/geolocation.html#Write>
+
 =item 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/fmt_files/gpx.fmt

@@ -11,6 +11,7 @@
 #               2018/01/04 - PH Added IF to be sure position exists
 #               2018/01/06 - PH Use DateFmt function instead of -d option
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
+#               2024/04/11 - PH Use %f feature in GPSDateTime formatting
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
 #            2) The -ee3 option is to extract the full track from video files.
@@ -32,7 +33,7 @@
 #[IF]  $gpslatitude $gpslongitude
 #[BODY]<trkpt lat="$gpslatitude#" lon="$gpslongitude#">
 #[BODY]  <ele>$gpsaltitude#</ele>
-#[BODY]  <time>${gpsdatetime#;my ($ss)=/\.\d+/g;DateFmt("%Y-%m-%dT%H:%M:%SZ");s/Z/${ss}Z/ if $ss}</time>
+#[BODY]  <time>${gpsdatetime#;DateFmt("%Y-%m-%dT%H:%M:%S%fZ")}</time>
 #[BODY]</trkpt>
 #[TAIL]</trkseg>
 #[TAIL]</trk>

package/bin/fmt_files/gpx_wpt.fmt

@@ -12,6 +12,7 @@
 #               2018/01/04 - PH Added IF to be sure position exists
 #               2018/01/06 - PH Use DateFmt function instead of -d option
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
+#               2024/04/11 - PH Use %f feature in GPSDateTime formatting
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
 #            2) The -ee3 option is to extract the full track from video files.
@@ -30,7 +31,7 @@
 #[IF]  $gpslatitude $gpslongitude
 #[BODY]<wpt lat="$gpslatitude#" lon="$gpslongitude#">
 #[BODY]  <ele>$gpsaltitude#</ele>
-#[BODY]  <time>${gpsdatetime#;my ($ss)=/\.\d+/g;DateFmt("%Y-%m-%dT%H:%M:%SZ");s/Z/${ss}Z/ if $ss}</time>
+#[BODY]  <time>${gpsdatetime#;DateFmt("%Y-%m-%dT%H:%M:%S%fZ")}</time>
 #[BODY]  <name>$filename</name>
 #[BODY]  <link href="$directory/$filename"/>
 #[BODY]  <sym>Scenic Area</sym>

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub ConvertPLIST($$);
 
@@ -128,6 +128,7 @@ sub ConvertPLIST($$);
             1 => 'ProRAW',
             2 => 'Portrait',
             10 => 'Photo',
+            12 => 'Photo (12)', #PH (NC)
         },
     },
     0x0015 => { # (ImageGroupIdentifier, ref 2)
@@ -154,12 +155,17 @@ sub ConvertPLIST($$);
     },
     # 0x001b - (PhotosRenderEffect, ref 2)
     # 0x001c - (BracketedCaptureSequenceNumber, ref 2)
+    # 0x001c - Flash,  2="On" (ref PH)
     0x001d => { #2
         Name => 'LuminanceNoiseAmplitude',
         Writable => 'rational64s',
     },
     # 0x001e - (OriginatingAppID, ref 2)
-    # 0x001f - int32s: 0,1 (PhotosAppFeatureFlags, ref 2)
+    0x001f => {
+        Name => 'PhotosAppFeatureFlags', #2
+        Notes => 'set if person or pet detected in image', #PH
+        Writable => 'int32s',
+    },
     0x0020 => { # (ImageCaptureRequestIdentifier, ref 2)
         Name => 'ImageCaptureRequestID',
         Writable => 'string',
@@ -170,6 +176,17 @@ sub ConvertPLIST($$);
         Writable => 'rational64s',
     },
     # 0x0022 - (ARKitPhoto, ref 2)
+    0x0023 => {
+        Name => 'AFPerformance', #2
+        Writable => 'int32s',
+        Count => 2,
+        Notes => q{
+            first number maybe related to focus distance, last number maybe related to
+            focus accuracy
+        },
+        PrintConv => 'my @a=split " ",$val; sprintf("%d %d %d",$a[0],$a[1]>>28,$a[1]&0xfffffff)',
+        PrintConvInv => 'my @a=split " ",$val; sprintf("%d %d",$a[0],($a[1]<<28)+$a[2])',
+    },
     # 0x0023 - int32s[2] (AFPerformance, ref 2)
     # 0x0024 - (AFExternalOffset, ref 2)
     0x0025 => { # (StillImageSceneFlags, ref 2)
@@ -196,7 +213,21 @@ sub ConvertPLIST($$);
     },
     # 0x002C - (SpatialOverCaptureImageType, ref 2)
     # 0x002D - (CCT, ref 2)
+    0x002d => { #PH
+        Name => 'ColorTemperature',
+        Writable => 'int32s',
+    },
     # 0x002E - (ApsMode, ref 2)
+    0x002e => { #PH
+        Name => 'CameraType',
+        Writable => 'int32s',
+        PrintConv => {
+            0 => 'Back Wide Angle',
+            1 => 'Back Normal',
+            6 => 'Front',
+        },
+    },
+    # 0x002e - set to 0 for 0.5x (crop?) (ref PH)
     0x002F => { #2
         Name => 'FocusPosition',
         Writable => 'int32s',
@@ -209,7 +240,9 @@ sub ConvertPLIST($$);
     # 0x0032 - (IntelligentDistortionCorrection, ref 2)
     # 0x0033 - (NRFStatus, ref 2)
     # 0x0034 - (NRFInputBracketCount, ref 2)
+    # 0x0034 - 1 for flash on, otherwise doesn't exist (ref PH)
     # 0x0035 - (NRFRegisteredBracketCount, ref 2)
+    # 0x0035 - 0 for flash on, otherwise doesn't exist (ref PH)
     # 0x0036 - (LuxLevel, ref 2)
     # 0x0037 - (LastFocusingMethod, ref 2)
     0x0038 => { # (TimeOfFlightAssistedAutoFocusEstimatorMeasuredDepth, ref 2)
@@ -219,8 +252,10 @@ sub ConvertPLIST($$);
     },
     # 0x0039 - (TimeOfFlightAssistedAutoFocusEstimatorROIType, ref 2)
     # 0x003A - (NRFSRLStatus, ref 2)
+    # 0x003a - non-zero if a person was in the image? (ref PH)
     # 0x003B - (SystemPressureLevel, ref 2)
     # 0x003C - (CameraControlsStatisticsMaster, ref 2)
+    # 0x003c - 4=rear cam, 1=front cam? (ref PH)
     0x003D => { # (TimeOfFlightAssistedAutoFocusEstimatorSensorConfidence, ref 2)
         Name => 'AFConfidence',
         Writable => 'int32s',
@@ -237,6 +272,7 @@ sub ConvertPLIST($$);
     },
     0x0040 => { #2
         Name => 'SemanticStyle',
+        Notes => '_1=Tone, _2=Warm, _3=1.Std,2.Vibrant,3.Rich Contrast,4.Warm,5.Cool', #PH
         ValueConv => \&ConvertPLIST,
     },
     0x0041 => { # (SemanticStyleKey_RenderingVersion, ref 2)
@@ -249,20 +285,28 @@ sub ConvertPLIST($$);
     },
     # 0x0043 - (SemanticStyleKey_ToneBias, ref 2)
     # 0x0044 - (SemanticStyleKey_WarmthBias, ref 2)
-    0x0045 => { # (FrontFacing, ref 2)
-        Name => 'FrontFacingCamera',
-        Writable => 'int32s',
-        PrintConv => { 0 => 'No', 1 => 'Yes' }, #PH (NC)
-    },
+    # 0x0045 - (FrontFacing, ref 2) (not for iPhone15, ref PH)
     # 0x0046 - (TimeOfFlightAssistedAutoFocusEstimatorContainsBlindSpot, ref 2)
     # 0x0047 - (LeaderFollowerAutoFocusLeaderDepth, ref 2)
     # 0x0048 - (LeaderFollowerAutoFocusLeaderFocusMethod, ref 2)
     # 0x0049 - (LeaderFollowerAutoFocusLeaderConfidence, ref 2)
     # 0x004A - (LeaderFollowerAutoFocusLeaderROIType, ref 2)
+    # 0x004a - 2=back normal, 4=back wide angle, 5=front (ref PH)
     # 0x004B - (ZeroShutterLagFailureReason, ref 2)
     # 0x004C - (TimeOfFlightAssistedAutoFocusEstimatorMSPMeasuredDepth, ref 2)
     # 0x004D - (TimeOfFlightAssistedAutoFocusEstimatorMSPSensorConfidence, ref 2)
     # 0x004E - (Camera, ref 2)
+    0x004e => {
+        Name => 'Apple_0x004e',
+        Unknown => 1,
+        # first number is 0 for front cam, 1 for either back cam (ref PH)
+        ValueConv => \&ConvertPLIST,
+    },
+    0x004f => {
+        Name => 'Apple_0x004f',
+        Unknown => 1,
+        ValueConv => \&ConvertPLIST,
+    }
 );
 
 # PLIST-format CMTime structure (ref PH)

package/bin/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.56';
 @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,18 @@ 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.  This option prints the numerical values for each channel in CSV
+format, suitable for import into RaceRender.  In this output, the gear
+numbers for Neutral and Reverse are changed to -1 and -100 respectively for
+compatibility with RaceRender.
 },
     PodTrailer => q{
 ~head1 NOTES
@@ -708,7 +713,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 +857,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 +1531,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 +1545,8 @@ TagID:  foreach $tagID (@keys) {
                     push @vals, $writable;
                     $structs{$writable} = 1;
                     $writable = "=$writable";
+                } elsif (defined $$tagInfo{Writable}) {
+                    $writable = 'no';
                 } else {
                     $writable = 'string';
                 }
@@ -1548,7 +1556,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 +1830,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 +1849,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/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.41';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -1020,6 +1020,18 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     # 0x10018 - fmt=8: 0
     # 0x10020 - fmt=2: ''
     0x10021 => 'CustomPictureStyle', # (string)
+    0x10100 => { #forum15965
+        Name => 'Rating',
+        PrintConv => {
+            0 => 'Unrated',
+            1 => 1,
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            4294967295 => 'Rejected',
+        },
+    },
     0x10101 => {
         Name => 'CheckMark',
         PrintConv => {
@@ -1427,15 +1439,16 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     4 => 'CropY',
     5 => 'CropWidth',
     6 => 'CropHeight',
+    7 => 'CropRotation',
     8 => {
-        Name => 'CropRotation',
+        Name => 'CropAngle',
         Format => 'double',
         PrintConv => 'sprintf("%.7g",$val)',
         PrintConvInv => '$val',
     },
-    0x0a => 'CropOriginalWidth',
-    0x0b => 'CropOriginalHeight',
-    # 0x0c double - value: 100
+    10 => 'CropOriginalWidth',
+    11 => 'CropOriginalHeight',
+    # 12 double - value: 100
 );
 
 # DR4 Stamp Tool tags (ref PH)
@@ -1758,7 +1771,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();

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

@@ -19,6 +19,7 @@ use Image::ExifTool::GPS;
 $VERSION = '1.09';
 
 sub ProcessDJIInfo($$$);
+sub Process_djmd($$$);
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -186,6 +187,34 @@ my %convFloat2 = (
     },
 );
 
+# TODO - eventually add ability to decode this?
+%Image::ExifTool::DJI::djmd = (
+    PROCESS_PROC => \&Process_djmd,
+);
+
+#------------------------------------------------------------------------------
+# Process DJI djmd timed data from Action4 videos (ref PH)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+# TODO: work in progress
+sub Process_djmd($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my ($pos, $bit, $val) = (6, 0, 0);
+    for (;;) {
+        my $v = Get8u($dataPt, $pos);
+        $val += ($v & 0x7f) << $bit;
+        last unless $v & 0x80;
+        ++$pos;
+        $bit += 7;
+    }
+    $pos += 49;
+    my @a = unpack("x${pos}fxfxfxfx3fxfxf", $$dataPt);
+    print "$val @a\n";
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref