exiftool-vendored.pl 12.54.0 → 12.56.0

package/bin/Changes

@@ -7,13 +7,43 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.50. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Feb. 9, 2023 - Version 12.56
+
+  - Added support for VNT (both Scene7 Vignette and V-Note document) files
+  - Added read support for InfiRay APP2 metadata (thanks Marcos Del Sol Vives)
+  - Added some new Sony LensType values (thanks Jos Roost and Francois Piette)
+  - Added a new FujiFilm VideoRecordingMode value (thanks Greybeard)
+  - Added two new Canon LensTypes and CanonModelIDs (thanks Norbert Wasser)
+  - Added ability to extract semantic images from Apple ProRaw DNG files
+  - Added read support for the PNG cICP chunk
+  - Decode more Nikon tags (thanks Warren Hatch)
+  - Extract PreviewImage from Insta360 trailer record 0x200
+  - Extract EmbeddedImageRectangle and some other new tags from VNT files
+  - Minor improvement to arg_files/xmp2exif.args (thanks StarGeek)
+  - Enhanced -ee option to extract metadata from all frames of a multipart EXR
+    image
+  - Removed EXR Layout tag and incorporated into new Flags tag
+  - Patched possible hang problem when reading corrupted .rm audio files
+
+Jan. 17, 2023 - Version 12.55
+
+  - Added support for geotagging from FlightAware KML files
+  - Decode two more types of timed GPS from MOV/MP4 videos (66 types now)
+  - Decode a few new Nikon tags (thanks Warren Hatch)
+  - Decode a new Samsung HEIC tag
+  - Decode FujiFilm RollAngle
+  - Fixed bug where the FlatName property wasn't working properly for some
+    user-defined structure tags
+
 Jan. 6, 2023 - Version 12.54
 
-  - Increased precision of Sony FocusDistance2 conversion
   - Decode a number of new Apple tags (thanks Frank Rupprecht)
-  - Fixed bug writing QuickTime-format files which have a zero-sized mdat (ie.
-    media data extends to end of file) which would cause an incorrect mdat size
-    to be written
+  - Increased precision of Sony FocusDistance2 conversion
+  - Fixed problem where GPSAltitude wasn't being set when geotagging from KML
+    files
+  - Fixed bug writing HEIC/AVIF files which have a zero-sized mdat (ie. media
+    data extends to end of file) which could cause an incorrect mdat size to be
+    written
 
 Jan. 4, 2023 - Version 12.53
 

package/bin/MANIFEST

@@ -90,6 +90,7 @@ html/TagNames/ID3.html
 html/TagNames/IPTC.html
 html/TagNames/ISO.html
 html/TagNames/ITC.html
+html/TagNames/InfiRay.html
 html/TagNames/JFIF.html
 html/TagNames/JPEG.html
 html/TagNames/JSON.html
@@ -301,6 +302,7 @@ lib/Image/ExifTool/ISO.pm
 lib/Image/ExifTool/ITC.pm
 lib/Image/ExifTool/Import.pm
 lib/Image/ExifTool/InDesign.pm
+lib/Image/ExifTool/InfiRay.pm
 lib/Image/ExifTool/JPEG.pm
 lib/Image/ExifTool/JPEGDigest.pm
 lib/Image/ExifTool/JSON.pm
@@ -616,6 +618,8 @@ t/InDesign.t
 t/InDesign_2.out
 t/InDesign_3.out
 t/InDesign_4.out
+t/InfiRay.t
+t/InfiRay_2.out
 t/JSON.t
 t/JSON_2.out
 t/JVC.t
@@ -1034,6 +1038,7 @@ t/images/IPTC.jpg
 t/images/ISO.iso
 t/images/ITC.itc
 t/images/InDesign.indd
+t/images/InfiRay.jpg
 t/images/JSON.json
 t/images/JVC.jpg
 t/images/JVC2.jpg

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.54",
+   "version" : "12.56",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.54
+version: 12.56
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -39,23 +39,23 @@ supported by ExifTool (r = read, w = write, c = create):
   CHM   r     | FPF   r     | MKA   r     | PFA   r     | TTF   r
   COS   r     | FPX   r     | MKS   r     | PFB   r     | TXT   r
   CR2   r/w   | GIF   r/w   | MKV   r     | PFM   r     | VCF   r
