exiftool-vendored.pl 12.55.0 → 12.60.0

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

@@ -29,7 +29,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.70';
+$VERSION = '1.71';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -92,7 +92,7 @@ my %isOrient = ( dir => 1, pitch => 1, roll => 1 ); # test for orientation key
 # tags which may exist separately in some formats (eg. CSV)
 my %sepTags = ( dir => 1, pitch => 1, roll => 1, track => 1, speed => 1 );
 
-# conversion factors for GPSSpeed
+# conversion factors for GPSSpeed (standard EXIF units only)
 my %speedConv = (
     'K' => 1.852,       # km/h per knot
     'M' => 1.150779448, # mph per knot
@@ -102,7 +102,14 @@ my %speedConv = (
     'mph' => 'M',
 );
 
-my $secPerDay = 24 * 3600;      # a useful constant
+# all recognized speed conversion factors (non-EXIF included)
+my %otherConv = (
+    'km/h' => 1.852,
+    'mph'  => 1.150779448,
+    'm/s'  => 0.514444,
+);
+
+my $secPerDay = 24 * 3600;  # a useful constant
 
 #------------------------------------------------------------------------------
 # Load GPS track log file
@@ -140,6 +147,7 @@ sub LoadTrackLog($$;$)
     my ($raf, $from, $time, $isDate, $noDate, $noDateChanged, $lastDate, $dateFlarm);
     my ($nmeaStart, $fixSecs, @fixTimes, $lastFix, %nmea, @csvHeadings, $sortFixes);
     my ($canCut, $cutPDOP, $cutHDOP, $cutSats, $e0, $e1, @tmp, $trackFile, $trackTime);
+    my $scaleSpeed;
 
     unless (eval { require Time::Local }) {
         return 'Geotag feature requires Time::Local installed';
@@ -246,7 +254,9 @@ sub LoadTrackLog($$;$)
                 $format = 'CSV';
                 # convert recognized headings to our parameter names
                 foreach (@csvHeadings) {
+                    my $head = $_;
                     my $param;
+                    my $xtra = '';
                     s/^GPS ?//; # remove leading "GPS" to simplify regex patterns
                     if (/^Time ?\(seconds\)$/i) { # DJI
                         # DJI CSV log files have a column "Time(seconds)" which is seconds since
@@ -274,7 +284,16 @@ sub LoadTrackLog($$;$)
                         /ref$/i and $param .= 'ref';
                     } elsif (/^(Pos)?Alt/i) {
                         $param = 'alt';
-                    } elsif (/^(Angle)?(Heading|Track)/i) {
+                    } elsif (/^Speed/i) {
+                        $param = 'speed';
+                        # (recognize units in brackets)
+                        if (m{\((mph|km/h|m/s)\)}) {
+                            $scaleSpeed = $otherConv{$1};
+                            $xtra = " in $1";
+                        } else {
+                            $xtra = ' in knots';
+                        }
+                    } elsif (/^(Angle)?(Heading|Track|Bearing)/i) {
                         $param = 'track';
                     } elsif (/^(Angle)?Pitch/i or /^Camera ?Elevation ?Angle/i) {
                         $param = 'pitch';
@@ -284,10 +303,10 @@ sub LoadTrackLog($$;$)
                         $param = 'dir';
                     }
                     if ($param) {
-                        $et->VPrint(2, "CSV column '${_}' is $param\n");
+                        $et->VPrint(2, "CSV column '${head}' is $param$xtra\n");
                         $_ = $param;
                     } else {
-                        $et->VPrint(2, "CSV column '${_}' ignored\n");
+                        $et->VPrint(2, "CSV column '${head}' ignored\n");
                         $_ = '';    # ignore this column
                     }
                 }
@@ -479,9 +498,11 @@ DoneFix:    $isDate = 1;
             my ($param, $date, $secs, %neg);
             foreach $param (@csvHeadings) {
                 my $val = shift @vals;
-                last unless defined $val;
+                last unless defined $val and length($val);
                 next unless $param;
                 if ($param eq 'datetime') {
+                    # (fix formats like "24.07.2016 13:47:30")
+                    $val =~ s/^(\d{2})[^\d](\d{2})[^\d](\d{4}) /$3:$2:$1 /;
                     local $SIG{'__WARN__'} = sub { };
                     my $dateTime = $et->InverseDateTime($val);
                     if ($dateTime) {
@@ -510,6 +531,7 @@ DoneFix:    $isDate = 1;
                     $date = $trackTime;
                     $secs = $val;
                 } else {
+                    $val /= $scaleSpeed if $scaleSpeed and $param eq 'speed';
                     $$fix{$param} = $val;
                     $$has{$param} = 1 if $sepTags{$param};
                 }
@@ -1204,6 +1226,7 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
             @r = $et->SetNewValue(GPSTrackRef => (defined $$tFix{track} ? 'T' : undef), %opts);
             my ($spd, $ref);
             if (defined($spd = $$tFix{speed})) {
+                # convert to specified units if necessary
                 $ref = $$et{OPTIONS}{GeoSpeedRef};
                 if ($ref and defined $speedConv{$ref}) {
                     $ref = $speedConv{$ref} if $speedConv{$speedConv{$ref}};

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

@@ -0,0 +1,227 @@
+#------------------------------------------------------------------------------
+# File:         InfiRay.pm
+#
+# Description:  InfiRay IJPEG thermal image metadata
+#
+# Revisions:    2023-02-08 - M. Del Sol Created
+#
+# References:   1) https://github.com/exiftool/exiftool/pull/184
+#
+# Notes:        Information in this document has been mostly gathered by
+#               disassembling the P2 Pro Android app, version 1.0.8.230111.
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::InfiRay;
+
+use strict;
+use vars qw($VERSION);
+
+$VERSION = '1.00';
+
+my %convFloat2  = ( PrintConv => 'sprintf("%.2f", $val)' );
+my %convPercent = ( PrintConv => 'sprintf("%.1f %%", $val * 100)' );
+my %convMeters  = ( PrintConv => 'sprintf("%.2f m", $val)' );
+my %convCelsius = ( PrintConv => 'sprintf("%.2f C", $val)' );
+
+# InfiRay IJPEG version header, found in JPEGs APP2
+%Image::ExifTool::InfiRay::Version = (
+    GROUPS => { 0 => 'APP2', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP2 IJPEG version header, found
+        in JPEGs taken with the P2 Pro camera app.
+    },
+    0x00 => { Name => 'IJPEGVersion',         Format => 'int8u[4]' },
+  # 0x04 => { Name => 'IJPEGSignature',       Format => 'string[6]' }, # "IJPEG\0"
+    0x0c => { Name => 'IJPEGOrgType',         Format => 'int8u' },
+    0x0d => { Name => 'IJPEGDispType',        Format => 'int8u' },
+    0x0e => { Name => 'IJPEGRotate',          Format => 'int8u' },
+    0x0f => { Name => 'IJPEGMirrorFlip',      Format => 'int8u' },
+    0x10 => { Name => 'ImageColorSwitchable', Format => 'int8u' },
+    0x11 => { Name => 'ThermalColorPalette',  Format => 'int16u' },
+    0x20 => { Name => 'IRDataSize',           Format => 'int64u' },
+    0x28 => { Name => 'IRDataFormat',         Format => 'int16u' },
+    0x2a => { Name => 'IRImageWidth',         Format => 'int16u' },
+    0x2c => { Name => 'IRImageHeight',        Format => 'int16u' },
+    0x2e => { Name => 'IRImageBpp',           Format => 'int8u' },
+    0x30 => { Name => 'TempDataSize',         Format => 'int64u' },
+    0x38 => { Name => 'TempDataFormat',       Format => 'int16u' },
+    0x3a => { Name => 'TempImageWidth',       Format => 'int16u' },
+    0x3c => { Name => 'TempImageHeight',      Format => 'int16u' },
+    0x3e => { Name => 'TempImageBpp',         Format => 'int8u' },
+    0x40 => { Name => 'VisibleDataSize',      Format => 'int64u' },
+    0x48 => { Name => 'VisibleDataFormat',    Format => 'int16u' },
+    0x4a => { Name => 'VisibleImageWidth',    Format => 'int16u' },
+    0x4c => { Name => 'VisibleImageHeight',   Format => 'int16u' },
+    0x4e => { Name => 'VisibleImageBpp',      Format => 'int8u' },
+);
+
+# InfiRay IJPEG factory temperature, found in IJPEG's APP4 section
+%Image::ExifTool::InfiRay::Factory = (
+    GROUPS => { 0 => 'APP4', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP4 IJPEG camera factory
+        defaults and calibration data.
+    },
+    0x00 => { Name => 'IJPEGTempVersion',   Format => 'int8u[4]' },
+    0x04 => { Name => 'FactDefEmissivity',  Format => 'int8s' },
+    0x05 => { Name => 'FactDefTau',         Format => 'int8s' },
+    0x06 => { Name => 'FactDefTa',          Format => 'int16s' },
+    0x08 => { Name => 'FactDefTu',          Format => 'int16s' },
+    0x0a => { Name => 'FactDefDist',        Format => 'int16s' },
+    0x0c => { Name => 'FactDefA0',          Format => 'int32s' },
+    0x10 => { Name => 'FactDefB0',          Format => 'int32s' },
+    0x14 => { Name => 'FactDefA1',          Format => 'int32s' },
+    0x18 => { Name => 'FactDefB1',          Format => 'int32s' },
+    0x1c => { Name => 'FactDefP0',          Format => 'int32s' },
+    0x20 => { Name => 'FactDefP1',          Format => 'int32s' },
+    0x24 => { Name => 'FactDefP2',          Format => 'int32s' },
+    0x44 => { Name => 'FactRelSensorTemp',  Format => 'int16s' },
+    0x46 => { Name => 'FactRelShutterTemp', Format => 'int16s' },
+    0x48 => { Name => 'FactRelLensTemp',    Format => 'int16s' },
+    0x64 => { Name => 'FactStatusGain',     Format => 'int8s' },
+    0x65 => { Name => 'FactStatusEnvOK',    Format => 'int8s' },
+    0x66 => { Name => 'FactStatusDistOK',   Format => 'int8s' },
+    0x67 => { Name => 'FactStatusTempMap',  Format => 'int8s' },
+    # Missing: ndist_table_len, ndist_table, nuc_t_table_len, nuc_t_table
+);
+
+# InfiRay IJPEG picture temperature information, found in IJPEG's APP5 section
+%Image::ExifTool::InfiRay::Picture = (
+    GROUPS => { 0 => 'APP5', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP5 IJPEG picture temperature
+        information.
+    },
+    0x00 => { Name => 'EnvironmentTemp',    Format => 'float', %convCelsius },
+    0x04 => { Name => 'Distance',           Format => 'float', %convMeters },
+    0x08 => { Name => 'Emissivity',         Format => 'float', %convFloat2 },
+    0x0c => { Name => 'Humidity',           Format => 'float', %convPercent },
+    0x10 => { Name => 'ReferenceTemp',      Format => 'float', %convCelsius },
+    0x20 => { Name => 'TempUnit',           Format => 'int8u' },
+    0x21 => { Name => 'ShowCenterTemp',     Format => 'int8u' },
+    0x22 => { Name => 'ShowMaxTemp',        Format => 'int8u' },
+    0x23 => { Name => 'ShowMinTemp',        Format => 'int8u' },
+    0x24 => { Name => 'TempMeasureCount',   Format => 'int16u' },
+    # TODO: process extra measurements list
+);
+
+# InfiRay IJPEG visual-infrared mixing mode, found in IJPEG's APP6 section
+%Image::ExifTool::InfiRay::MixMode = (
+    GROUPS => { 0 => 'APP6', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP6 IJPEG visual-infrared mixing
+        mode section.
+    },
+    0x00 => { Name => 'MixMode',            Format => 'int8u' },
+    0x01 => { Name => 'FusionIntensity',    Format => 'float', %convPercent },
+    0x05 => { Name => 'OffsetAdjustment',   Format => 'float' },
+    0x09 => { Name => 'CorrectionAsix',     Format => 'float[30]' },
+);
+
+# InfiRay IJPEG camera operation mode, found in IJPEG's APP7 section
+#
+# I do not know in what units these times are, or what do they represent.
+%Image::ExifTool::InfiRay::OpMode = (
+    GROUPS => { 0 => 'APP7', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP7 IJPEG camera operation mode
+        section.
+    },
+    0x00 => { Name => 'WorkingMode',        Format => 'int8u' },
+    0x01 => { Name => 'IntegralTime',       Format => 'int32u' },
+    0x05 => { Name => 'IntegratTimeHdr',    Format => 'int32u' },
+    0x09 => { Name => 'GainStable',         Format => 'int8u' },
+    0x0a => { Name => 'TempControlEnable',  Format => 'int8u' },
+    0x0b => { Name => 'DeviceTemp',         Format => 'float', %convCelsius },
+);
+
+# InfiRay IJPEG isothermal information, found in IJPEG's APP8 section
+#
+# I have genuinely no clue what is the meaning of any of this information, or
+# what is it used for.
+%Image::ExifTool::InfiRay::Isothermal = (
+    GROUPS => { 0 => 'APP8', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP8 IJPEG picture isothermal
+        information.
+    },
+    0x00 => { Name => 'IsothermalMax', Format => 'float' },
+    0x04 => { Name => 'IsothermalMin', Format => 'float' },
+    0x08 => { Name => 'ChromaBarMax',  Format => 'float' },
+    0x0c => { Name => 'ChromaBarMin',  Format => 'float' },
+);
+
+# InfiRay IJPEG sensor information, found in IJPEG's APP9 section
+%Image::ExifTool::InfiRay::Sensor = (
+    GROUPS => { 0 => 'APP9', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
+    NOTES => q{
+        This table lists tags found in the InfiRay APP9 IJPEG sensor information
+        chunk.
+    },
+    0x000 => { Name => 'IRSensorManufacturer',      Format => 'string[12]' },
+    0x040 => { Name => 'IRSensorName',              Format => 'string[12]' },
+    0x080 => { Name => 'IRSensorPartNumber',        Format => 'string[32]' },
+    0x0c0 => { Name => 'IRSensorSerialNumber',      Format => 'string[32]' },
+    0x100 => { Name => 'IRSensorFirmware',          Format => 'string[12]' },
+    0x140 => { Name => 'IRSensorAperture',          Format => 'float', %convFloat2 },
+    0x144 => { Name => 'IRFocalLength',             Format => 'float', %convFloat2 },
+    0x180 => { Name => 'VisibleSensorManufacturer', Format => 'string[12]' },
+    0x1c0 => { Name => 'VisibleSensorName',         Format => 'string[12]' },
+    0x200 => { Name => 'VisibleSensorPartNumber',   Format => 'string[32]' },
+    0x240 => { Name => 'VisibleSensorSerialNumber', Format => 'string[32]' },
+    0x280 => { Name => 'VisibleSensorFirmware',     Format => 'string[12]' },
+    0x2c0 => { Name => 'VisibleSensorAperture',     Format => 'float' },
+    0x2c4 => { Name => 'VisibleFocalLength',        Format => 'float' },
+);
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::InfiRay - InfiRay IJPEG thermal image metadata
+
+=head1 SYNOPSIS
+
+This module is loaded automatically by Image::ExifTool when required.
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to interpret
+metadata and thermal-related information of pictures saved by the InfiRay
+IJPEG SDK, used in cameras such as the P2 Pro.
+
+=head1 AUTHOR
+
+Copyright 2003-2023, Marcos Del Sol Vives (marcos at orca.pet)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://github.com/exiftool/exiftool/pull/184>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/InfiRay Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

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

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.33';
+$VERSION = '1.35';
 
 sub ProcessOcad($$$);
 sub ProcessJPEG_HDR($$$);
@@ -83,6 +83,10 @@ sub ProcessJPEG_HDR($$$);
         Name => 'MPF',
         Condition => '$$valPt =~ /^MPF\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::MPF::Main' },
+      }, {
+        Name => 'InfiRayVersion',
+        Condition => '$$valPt =~ /^....IJPEG\0/s',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::Version' },
       }, {
         Name => 'PreviewImage',
         Condition => '$$valPt =~ /^(|QVGA\0|BGTH)\xff\xd8\xff\xdb/',
@@ -106,6 +110,12 @@ sub ProcessJPEG_HDR($$$);
         Notes => 'DJI raw thermal data',
         Groups => { 0 => 'APP3', 1 => 'DJI', 2 => 'Image' },
         Binary => 1,
+      }, {
+        Name => 'ImagingData', # (written by InfiRay models)
+        Condition => '$$self{HasIJPEG}',
+        Notes => 'InfiRay IR+thermal+visible data',
+        Groups => { 0 => 'APP3', 1 => 'InfiRay', 2 => 'Image' },
+        Binary => 1,
       }, {
         Name => 'PreviewImage', # (written by HP R837 and Samsung S1060)
         Condition => '$$valPt =~ /^\xff\xd8\xff\xdb/',
@@ -120,9 +130,21 @@ sub ProcessJPEG_HDR($$$);
         Condition => '$$valPt =~ /^FPXR\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::FlashPix::Main' },
       }, {
-        Name => 'ThermalParams', # (written by DJI FLIR models)
+        Name => 'InfiRayFactory',
+        Condition => '$$self{HasIJPEG}"',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::Factory' },
+      }, {
+        Name => 'ThermalParams', # (written by some DJI FLIR models)
         Condition => '$$self{Make} eq "DJI" and $$valPt =~ /^\xaa\x55\x12\x06/',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::ThermalParams' },
+      }, {
+        Name => 'ThermalParams2', # (written by M3T)
+        Condition => '$$self{Make} eq "DJI" and $$valPt =~ /^(.{32})?.{32}\x2c\x01\x20\0/s',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::ThermalParams2' },
+      }, {
+        Name => 'ThermalParams3', # (written by M30T)
+        Condition => '$$self{Make} eq "DJI" and $$valPt =~ /^.{32}\xaa\x55\x38\0/s',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::ThermalParams3' },
       }, {
         Name => 'PreviewImage', # (eg. Samsung S1060)
         Notes => 'continued from APP3',
@@ -135,6 +157,10 @@ sub ProcessJPEG_HDR($$$);
         Name => 'SamsungUniqueID',
         Condition => '$$valPt =~ /ssuniqueid\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::APP5' },
+      }, {
+        Name => 'InfiRayPicture',
+        Condition => '$$self{HasIJPEG}',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::Picture' },
       }, {
         Name => 'ThermalCalibration', # (written by DJI FLIR models)
         Condition => '$$self{Make} eq "DJI"',
@@ -161,13 +187,17 @@ sub ProcessJPEG_HDR($$$);
         Name => 'GoPro',
         Condition => '$$valPt =~ /^GoPro\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::GoPro::GPMF' },
-      # also seen Motorola APP6 "MMIMETA\0", with sub-types: AL3A,ALED,MMI0,MOTD,QC3A
+      }, {
+        Name => 'InfiRayMixMode',
+        Condition => '$$self{HasIJPEG}',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::MixMode' },
       }, {
         Name => 'DJI_DTAT', # (written by ZH20T)
         Condition => '$$valPt =~ /^DTAT\0\0.\{/s',
         Groups => { 0 => 'APP6', 1 => 'DJI' },
         Notes => 'DJI Thermal Analysis Tool record',
         ValueConv => 'substr($val,7)',
+      # also seen Motorola APP6 "MMIMETA\0", with sub-types: AL3A,ALED,MMI0,MOTD,QC3A
     }],
     APP7 => [{
         Name => 'Pentax',
@@ -181,17 +211,33 @@ sub ProcessJPEG_HDR($$$);
         Name => 'Qualcomm',
         Condition => '$$valPt =~ /^\x1aQualcomm Camera Attributes/',
         SubDirectory => { TagTable => 'Image::ExifTool::Qualcomm::Main' },
+      }, {
+        Name => 'InfiRayOpMode',
+        Condition => '$$self{HasIJPEG}',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::OpMode' },
+      }, {
+        Name => 'DJI-DBG',
+        Condition => '$$valPt =~ /^DJI-DBG\0/',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::Info' },
     }],
-    APP8 => {
+    APP8 => [{
         Name => 'SPIFF',
         Condition => '$$valPt =~ /^SPIFF\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::JPEG::SPIFF' },
-    },
-    APP9 => {
+      }, {
+        Name => 'InfiRayIsothermal',
+        Condition => '$$self{HasIJPEG}',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::Isothermal' },
+    }],
+    APP9 => [{
         Name => 'MediaJukebox',
         Condition => '$$valPt =~ /^Media Jukebox\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::JPEG::MediaJukebox' },
-    },
+      }, {
+        Name => 'InfiRaySensor',
+        Condition => '$$self{HasIJPEG}',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::Sensor' },
+    }],
     APP10 => {
         Name => 'Comment',
         Condition => '$$valPt =~ /^UNICODE\0/',

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

@@ -59,7 +59,7 @@ my %jp2Map = (
 # map of where information is written in a JXL image
 my %jxlMap = (
     IFD0         => 'Exif',
-    XMP          => 'XML',
+    XMP          => 'xml ',
    'Exif'        => 'JP2',
     IFD1         => 'IFD0',
     EXIF         => 'IFD0', # to write EXIF as a block
@@ -827,8 +827,8 @@ sub CreateNewBoxes($$)
     # add UUID boxes (and/or JXL Exif/XML boxes)
     foreach $dirName (sort keys %$addDirs) {
         # handle JPEG XL XMP and EXIF
-        if ($dirName eq 'XML' or $dirName eq 'Exif') {
-            my ($tag, $dir) = $dirName eq 'XML' ? ('xml ', 'XMP') : ('Exif', 'EXIF');
+        if ($dirName eq 'xml ' or $dirName eq 'Exif') {
+            my ($tag, $dir) = $dirName eq 'xml ' ? ('xml ', 'XMP') : ('Exif', 'EXIF');
             my $tagInfo = $Image::ExifTool::Jpeg2000::Main{$tag};
             $tagInfo = $$tagInfo[1] if ref $tagInfo eq 'ARRAY'; # (hack for stupid JXL XMP)
             my $subdir = $$tagInfo{SubDirectory};
@@ -1123,8 +1123,8 @@ sub ProcessJpeg2000Box($$$)
             my $subTable = GetTagTable($$subdir{TagTable}) || $tagTablePtr;
             if ($outfile) {
                 # remove this directory from our create list
-                delete $$et{AddJp2Dirs}{$$tagInfo{Name}};   # (eg. 'EXIF')
-                delete $$et{AddJp2Dirs}{$boxID};            # (eg. 'Exif')
+                delete $$et{AddJp2Dirs}{$$tagInfo{Name}};   # (eg. 'EXIF' or 'XMP')
+                delete $$et{AddJp2Dirs}{$boxID};            # (eg. 'Exif' or 'xml ')
                 my $newdir;
                 # only edit writable UUID, Exif and jp2h boxes
                 if ($uuid or $boxID eq 'Exif' or ($boxID eq 'xml ' and $$et{IsJXL}) or

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

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::LIF::Main = (
     GROUPS => { 0 => 'XML', 1 => 'XML', 2 => 'Image' },
@@ -30,7 +30,15 @@ $VERSION = '1.00';
             my $unixTimeZero = 134774 * 24 * 3600;
             my @vals = split ' ', $val;
             foreach (@vals) {
-                $_ = 1e-7 * hex($_);
+                if (/[^0-9a-f]/i) {
+                    $_ = '0000:00:00 00:00:00';
+                } elsif (length $_ > 8) {
+                    my $lo = hex substr($_, -8);
+                    my $hi = hex substr($_, 0, -8);
+                    $_ = 1e-7 * ($hi * 4294967296 + $lo);
+                } else {
+                    $_ = 1e-7 * hex($_);
+                }
                 # shift from Jan 1, 1601 to Jan 1, 1970
                 $_ = Image::ExifTool::ConvertUnixTime($_ - $unixTimeZero);
             }

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -507,7 +507,7 @@ sub ProcessLinkInfo($$$)
     if ($lif & 0x01) {
         # read Volume ID
         $off = Get32u($dataPt, 0x0c);
-        if ($off + 0x20 <= $dataLen) {
+        if ($off and $off + 0x20 <= $dataLen) {
             # my $len = Get32u($dataPt, $off);
             $et->HandleTag($tagTablePtr, 'DriveType', undef, %opts, Start=>$off+4);
             $et->HandleTag($tagTablePtr, 'DriveSerialNumber', undef, %opts, Start=>$off+8);
@@ -545,6 +545,7 @@ sub ProcessLinkInfo($$$)
         $off = Get32u($dataPt, 0x14);
         if ($off and $off + 0x14 <= $dataLen) {
             my $siz = Get32u($dataPt, $off);
+            return 0 if $off + $siz > $dataLen; 
             $pos = Get32u($dataPt, $off + 0x08);
             if ($pos > 0x14 and $siz >= 0x18) {
                 $pos = Get32u($dataPt, $off + 0x14);
@@ -552,7 +553,7 @@ sub ProcessLinkInfo($$$)
             } else {
                 undef $unicode;
             }
-            $val = GetString($dataPt, $pos, $unicode);
+            $val = GetString($dataPt, $off + $pos, $unicode);
             if (defined $val) {
                 $size = length $val;
                 $val = $et->Decode($val, 'UCS2') if $unicode;
@@ -567,7 +568,7 @@ sub ProcessLinkInfo($$$)
                 } else {
                     undef $unicode;
                 }
-                $val = GetString($dataPt, $pos, $unicode);
+                $val = GetString($dataPt, $off + $pos, $unicode);
                 if (defined $val) {
                     $size = length $val;
                     $val = $et->Decode($val, 'UCS2') if $unicode;

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

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.50';
+$VERSION = '1.51';
 
 sub ProcessMIE($$);
 sub ProcessMIEGroup($$$);
@@ -391,7 +391,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             -30", "-40.5", "40 30 0.00 S"
         },
         ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
-        ValueConvInv => 'Image::ExifTool::GPS::ToDMS($self, $val, 0)',
+        ValueConvInv => 'Image::ExifTool::GPS::ToDMS($self, $val, 3)',
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
         PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lat")',
     },
@@ -404,7 +404,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             negative, but may be entered as positive numbers with a trailing 'W'
         },
         ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val, 1)',
-        ValueConvInv => 'Image::ExifTool::GPS::ToDMS($self, $val, 0)',
+        ValueConvInv => 'Image::ExifTool::GPS::ToDMS($self, $val, 3)',
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
         PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lon")',
     },

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.16';
+$VERSION = '1.17';
 
 %Image::ExifTool::MPEG::Audio = (
     GROUPS => { 2 => 'Audio' },
@@ -599,7 +599,7 @@ sub ProcessMPEGVideo($$)
         return 0;
     }
     # set file type if not done already
-    $et->SetFileType('MPEG') unless $$et{VALUE}{FileType};
+    $et->SetFileType('MPEG') unless $$et{FileType};
 
     my $tagTablePtr = GetTagTable('Image::ExifTool::MPEG::Video');
     ProcessFrameHeader($et, $tagTablePtr, $w1, $w2);

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

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '2.12';
+$VERSION = '2.14';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -92,11 +92,12 @@ my $debug;          # set to 1 to enable debugging code
     {
         Name => 'MakerNoteDJIInfo',
         Condition => '$$valPt =~ /^\[ae_dbg_info:/',
+        NotIFD => 1,
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::Info' },
     },
     {
         Name => 'MakerNoteDJI',
-        Condition => '$$self{Make} eq "DJI" and $$valPt !~ /^...\@AMBA/s',
+        Condition => '$$self{Make} eq "DJI" and $$valPt !~ /^(...\@AMBA|DJI)/s',
         SubDirectory => {
             TagTable => 'Image::ExifTool::DJI::Main',
             Start => '$valuePtr',