exiftool_vendored 12.55.0 → 12.57.0

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.64';
+$VERSION = '4.65';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -621,8 +621,10 @@ $VERSION = '4.64';
    '61182.41' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
    '61182.42' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
    '61182.43' => 'Canon RF 135mm F1.8 L IS USM', #42
+   '61182.44' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
+   '61182.45' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
     # we need the RFLensType values for the following...
-   '61182.44' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.46' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -983,7 +985,9 @@ $VERSION = '4.64';
     0x80000465 => 'EOS R10', #42
     0x80000467 => 'PowerShot ZOOM',
     0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
+    0x80000480 => 'EOS R50', #42
     0x80000481 => 'EOS R6 Mark II', #42
+    0x80000487 => 'EOS R8', #42
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -6840,6 +6844,8 @@ my %ciMaxFocal = (
             300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
             302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
             303 => 'Canon RF 135mm F1.8 L IS USM', #42
+            304 => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
+            305 => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },

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

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.42';
+$VERSION = '4.43';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -578,6 +578,13 @@ my %opcodeInfo = (
             ValueConv => '$val=join(" ",unpack("N*",pack("V*",split(" ",$val))));\$val',
             ByteOrder => 'LittleEndian',
         },
+        {
+            Condition => '$$self{Compression} and $$self{Compression} eq "34892"', # DNG Lossy JPEG
+            Name => 'OtherImageStart',
+            IsOffset => 1,
+            OffsetPair => 0x117,  # point to associated byte counts
+            DataTag => 'OtherImage',
+        },
         {
             # (APP1 IFD2 is for Leica JPEG preview)
             Condition => q[
@@ -664,6 +671,12 @@ my %opcodeInfo = (
             ValueConv => '$val=join(" ",unpack("N*",pack("V*",split(" ",$val))));\$val',
             ByteOrder => 'LittleEndian',
         },
+        {
+            Condition => '$$self{Compression} and $$self{Compression} eq "34892"', # DNG Lossy JPEG
+            Name => 'OtherImageLength',
+            OffsetPair => 0x111,   # point to associated offset
+            DataTag => 'OtherImage',
+        },
         {
             # (APP1 IFD2 is for Leica JPEG preview)
             Condition => q[
@@ -4706,12 +4719,28 @@ my %subSecConv = (
             0 => 'OtherImageStart',
             1 => 'OtherImageLength',
         },
+        Desire => {
+            2 => 'OtherImageStart (1)',
+            3 => 'OtherImageLength (1)',
+        },
         Notes => q{
             this tag is writable, and may be used to update existing embedded images,
             but not create or delete them
         },
-        # retrieve the thumbnail from our EXIF data
+        # retrieve all other images
         RawConv => q{
+            if ($val[2] and $val[3]) {
+                my $i = 1;
+                for (;;) {
+                    my %val = ( 0 => $$val{2}, 1 => $$val{3} );
+                    $self->FoundTag($tagInfo, \%val);
+                    ++$i;
+                    $$val{2} = "$$val{0} ($i)";
+                    last unless defined $$self{VALUE}{$$val{2}};
+                    $$val{3} = "$$val{1} ($i)";
+                    last unless defined $$self{VALUE}{$$val{3}};
+                }
+            }
             @grps = $self->GetGroup($$val{0});
             Image::ExifTool::Exif::ExtractImage($self,$val[0],$val[1],"OtherImage");
         },

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::ASF;   # for GetGUID()
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 sub ProcessFPX($$);
 sub ProcessFPXR($$$);
@@ -318,6 +318,10 @@ my %fpxFileType = (
         unrecognized Windows Compound Binary file as a FlashPix (FPX) file.  See
         L<http://graphcomp.com/info/specs/livepicture/fpx.pdf> for the FlashPix
         specification.
+
+        Note that Microsoft is not consistent with the time zone used for some
+        date/time tags, and it may be either UTC or local time depending on the
+        software used to create the file.
     },
     "\x05SummaryInformation" => {
         Name => 'SummaryInfo',
@@ -483,10 +487,18 @@ my %fpxFileType = (
     },
     IeImg => {
         Name => 'EmbeddedImage',
-        Notes => 'embedded images in Scene7 vignette VNT files',
+        Notes => q{
+            embedded images in Scene7 vignette VNT files.  EmbeddedImageRectangle is
+            generated for applicable images, and may be associated with the
+            corresponding EmbeddedImage via the family 3 group name
+        },
         Groups => { 2 => 'Preview' },
         Binary => 1,
     },
+    IeImg_rect => { # (not a real tag -- extracted from Contents of VNT file)
+        Name => 'EmbeddedImageRectangle',
+        Hidden => 1,
+    },
 );
 
 # Summary Information properties
@@ -1059,6 +1071,7 @@ my %fpxFileType = (
 %Image::ExifTool::FlashPix::Contents = (
     PROCESS_PROC => \&ProcessProperties,
     GROUPS => { 2 => 'Image' },
+    OriginalFileName => { Name => 'OriginalFileName', Hidden => 1 }, # (not a real tag -- extracted from Contents of VNT file)
 );
 
 # CompObj tags
@@ -1537,11 +1550,43 @@ sub ProcessContents($$$)
     my $isFLA;
 
     # all of my FLA samples contain "Contents" data, and no other FPX-like samples have
-    # this, but check the data for a familiar pattern to be sure this is FLA: the
-    # Contents of all of my FLA samples start with two bytes (0x29,0x38,0x3f,0x43 or 0x47,
-    # then 0x01) followed by a number of zero bytes (from 0x18 to 0x26 of them, related
-    # somehow to the value of the first byte), followed by the string "DocumentPage"
-    $isFLA = 1 if $$dataPt =~ /^..\0+\xff\xff\x01\0\x0d\0CDocumentPage/s;
+    # this (except Scene7 VNT viles), but check the data for a familiar pattern to be
+    # sure this is FLA: the Contents of all of my FLA samples start with two bytes
+    # (0x29,0x38,0x3f,0x43 or 0x47, then 0x01) followed by a number of zero bytes
+    # (from 0x18 to 0x26 of them, related somehow to the value of the first byte),
+    # followed by the string "DocumentPage"
+    if ($$dataPt =~ /^..\0+\xff\xff\x01\0\x0d\0CDocumentPage/s) {
+        $isFLA = 1;
+    } elsif ($$dataPt =~ /^\0{4}.(.{1,255})\x60\xa1\x3f\x22\0{5}(.{8})/sg) {
+        # this looks like a VNT file
+        $et->OverrideFileType('VNT', 'image/x-vignette');
+        # hack to set proper file description (extension is the same for V-Note files)
+        $Image::ExifTool::static_vars{OverrideFileDescription}{VNT} = 'Scene7 Vignette',
+        my $name = $1;
+        my ($w, $h) = unpack('V2',$2);
+        $et->FoundTag(ImageWidth => $w);
+        $et->FoundTag(ImageHeight => $h);
+        $et->HandleTag($tagTablePtr, OriginalFileName => $name);        
+        if ($$dataPt =~ /\G\x01\0{4}(.{12})/sg) {
+            # (first 4 bytes seem to be number of objects, next 4 bytes are zero, then ICC size)
+            my $size = unpack('x8V', $1);
+            # (not useful?) $et->FoundTag(NumObjects => $num);
+            if ($size and pos($$dataPt) + $size < length($$dataPt)) {
+                my $dat = substr($$dataPt, pos($$dataPt), $size);
+                $et->FoundTag(ICC_Profile => $dat);
+                pos($$dataPt) += $size;
+            }
+            $$et{IeImg_lkup} = { };
+            # - the byte after TargetRole1 is 0x0d or 0x11 for separate images in my samples,
+            #   and 0x1c or 0x23 for inline masks
+            while ($$dataPt =~ /\x0bTargetRole1.\x80\0\0\x01.{4}(.{24})/sg) {
+                my ($index, @coords) = unpack('Vx4V4', $1);
+                next if $index == 0xffffffff;
+                $$et{IeImg_lkup}{$index} and $et->WarnOnce('Duplicate image index');
+                $$et{IeImg_lkup}{$index} = "@coords";
+            }
+        }
+    }
 
     # do a brute-force scan of the "Contents" for UTF-16 XMP
     # (this may always be little-endian, but allow for either endianness)
@@ -2337,8 +2382,24 @@ sub ProcessFPX($$)
                 );
                 my $subTablePtr = GetTagTable($$subdir{TagTable});
                 $et->ProcessDirectory(\%dirInfo, $subTablePtr,  $$subdir{ProcessProc});
+            } elsif (defined $size and $size > length($buff)) {
+                $et->WarnOnce('Truncated object');
             } else {
-                $et->FoundTag($tagInfo, $buff);
+                $buff = substr($buff, 0, $size) if defined $size and $size < length($buff);
+                if ($tag =~ /^IeImg_0*(\d+)$/) {
+                    # set document number for embedded images and their positions (if available, VNT files)
+                    my $num = $1;
+                    $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                    $et->FoundTag($tagInfo, $buff);
+                    if ($$et{IeImg_lkup} and $$et{IeImg_lkup}{$num}) {
+                        # save position of this image
+                        $et->HandleTag($tagTablePtr, IeImg_rect => $$et{IeImg_lkup}{$num});
+                        delete $$et{IeImg_lkup}{$num};
+                    }
+                    delete $$et{DOC_NUM};
+                } else {
+                    $et->FoundTag($tagInfo, $buff);
+                }
             }
             # save object index number for all found tags
             my $num2 = $$et{NUM_FOUND};
@@ -2395,6 +2456,10 @@ sub ProcessFPX($$)
     # process Word document table
     ProcessDocumentTable($et);
 
+    if ($$et{IeImg_lkup} and %{$$et{IeImg_lkup}}) {
+        $et->Warn('Image positions exist without corresponding images');
+    }
+
     return 1;
 }
 

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.86';
+$VERSION = '1.87';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -808,6 +808,7 @@ my %faceCategories = (
             0x00 => 'Normal',
             0x10 => 'F-log',
             0x20 => 'HLG',
+            0x30 => 'F-log2', #forum14384
         },
     },
     0x3804 => { #forum10037

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

@@ -482,13 +482,13 @@ sub PrintTimeStamp($)
 #------------------------------------------------------------------------------
 # Convert degrees to DMS, or whatever the current settings are
 # Inputs: 0) ExifTool reference, 1) Value in degrees,
-#         2) format code (0=no format, 1=CoordFormat, 2=XMP format)
+#         2) format code (0=no format, 1=CoordFormat, 2=XMP format, 3=signed unformatted)
 #         3) 'N' or 'E' if sign is significant and N/S/E/W should be added
 # Returns: DMS string
 sub ToDMS($$;$$)
 {
     my ($et, $val, $doPrintConv, $ref) = @_;
-    my ($fmt, @fmt, $num, $sign, $rtnVal);
+    my ($fmt, @fmt, $num, $sign, $rtnVal, $neg);
 
     unless (length $val) {
         # don't convert an empty value
@@ -505,6 +505,10 @@ sub ToDMS($$;$$)
         }
         $ref = " $ref" unless $doPrintConv and $doPrintConv eq '2';
     } else {
+        if ($doPrintConv and $doPrintConv eq '3') {
+            $neg = 1 if $val < 0;
+            $doPrintConv = 0;
+        }
         $val = abs($val);
         $ref = '';
     }
@@ -554,6 +558,7 @@ sub ToDMS($$;$$)
         # trim trailing zeros in XMP
         $rtnVal =~ s/(\d)0+$ref$/$1$ref/ if $doPrintConv eq '2';
     } else {
+        $neg and map { $_ *= -1 } @c;
         $rtnVal = "@c$ref";
     }
     return $rtnVal;

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