-  CR3   r/w   | GPR   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
-  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VSD   r
-  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | WAV   r
-  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WDP   r/w
-  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WEBP  r/w
-  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
-  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WMA   r
-  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMV   r
-  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WTV   r
-  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WV    r
-  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
-  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
-  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
-  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
-  DOC   r     | INX   r     | NEF   r/w   | RA    r     | ZIP   r
-  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
+  CR3   r/w   | GPR   r/w   | MNG   r/w   | PGF   r     | VNT   r
+  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VRD   r/w/c
+  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | VSD   r
+  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WAV   r
+  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WDP   r/w
+  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r/w
+  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WEBM  r
+  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMA   r
+  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WMV   r
+  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
+  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
+  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
+  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
+  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
+  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
+  DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
+  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   | ZIP   r
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.54.tar.gz | tar -xf -
-  cd Image-ExifTool-12.54
+  gzip -dc Image-ExifTool-12.56.tar.gz | tar -xf -
+  cd Image-ExifTool-12.56
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/arg_files/xmp2exif.args

@@ -15,6 +15,8 @@
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
 #               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
 #               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
+#               2023/01/30 - PH Also write Composite:SubSecDateTimeOriginal from
+#                               XMP-exif:DateTimeOriginal
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -34,8 +36,9 @@
 -EXIF:all < XMP-tiff:all
 -EXIF:ImageDescription < XMP-dc:Description
 -EXIF:DateTimeOriginal < XMP-photoshop:DateCreated
-# the following 3 SubSec tags also write/delete the corresponding EXIF
+# the following SubSec tags also write/delete the corresponding EXIF
 # SubSecTime and OffsetTime tags as appropriate
