exiftool-vendored.pl 12.82.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.82';
+my $version = '12.84';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -1166,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;
@@ -2244,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;
         }
@@ -2296,8 +2304,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 +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/;
 }
 
 #------------------------------------------------------------------------------
@@ -5642,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
@@ -5668,7 +5677,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.82 --
+    -- 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
@@ -6902,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

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.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/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/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,

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub Process_marl($$$);
 sub Process_mrld($$$);
@@ -30,6 +30,8 @@ my %convertUnits = (
     ltr => 'L',
 );
 
+my $pi = 3.141592653589793;
+
 # offsets and scaling factors to convert to reasonable units
 my %changeOffset = (
     C => -273.15,           # K to C
@@ -37,8 +39,8 @@ my %changeOffset = (
 my %changeScale = (
     G => 1 / 9.80665,       # m/s2 to G
     kph => 3.6,             # m/s to km/h
-    deg => 180 / 3.1415926536,   # radians to degrees
-    'deg/sec' => 180 / 3.1415926536,   # rad/s to deg/s
+    deg => 180 / $pi,       # radians to degrees
+    'deg/sec' => 180 / $pi, # rad/s to deg/s
     '%' => 100,             # decimal to %
     kPa => 1/1000,          # Pa to kPa
     rpm => 10,              # ? (arbitrary factor of 10)
@@ -181,7 +183,7 @@ my %channelStruct = (
         Name => 'GPSTrack',
         Description => 'GPS Track',
         Groups => { 2 => 'Location' },
-        PrintConv => 'sprintf("%.2f",$val)',
+        PrintConv => '$val > 360 ? "n/a" : sprintf("%.2f",$val)', # (seen 655.35)
     },
     ABSActive => { },
     AccelPos => { },
@@ -209,7 +211,14 @@ my %channelStruct = (
     EngineTorqureReq => { },
     FuelCapacity => { },
     FuelLevel => { },
-    Gear => { ValueConv => { 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 13=>'N', 14=>'R' } },
+    Gear => {
+        Notes => q{
+            in the PrintCSV output, the value for Neutral is set to -1, and Reverse to
+            -100 for compatibility with RaceRender
+        },
+        CSVConv => { 13 => -1, 14 => -100 },
+        PrintConv => { 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 13=>'N', 14=>'R' }
+    },
     GPSFix => { },
     InfotainOpMode => { },
     IntakeAirTemperature => { },
@@ -261,7 +270,7 @@ my %channelStruct = (
 sub PrintCSV($;$)
 {
     my ($et, $ts) = @_;
-    my $csv = $$et{GMCsv} or return;
+    my $csv = $$et{GMCsv} or return; # get the list of channels with measurements
     @$csv or return;
     my $vals = $$et{GMVals};
     my $gmDict = $$et{GMDictionary};
@@ -271,7 +280,7 @@ sub PrintCSV($;$)
     foreach (@$csv) {
         my $gmChan = $$gmDict[$_];
         $items[$_] = $$vals[$_] * $$gmChan{Mult} + $$gmChan{Off};
-        # apply lookup conversion if applicable (ie. Gear)
+        # apply CSV conversion if applicable (ie. Gear)
         next unless $$gmChan{Conv} and defined $$gmChan{Conv}{$items[$_]};
         $items[$_] = $$gmChan{Conv}{$items[$_]};
     }
@@ -397,7 +406,7 @@ sub Process_mrld($$$)
         my $init = int(($a[6] + $a[7]) / 2); # initial value for difference readings
         # save information about this channel necessary for processing the marl data
         $$gmDict[$chan] = { Name => $name, Mult => $mult, Off => $off, Init => $init };
-        $$gmDict[$chan]{Conv} = $$tagInfo{ValueConv} if ref $$tagInfo{ValueConv} eq 'HASH';
+        $$gmDict[$chan]{Conv} = $$tagInfo{CSVConv};
         $csv and $$csv[$chan] = $a[12] . ($a[3] ? " ($a[3])" : '');
     }
     # channel 0 must not be defined because we use it for the TimeStamp