exiftool-vendored.pl 12.82.0 → 12.85.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.82';
+my $version = '12.85';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -735,6 +735,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;
@@ -1166,7 +1167,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;
@@ -2244,6 +2245,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;
         }
@@ -2296,8 +2305,8 @@ 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 {
@@ -4121,6 +4130,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/;
 }
 
 #------------------------------------------------------------------------------
@@ -4711,50 +4721,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
   ----------------------+----------------------+---------------------
@@ -5642,7 +5652,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
@@ -5668,7 +5678,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.82 --
+    -- 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
@@ -5907,7 +5917,8 @@ processed file by using %C (upper case) instead of %c.  This allows 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
+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 C<exiftool rose.jpg star.jpg jet.jpg ...>:
@@ -6902,6 +6913,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

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,8 @@ sub ConvertPLIST($$);
             1 => 'ProRAW',
             2 => 'Portrait',
             10 => 'Photo',
+            11 => 'Manual Focus', #forum16044
+            12 => 'Scene', #forum16044
         },
     },
     0x0015 => { # (ImageGroupIdentifier, ref 2)
@@ -154,12 +156,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 +177,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 +214,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 +241,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 +253,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 +273,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 +286,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.55';
+$VERSION = '3.56';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -672,7 +672,10 @@ 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.
+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

package/bin/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/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.39';
+$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)

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

package/bin/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)',

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.51';
+$VERSION = '4.52';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -4342,7 +4342,7 @@ my %opcodeInfo = (
         Count => -1,
         Protected => 1,
     },
-    0xcd3b => { # DNG 1.6
+    0xcd3f => { # DNG 1.6
         Name => 'RGBTables',
         Writable => 'undef',
         WriteGroup => 'IFD0',
@@ -4404,6 +4404,23 @@ my %opcodeInfo = (
         WriteGroup => 'IFD0',
         Protected => 1,
     },
+    0xcd49 => { # DNG 1.7.1
+        Name => 'JXLDistance',
+        Writable => 'float',
+        WriteGroup => 'IFD0',
+    },
+    0xcd4a => { # DNG 1.7.1
+        Name => 'JXLEffort',
+        Notes => 'values range from 1=low to 9=high',
+        Writable => 'int32u',
+        WriteGroup => 'IFD0',
+    },
+    0xcd4b => { # DNG 1.7.1
+        Name => 'JXLDecodeSpeed',
+        Notes => 'values range from 1=slow to 4=fast',
+        Writable => 'int32u',
+        WriteGroup => 'IFD0',
+    },
     0xea1c => { #13
         Name => 'Padding',
         Binary => 1,