+-Composite:SubSecDateTimeOriginal < XMP-exif:DateTimeOriginal
 -Composite:SubSecDateTimeOriginal < XMP-photoshop:DateCreated
 -Composite:SubSecCreateDate < XMP-xmp:CreateDate
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.54';
+my $version = '12.56';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -725,7 +725,7 @@ for (;;) {
             }
             if ($verbose > 1) {
                 print "Include directories:\n";
-                print "  $_\n" foreach @INC;
+                ref $_ or print "  $_\n" foreach @INC;
             }
         } else {
             print "$version$str$Image::ExifTool::RELEASE\n";
@@ -4558,23 +4558,23 @@ supported by ExifTool (r = read, w = write, c = create):
   CHM   r     | FPF   r     | MKA   r     | PFA   r     | TTF   r
   COS   r     | FPX   r     | MKS   r     | PFB   r     | TXT   r
   CR2   r/w   | GIF   r/w   | MKV   r     | PFM   r     | VCF   r
-  CR3   r/w   | GPR   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
-  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VSD   r
-  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | WAV   r
-  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WDP   r/w
-  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WEBP  r/w
-  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
-  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WMA   r
-  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMV   r
-  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WTV   r
-  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WV    r
-  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
-  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
-  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
-  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
-  DOC   r     | INX   r     | NEF   r/w   | RA    r     | ZIP   r
-  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
+  CR3   r/w   | GPR   r/w   | MNG   r/w   | PGF   r     | VNT   r
+  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VRD   r/w/c
+  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | VSD   r
+  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WAV   r
+  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WDP   r/w
+  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r/w
+  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WEBM  r
+  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMA   r
+  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WMV   r
+  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
+  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
+  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
+  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
+  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
+  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
+  DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
+  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   | ZIP   r
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5206,9 +5206,9 @@ Note that this option is fundamentally different than all other output
 format options because it requires information from all input files to be
 buffered in memory before the output is written.  This may result in
 excessive memory usage when processing a very large number of files with a
-single command.  Also, it makes this option incompatible with the B<-w>
-option.  When processing a large number of files, it is recommended to
-either use the JSON (B<-j>) or XML (B<-X>) output format, or use B<-p> to
+single command.  Also, it makes this option incompatible with the B<-w> and
+B<-W> options.  When processing a large number of files, it is recommended
+to either use the JSON (B<-j>) or XML (B<-X>) output format, or use B<-p> to
 generate a fixed-column CSV file instead of using the B<-csv> option.
 
 =item B<-csvDelim> I<STR>
@@ -5477,7 +5477,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.54 --
+    -- Generated by ExifTool 12.56 --
     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
@@ -5981,8 +5981,8 @@ of the file processing.  Both functions have a return value of 1.  Case is
 significant for function names.
 
     End()    - end processing after this file
-    EndDir() - end processing of files in this directory (not
-               compatible with the B<-fileOrder> option)
+    EndDir() - end processing of files in the current directory
+               after this file (not compatible with -fileOrder)
 
 Notes:
 
@@ -6326,9 +6326,9 @@ seconds behind GPS:
 
     exiftool -geosync=+1:20 -geotag a.log DIR
 
-Advanced C<Geosync> features allow a linear time drift correction and
-synchronization from previously geotagged images.  See "geotag.html" in the
-full ExifTool distribution for more information.
+Advanced C<Geosync> features allow a piecewise linear time drift correction
+and synchronization from previously geotagged images.  See "geotag.html" in
+the full ExifTool distribution for more information.
 
 Multiple B<-geotag> options may be used to concatenate GPS track log data.
 Also, a single B<-geotag> option may be used to load multiple track log

package/bin/fmt_files/kml.fmt

@@ -24,6 +24,9 @@
 #               extension is used.
 #            5) The -fileOrder option may be used to control the order of the
 #               generated placemarks when processing multiple files.
+#            6) The "0" in the coordinates line may be changed to "$gpsaltitude#"
+#               and the altitudeMode may be changed to "absolute" to store
+#               altitude information if it exists in the track log.
 #------------------------------------------------------------------------------
 #[HEAD]<?xml version="1.0" encoding="UTF-8"?>
 #[HEAD]<kml xmlns="http://earth.google.com/kml/2.0">

package/bin/fmt_files/kml_track.fmt

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# File:         kml.fmt
+# File:         kml_track.fmt
 #
 # Description:  Example ExifTool print format file for generating a
 #               track in Google Earth KML format from a collection of
@@ -7,11 +7,11 @@
 #
 # Usage:        From a collection of images:
 #
-#                 exiftool -p kml.fmt -r DIR [...] > out.kml
+#                 exiftool -p kml_track.fmt -r DIR [...] > out.kml
 #
 #               From video files:
 #
-#                 exiftool -p kml.fmt -ee3 FILEorDIR [...] > out.kml
+#                 exiftool -p kml_track.fmt -ee3 FILEorDIR [...] > out.kml
 #
 # Requires:     ExifTool version 10.41 or later
 #
@@ -21,6 +21,9 @@
 #            2) The -fileOrder option may be used to control the order of the
 #               waypoints when processing multiple still-image files, or the
 #               order of the tracks when processing multiple video files.
+#            3) The "0" in the BODY line below may be changed to "$gpsaltitude#"
+#               and the altitudeMode may be changed to "absolute" to store
+#               altitude information if it exists in the track log.
 #------------------------------------------------------------------------------
 #[HEAD]<?xml version="1.0" encoding="UTF-8"?>
 #[HEAD]<kml xmlns="http://earth.google.com/kml/2.0">

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

@@ -238,7 +238,7 @@ types of meta information.  To determine a tag name, either consult this
 documentation or run C<exiftool -s> on a file containing the information in
 question.
 
-I<(This documentation is the result of years of research, testing and
+I<(This documentation is the result of decades of research, testing and
 reverse engineering, and is the most complete metadata tag list available
 anywhere on the internet.  It is provided not only for ExifTool users, but
 more importantly as a public service to help augment the collective
@@ -314,10 +314,12 @@ C<integer> is a string of digits (possibly beginning with a '+' or '-'),
 C<real> is a floating point number, C<rational> is entered as a floating
 point number but stored as two C<integer> strings separated by a '/'
 character, C<date> is a date/time string entered in the format "YYYY:mm:dd
-HH:MM:SS[.ss][+/-HH:MM]", C<boolean> is either "True" or "False" (but "true"
-and "false" may be written as a ValueConv value for compatibility with
-non-conforming applications), C<struct> indicates a structured tag, and
-C<lang-alt> is a tag that supports alternate languages.
+HH:MM:SS[.ss][+/-HH:MM]" but some partial date/time formats are also
+accepted (see L<https://exiftool.org/faq.html#Q5>), C<boolean> is either
+"True" or "False" (but "true" and "false" may be written as a ValueConv
+value for compatibility with non-conforming applications), C<struct>
+indicates a structured tag, and C<lang-alt> is a tag that supports alternate
+languages.
 
 When reading, C<struct> tags are extracted only if the L<Struct|../ExifTool.html#Struct> (-struct)
 option is used.  Otherwise the corresponding I<Flattened> tags, indicated by

package/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
         },
     },

package/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");
         },

package/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($$$);
@@ -483,10 +483,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 +1067,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 +1546,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 +2378,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 +2452,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;
 }
 

package/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.85';
+$VERSION = '1.87';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -798,6 +798,7 @@ my %faceCategories = (
     },
     0x1447 => { Name => 'FujiModel',  Writable => 'string' },
     0x1448 => { Name => 'FujiModel2', Writable => 'string' },
+    0x144d => { Name => 'RollAngle',  Writable => 'rational64s' }, #forum14319
     0x3803 => { #forum10037
         Name => 'VideoRecordingMode',
         Groups => { 2 => 'Video' },
@@ -807,6 +808,7 @@ my %faceCategories = (
             0x00 => 'Normal',
             0x10 => 'F-log',
             0x20 => 'HLG',
+            0x30 => 'F-log2', #forum14384
         },
     },
     0x3804 => { #forum10037

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.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;