exiftool_vendored 12.54.0 → 12.56.0

data/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.69';
+$VERSION = '1.70';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -210,7 +210,7 @@ sub LoadTrackLog($$;$)
     my $fix = { };
     my $csvDelim = $et->Options('CSVDelim');
     $csvDelim = ',' unless defined $csvDelim;
-    my (@saveFix, $timeSpan);
+    my (@saveFix, @saveTime, $timeSpan);
     for (;;) {
         $raf->ReadLine($_) or last;
         # determine file format
@@ -357,8 +357,13 @@ sub LoadTrackLog($$;$)
                                 }
                                 # read KML "Point" coordinates
                                 @$fix{'lon','lat','alt'} = split ',', $1;
+                                $$has{alt} = 1 if $$fix{alt};
                             } else {
-                                $$fix{$tag} = $1;
+                                if ($tok eq 'when' and $$fix{'time'}) {
+                                    push @saveTime, $1; # flightaware KML stores times in array
+                                } else {
+                                    $$fix{$tag} = $1;
+                                }
                                 if ($isOrient{$tag}) {
                                     $$has{orient} = 1;
                                 } elsif ($tag eq 'alt') {
@@ -375,7 +380,11 @@ sub LoadTrackLog($$;$)
                         $td = 1;
                     }
                     # validate and store GPS fix
-                    next unless defined $$fix{lat} and defined $$fix{lon} and $$fix{'time'};
+                    next unless defined $$fix{lat} and defined $$fix{lon};
+                    unless (defined $$fix{'time'}) {
+                        next unless @saveTime;
+                        $$fix{'time'} = shift @saveTime; # get next time in flightaware KML list
+                    }
                     unless ($$fix{lat} =~ /^[+-]?\d+\.?\d*/ and $$fix{lon} =~ /^[+-]?\d+\.?\d*/) {
                         $e0 or $et->VPrint(0, "Coordinate format error in $from\n"), $e0 = 1;
                         next;

data/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

data/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.34';
 
 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/',
@@ -119,6 +129,10 @@ sub ProcessJPEG_HDR($$$);
         Name => 'FPXR', # (non-standard location written by some HP models)
         Condition => '$$valPt =~ /^FPXR\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::FlashPix::Main' },
+      }, {
+        Name => 'InfiRayFactory',
+        Condition => '$$self{HasIJPEG}"',
+        SubDirectory => { TagTable => 'Image::ExifTool::InfiRay::Factory' },
       }, {
         Name => 'ThermalParams', # (written by DJI FLIR models)
         Condition => '$$self{Make} eq "DJI" and $$valPt =~ /^\xaa\x55\x12\x06/',
@@ -135,6 +149,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 +179,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 +203,29 @@ 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' },
     }],
-    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/',

data/bin/lib/Image/ExifTool/Matroska.pm

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.13';
+$VERSION = '1.14';
 
 sub HandleStruct($$;$$$$);
 
@@ -708,11 +708,11 @@ my %uidInfo = (
 );
 
 # standardized tag names (ref 2)
-%Image::ExifTool::Matroska::Tags = (
+%Image::ExifTool::Matroska::StdTag = (
     GROUPS => { 2 => 'Video' },
     VARS => { LONG_TAGS => 1 },
     NOTES => q{
-        Standardized Matroska tags (see
+        Standardized Matroska tags, stored in a SimpleTag structure (see
         L<https://www.matroska.org/technical/tagging.html>).
     },
     ORIGINAL    => 'Original',  # struct
@@ -826,7 +826,7 @@ sub HandleStruct($$;$$$$)
 {
     local $_;
     my ($et, $struct, $pid, $pname, $lang, $ctry) = @_;
-    my $tagTbl = GetTagTable('Image::ExifTool::Matroska::Tags');
+    my $tagTbl = GetTagTable('Image::ExifTool::Matroska::StdTag');
     my $tag = $$struct{TagName};
     my $tagInfo = $$tagTbl{$tag};
     # create tag if necessary