exiftool-vendored.pl 12.44.0 → 12.49.0

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.44';
+my $version = '12.49';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -2307,7 +2307,7 @@ TAG:    foreach $tag (@foundTags) {
             if (ref $val) {
                 # happens with -X, -j or -php when combined with -b:
                 if (defined $binaryOutput and not $binaryOutput and $$et{TAG_INFO}{$tag}{Protected}) {
-                    # avoid extracting Protected binary tags (eg. data blocks) [insider information]
+                    # avoid extracting Unsafe binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
                     next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
@@ -3254,7 +3254,7 @@ sub EncodeXML($)
 {
     my $strPt = shift;
     if ($$strPt =~ /[\0-\x08\x0b\x0c\x0e-\x1f]/ or
-        (not $altEnc and Image::ExifTool::XMP::IsUTF8($strPt) < 0))
+        (not $altEnc and Image::ExifTool::IsUTF8($strPt) < 0))
     {
         # encode binary data and non-UTF8 with special characters as base64
         $$strPt = Image::ExifTool::XMP::EncodeBase64($$strPt);
@@ -3318,7 +3318,7 @@ sub EscapeJSON($;$)
         return $str if $str =~ /^-?(\d|[1-9]\d{1,14})(\.\d{1,16})?(e[-+]?\d{1,3})?$/i;
     }
     # encode JSON string in base64 if necessary
-    if ($json < 2 and defined $binaryOutput and Image::ExifTool::XMP::IsUTF8(\$str) < 0) {
+    if ($json < 2 and defined $binaryOutput and Image::ExifTool::IsUTF8(\$str) < 0) {
         return '"base64:' . Image::ExifTool::XMP::EncodeBase64($str, 1) . '"';
     }
     # escape special characters
@@ -3394,7 +3394,7 @@ sub FormatCSV($)
     my $val = shift;
     # check for valid encoding if the Charset option was used
     if ($setCharset and ($val =~ /[^\x09\x0a\x0d\x20-\x7e\x80-\xff]/ or
-        ($setCharset eq 'UTF8' and Image::ExifTool::XMP::IsUTF8(\$val) < 0)))
+        ($setCharset eq 'UTF8' and Image::ExifTool::IsUTF8(\$val) < 0)))
     {
         $val = 'base64:' . Image::ExifTool::XMP::EncodeBase64($val, 1);
     }
@@ -3481,7 +3481,7 @@ sub ConvertBinary($)
             $obj = $$obj;
             # encode in base64 if necessary (0xf7 allows for up to 21-bit UTF-8 code space)
             if ($json == 1 and ($obj =~ /[^\x09\x0a\x0d\x20-\x7e\x80-\xf7]/ or
-                                Image::ExifTool::XMP::IsUTF8(\$obj) < 0))
+                                Image::ExifTool::IsUTF8(\$obj) < 0))
             {
                 $obj = 'base64:' . Image::ExifTool::XMP::EncodeBase64($obj, 1);
             }
@@ -3615,8 +3615,7 @@ sub CheckUTF8($$)
     my ($file, $enc) = @_;
     my $isUTF8 = 0;
     if ($file =~ /[\x80-\xff]/) {
-        require Image::ExifTool::XMP;
-        $isUTF8 = Image::ExifTool::XMP::IsUTF8(\$file);
+        $isUTF8 = Image::ExifTool::IsUTF8(\$file);
         if ($isUTF8 < 0) {
             if ($enc) {
                 Warn("Invalid filename encoding for $file\n");
@@ -4529,48 +4528,48 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RAW   r/w
-  3FR   r     | DSS   r     | JP2   r/w   | ODP   r     | RIFF  r
-  3G2   r/w   | DV    r     | JPEG  r/w   | ODS   r     | RSRC  r
-  3GP   r/w   | DVB   r/w   | JSON  r     | ODT   r     | RTF   r
-  A     r     | DVR-MS r    | JXL   r     | OFR   r     | RW2   r/w
-  AA    r     | DYLIB r     | K25   r     | OGG   r     | RWL   r/w
-  AAE   r     | EIP   r     | KDC   r     | OGV   r     | RWZ   r
-  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | RM    r
-  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SEQ   r
-  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SKETCH r
-  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SO    r
-  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SR2   r/w
-  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SRF   r
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRW   r/w
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
-  ASF   r     | FFF   r/w   | MACOS r     | PCD   r     | SWF   r
-  AVI   r     | FITS  r     | MAX   r     | PCX   r     | THM   r/w
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TIFF  r/w
-  AZW   r     | FLAC  r     | MIE   r/w/  | PDF   r/w   | TORRENT r
-  BMP   r     | FLIF  r/w   | MIFF  r   c | PEF   r/w   | TTC   r
-  BPG   r     | FLV   r     | MKA   r     | PFA   r     | TTF   r
-  BTF   r     | FPF   r     | MKS   r     | PFB   r     | TXT   r
-  CHM   r     | FPX   r     | MKV   r     | PFM   r     | VCF   r
-  COS   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
-  CR2   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VSD   r
-  CR3   r/w   | GZ    r     | MODD  r     | PLIST r     | WAV   r
-  CRM   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WDP   r/w
-  CRW   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WEBP  r
-  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
-  CSV   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WMA   r
-  CZI   r     | HTML  r     | MP4   r/w   | PPT   r     | WMV   r
-  DCM   r     | ICC   r/w/c | MPC   r     | PPTX  r     | WTV   r
-  DCP   r/w   | ICS   r     | MPG   r     | PS    r/w   | WV    r
-  DCR   r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
-  DFONT r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
-  DIVX  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
-  DJVU  r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
-  DLL   r     | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
-  DNG   r/w   | INX   r     | NEF   r/w   | RA    r     | ZIP   r
-  DOC   r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
-  DOCX  r     | ITC   r     | NRW   r/w   | RAM   r     |
-  DPX   r     | J2C   r     | NUMBERS r   | RAR   r     |
+  360   r/w   | DPX   r     | ITC   r     | NRW   r/w   | RAM   r
+  3FR   r     | DR4   r/w/c | J2C   r     | NUMBERS r   | RAR   r
+  3G2   r/w   | DSS   r     | JNG   r/w   | O     r     | RAW   r/w
+  3GP   r/w   | DV    r     | JP2   r/w   | ODP   r     | RIFF  r
+  A     r     | DVB   r/w   | JPEG  r/w   | ODS   r     | RSRC  r
+  AA    r     | DVR-MS r    | JSON  r     | ODT   r     | RTF   r
+  AAE   r     | DYLIB r     | JXL   r     | OFR   r     | RW2   r/w
+  AAX   r/w   | EIP   r     | K25   r     | OGG   r     | RWL   r/w
+  ACR   r     | EPS   r/w   | KDC   r     | OGV   r     | RWZ   r
+  AFM   r     | EPUB  r     | KEY   r     | ONP   r     | RM    r
+  AI    r/w   | ERF   r/w   | LA    r     | OPUS  r     | SEQ   r
+  AIFF  r     | EXE   r     | LFP   r     | ORF   r/w   | SKETCH r
+  APE   r     | EXIF  r/w/c | LIF   r     | ORI   r/w   | SO    r
+  ARQ   r/w   | EXR   r     | LNK   r     | OTF   r     | SR2   r/w
+  ARW   r/w   | EXV   r/w/c | LRV   r/w   | PAC   r     | SRF   r
+  ASF   r     | F4A/V r/w   | M2TS  r     | PAGES r     | SRW   r/w
+  AVI   r     | FFF   r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
+  AVIF  r/w   | FITS  r     | MACOS r     | PCD   r     | SWF   r
+  AZW   r     | FLA   r     | MAX   r     | PCX   r     | THM   r/w
+  BMP   r     | FLAC  r     | MEF   r/w   | PDB   r     | TIFF  r/w
+  BPG   r     | FLIF  r/w   | MIE   r/w/c | PDF   r/w   | TORRENT r
+  BTF   r     | FLV   r     | MIFF  r     | PEF   r/w   | TTC   r
+  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   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4990,16 +4989,17 @@ B<-struct> option for details.
 8) With the redirection feature, copying a tag directly (ie.
 E<quot>'-I<DSTTAG>E<lt>I<SRCTAG>'E<quot>) is not the same as interpolating
 its value inside a string (ie. E<quot>'-I<DSTTAG>E<lt>$I<SRCTAG>'E<quot>)
-for list-type tags, L<shortcut tags|Image::ExifTool::Shortcuts>, tag names
-containing wildcards, or UserParam variables.  When copying directly, the
-values of each matching source tag are copied individually to the
-destination tag (as if they were separate assignments).  However, when
-interpolated inside a string, list items and the values of shortcut tags are
-concatenated (with a separator set by the B<-sep> option), and wildcards are
-not allowed.  Also, UserParam variables are available only when interpolated
-in a string.  Another difference is that a minor warning is generated if a
-tag doesn't exist when interpolating its value in a string (with C<$>), but
-isn't when copying the tag directly.
+for source tags which are list-type tags,
+L<shortcut tags|Image::ExifTool::Shortcuts>, tag names containing wildcards,
+or UserParam variables.  When copying directly, the values of each matching
+source tag are copied individually to the destination tag (as if they were
+separate assignments).  However, when interpolated inside a string, list
+items and the values of shortcut tags are concatenated (with a separator set
+by the B<-sep> option), and wildcards are not allowed.  Also, UserParam
+variables are available only when interpolated in a string.  Another
+difference is that a minor warning is generated if a tag doesn't exist when
+interpolating its value in a string (with C<$>), but isn't when copying the
+tag directly.
 
 Finally, the behaviour is different when a destination tag or group of
 C<All> is used.  When copying directly, a destination group and/or tag name
@@ -5058,8 +5058,8 @@ are in the default output.  By default, list items are separated by a
 newline when extracted with the B<-b> option, but this may be changed (see
 the B<-sep> option for details).  May be combined with B<-j>, B<-php> or
 B<-X> to extract binary data in JSON, PHP or XML format, but note that
-"Unsafe" tags are not extracted as binary unless they are specified explicitly or
-the API RequestAll option is set to 3 or higher.
+"Unsafe" tags are not extracted as binary unless they are specified
+explicitly or the API RequestAll option is set to 3 or higher.
 
 With a leading double dash (B<--b> or B<--binary>), tags which contain
 binary data are suppressed in the output when reading.
@@ -5224,7 +5224,8 @@ option has no effect on date-only or time-only tags and ignores timezone
 information if present.  ExifTool adds a C<%f> format code to represent
 fractional seconds, and supports an optional width to specify the number of
 digits after the decimal point (eg. C<%3f> would give something like
-C<.437>).  Only one B<-d> option may be used per command.  Requires
+C<.437>), and a minus sign to drop the decimal point (eg. C<%-3f> would give
+C<437>).  Only one B<-d> option may be used per command.  Requires
 POSIX::strptime or Time::Piece for the inversion conversion when writing.
 
 =item B<-D> (B<-decimal>)
@@ -5317,7 +5318,9 @@ ASCII "base64:" as the first 7 bytes of the value), and B<-t> may be added
 to include tag table information (see B<-t> for details).  The JSON output
 is UTF-8 regardless of any B<-L> or B<-charset> option setting, but the
 UTF-8 validation is disabled if a character set other than UTF-8 is
-specified.
+specified.  Note that ExifTool quotes JSON values only if they don't look
+like numbers (regardless of the original storage format or the relevant
+metadata specification).
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
@@ -5361,7 +5364,7 @@ been implemented.  May also be combined with B<-listx> to output
 descriptions in one language only.
 
 By default, ExifTool uses UTF-8 encoding for special characters, but the
-the B<-L> or B<-charset> option may be used to invoke other encodings.  Note
+B<-L> or B<-charset> option may be used to invoke other encodings.  Note
 that ExifTool uses Unicode::LineBreak if available to help preserve the
 column alignment of the plain text output for languages with a
 variable-width character set.
@@ -5467,7 +5470,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.44 --
+    -- Generated by ExifTool 12.49 --
     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
@@ -5475,8 +5478,8 @@ produces output like this:
     -- end --
 
 The values of List-type tags with multiple items and Shortcut tags
-representing multiple tags are joined according the the B<-sep> option
-setting when interpolated in the string.
+representing multiple tags are joined according the B<-sep> option setting
+when interpolated in the string.
 
 When B<-ee> (B<-extractEmbedded>) is combined with B<-p>, embedded documents
 are effectively processed as separate input files.
@@ -5489,7 +5492,12 @@ warnings and leave the missing values empty.  Alternatively, B<-q -q> may be
 used to simply suppress the warning messages.
 
 The L</Advanced formatting feature> may be used to modify the values of
-individual tags with the B<-p> option.
+individual tags within the B<-p> option string.
+
+Note that the API RequestTags option is automatically set for all tags used
+in the I<FMTFILE> or I<STR>.  This allows all other tags to be ignored using
+B<-API IgnoreTags=all>, resulting in reduced memory usage and increased
+speed.
 
 =item B<-php>
 
@@ -5978,10 +5986,11 @@ also specified on the command line.  The alternative is to use the
 C<$GROUP:all> syntax. (eg. Use C<$exif:all> instead of C<$exif> in I<EXPR>
 to test for the existence of EXIF tags.)
 
-3) Tags in the string are interpolated the same way as with B<-p> before the
+3) Tags in the string are interpolated in a similar way to B<-p> before the
 expression is evaluated.  In this interpolation, C<$/> is converted to a
-newline and C<$$> represents a single C<$> symbol (so Perl variables, if
-used, require a double C<$>).
+newline and C<$$> represents a single C<$> symbol.  So Perl variables, if
+used, require a double C<$>, and regular expressions ending in C<$/> must
+use C<$$/> instead.
 
 4) The condition may only test tags from the file being processed.  To
 process one file based on tags from another, two steps are required.  For
@@ -5999,6 +6008,9 @@ the values of duplicate tags are accessible only by specifying a group name
 command when B<-execute> was used, and may be used like any other tag in the
 condition (ie. "$OK").
 
+7) The API RequestTags option is automatically set for all tags used in the
+B<-if> condition.
+
 =item B<-m> (B<-ignoreMinorErrors>)
 
 Ignore minor errors and warnings.  This enables writing to files with minor
@@ -7228,7 +7240,7 @@ Combine multiple track logs and geotag an entire directory tree of images.
 
 Read all track logs from the C<tracks> directory.
 
-=item exiftool -p gpx.fmt -d %Y-%m-%dT%H:%M:%SZ dir > out.gpx
+=item exiftool -p gpx.fmt dir > out.gpx
 
 Generate a GPX track log from all images in directory C<dir>.  This example
 uses the C<gpx.fmt> file included in the full ExifTool distribution package

package/bin/fmt_files/gpx.fmt

@@ -16,6 +16,9 @@
 #            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
+#            4) Coordinates are written at full resolution.  To change this,
+#               remove the "#" from the GPSLatitude/Longitude tag names below
+#               and use the -c option to set the desired precision.
 #------------------------------------------------------------------------------
 #[HEAD]<?xml version="1.0" encoding="utf-8"?>
 #[HEAD]<gpx version="1.0"

package/bin/fmt_files/gpx_wpt.fmt

@@ -17,6 +17,9 @@
 #            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
+#            4) Coordinates are written at full resolution.  To change this,
+#               remove the "#" from the GPSLatitude/Longitude tag names below
+#               and use the -c option to set the desired precision.
 #------------------------------------------------------------------------------
 #[HEAD]<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 #[HEAD]<gpx version="1.1"

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
@@ -80,7 +80,7 @@ $VERSION = '1.06';
     # 0x000e - int32s: 0,1,4,12 (Orientation? 0=landscape? 4=portrait? ref 1)
     # 0x000f - int32s: 2,3
     # 0x0010 - int32s: 1
-    0x0011 => {
+    0x0011 => { # (if defined, there is a live photo associated with the video, #forum13565)
         Name => 'MediaGroupUUID', #NealKrawetz private communication
         # (changed in 12.19 from Name => 'ContentIdentifier', #forum8750)
         Writable => 'string',
@@ -91,6 +91,10 @@ $VERSION = '1.06';
         Writable => 'string',
     },
     # 0x0016 - string[29]: "AXZ6pMTOh2L+acSh4Kg630XCScoO\0"
+    0x0017 => { #forum13565 (only valid if MediaGroupUUID exists)
+        Name => 'LivePhotoVideoIndex',
+        Notes => 'divide by RunTimeScale to get time in seconds',
+    },
     # 0x0017 - int32s: 0,8192
     # 0x0019 - int32s: 0,2,128
     # 0x001a - string[6]: "q825s\0"

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.47';
+$VERSION = '3.49';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -501,11 +501,13 @@ been decoded.  Use the L<Unknown|../ExifTool.html#Unknown> (-u) option to extrac
 },
     GeoTiff => q{
 ExifTool extracts the following tags from GeoTIFF images.  See
-L<http://www.remotesensing.org/geotiff/spec/geotiffhome.html> for the
-complete GeoTIFF specification.  Also included in the table below are
-ChartTIFF tags (see L<http://www.charttiff.com/whitepapers.shtml>). GeoTIFF
-tags are not writable individually, but they may be copied en mass via the
-block tags GeoTiffDirectory, GeoTiffDoubleParams and GeoTiffAsciiParams.
+L<https://web.archive.org/web/20070820121549/http://www.remotesensing.org/geotiff/spec/geotiffhome.html>
+for the complete GeoTIFF specification.  Also included in the table below
+are ChartTIFF tags (see
+L<https://web.archive.org/web/20020828193928/http://www.charttiff.com/whitepapers.shtml>).
+GeoTIFF tags are not writable individually, but they may be copied en mass
+via the block tags GeoTiffDirectory, GeoTiffDoubleParams and
+GeoTiffAsciiParams.
 },
     JFIF => q{
 The following information is extracted from the JPEG JFIF header.  See
@@ -1324,9 +1326,12 @@ TagID:  foreach $tagID (@keys) {
                     if ($writable) {
                         foreach ('PrintConv','ValueConv') {
                             next unless $$tagInfo{$_};
-                            next if $$tagInfo{$_ . 'Inv'};
-                            next if ref($$tagInfo{$_}) =~ /^(HASH|ARRAY)$/;
-                            next if $$tagInfo{WriteAlso};
+                            next if defined $$tagInfo{$_ . 'Inv'};
+                            # (undefined inverse conversion overrides hash lookup)
+                            unless (exists $$tagInfo{$_ . 'Inv'}) {
+                                next if ref($$tagInfo{$_}) =~ /^(HASH|ARRAY)$/;
+                                next if $$tagInfo{WriteAlso};
+                            }
                             if ($_ eq 'ValueConv') {
                                 undef $writable;
                             } else {
@@ -2570,6 +2575,9 @@ sub WriteTagNames($$)
                 $tip = '';
                 # use copyright symbol in QuickTime UserData tags
                 $tagIDstr =~ s/^"\\xa9/"&copy;/;
+                # escape necessary characters in html
+                $tagIDstr =~ s/>/&gt;/g;
+                $tagIDstr =~ s/</&lt;/g;
             }
             # add tooltip for special writable attributes
             my $wtip = '';

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.59';
+$VERSION = '4.62';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -480,6 +480,7 @@ $VERSION = '4.59';
     255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
     255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
+    255.3 => 'Yongnuo YN 50mm f/1.8', #50
     368 => 'Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens', #IB (A018)
     368.1 => 'Sigma 20mm f/1.4 DG HSM | A', #50 (newer firmware)
     368.2 => 'Sigma 50mm f/1.4 DG HSM | A', #50
@@ -493,6 +494,7 @@ $VERSION = '4.59';
    '368.10' => 'Sigma 35mm f/1.4 DG HSM | A', #PH (012)
    '368.11' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
    '368.12' => 'Sigma 18-35mm f/1.8 DC HSM | A', #50
+   '368.13' => 'Sigma 24-105mm f/4 DG OS HSM | A', #forum3833
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek
@@ -602,18 +604,24 @@ $VERSION = '4.59';
    '61182.24' => 'Canon RF 14-35mm F4L IS USM', #IB
    '61182.25' => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
    '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-   '61182.27' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
-   '61182.28' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+   '61182.27' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42
+   '61182.28' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42
    '61182.29' => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
-   '61182.30' => 'Canon RF 16mm F2.8 STM', #42
-   '61182.31' => 'Canon RF 400mm F2.8L IS USM', #IB
-   '61182.32' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
-   '61182.33' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
-   '61182.34' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
-   # we need the RFLensType values for the following...
-   '61182.35' => 'Canon RF 800mm F5.6L IS USM', #PH (NC)
-   '61182.36' => 'Canon RF 1200mm F8L IS USM', #PH (NC)
-   '61182.37' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.30' => 'Canon RF 24mm F1.8 MACRO IS STM', #42
+   '61182.31' => 'Canon RF 16mm F2.8 STM', #42
+   '61182.32' => 'Canon RF 400mm F2.8L IS USM', #IB
+   '61182.33' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
+   '61182.34' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
+   '61182.35' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+   '61182.36' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+   '61182.37' => 'Canon RF 800mm F5.6L IS USM', #42
+   '61182.38' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+   '61182.39' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+   '61182.40' => 'Canon RF 1200mm F8L IS USM', #42
+   '61182.41' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+   '61182.42' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+    # we need the RFLensType values for the following...
+   '61182.43' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -6812,14 +6820,22 @@ my %ciMaxFocal = (
             281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
             282 => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
             283 => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
-            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42
+            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42
             286 => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
+            287 => 'Canon RF 24mm F1.8 MACRO IS STM', #42
             288 => 'Canon RF 16mm F2.8 STM', #42
             289 => 'Canon RF 400mm F2.8L IS USM', #IB
             290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
             291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
             292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+            295 => 'Canon RF 800mm F5.6L IS USM', #42
+            296 => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+            297 => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+            298 => 'Canon RF 1200mm F8L IS USM', #42
+            299 => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+            300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+            302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -6864,6 +6880,7 @@ my %ciMaxFocal = (
             8 => '4:5',
             12 => '3:2 (APS-H crop)', #IB
             13 => '3:2 (APS-C crop)', #IB
+            258 => '4:3 crop', #PH (NC)
         },
     },
     # (could use better names for these, or the Crop tags above, or both)
@@ -9393,8 +9410,9 @@ my %filterConv = (
             #  numbers from the previous image, so we need special logic
             #  to handle the FileIndex wrap properly)
             $val[1] == 10000 and $val[1] = 1, ++$val[0];
-            return sprintf("%.3d-%.4d",@val);
+            return sprintf("%.3d%.4d",@val);
         },
+        PrintConv => '$_=$val;s/(\d+)(\d{4})/$1-$2/;$_',
     },
 );
 

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Canon;
 
-$VERSION = '1.58';
+$VERSION = '1.59';
 
 sub WriteCRW($$);
 sub ProcessCanonRaw($$$);
@@ -625,6 +625,13 @@ sub ProcessCanonRaw($$$)
     $raf->Seek($blockStart+$blockSize-4, 0) or return 0;
     $raf->Read($buff, 4) == 4 or return 0;
     my $dirOffset = Get32u(\$buff,0) + $blockStart;
+    # avoid infinite recursion
+    $$et{ProcessedCanonRaw} or $$et{ProcessedCanonRaw} = { };
+    if ($$et{ProcessedCanonRaw}{$dirOffset}) {
+        $et->Warn("Not processing double-referenced $$dirInfo{DirName} directory");
+        return 0;
+    }
+    $$et{ProcessedCanonRaw}{$dirOffset} = 1;
     $raf->Seek($dirOffset, 0) or return 0;
     $raf->Read($buff, 2) == 2 or return 0;
     my $entries = Get16u(\$buff,0);         # get number of entries in directory

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

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.33';
+$VERSION = '1.34';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -2046,17 +2046,16 @@ sub ProcessCanonVRD($$;$)
             return 0;
         }
     }
-    # exit quickly if writing and no CanonVRD tags are being edited
-    if ($outfile and not exists $$et{EDIT_DIRS}{CanonVRD}) {
-        print $out "$$et{INDENT}  [nothing changed]\n" if $verbose;
-        return 1 if $outfile eq $dataPt;
-        return Write($outfile, $$dataPt) ? 1 : -1;
-    }
-
     my $vrdType = 'VRD';
 
     if ($outfile) {
         $verbose and not $created and print $out "  Rewriting CanonVRD trailer\n";
+        # exit quickly if writing and no CanonVRD tags are being edited
+        unless (exists $$et{EDIT_DIRS}{CanonVRD}) {
+            print $out "$$et{INDENT}  [nothing changed in CanonVRD]\n" if $verbose;
+            return 1 if $outfile eq $dataPt;
+            return Write($outfile, $$dataPt) ? 1 : -1;
+        }
         # delete CanonVRD information if specified
         my $doDel = $$et{DEL_GROUP}{CanonVRD};
         unless ($doDel) {

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

@@ -21,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -1233,6 +1233,14 @@ sub ProcessEXE($$)
         $tagTablePtr = GetTagTable('Image::ExifTool::EXE::MachO');
         if ($1 eq "\xca\xfe\xba\xbe") {
             SetByteOrder('MM');
+            my $ver = Get32u(\$buff, 4);
+            # Java bytecode .class files have the same magic number, so we need to look deeper
+            # (ref https://github.com/file/file/blob/master/magic/Magdir/cafebabe#L6-L15)
+            if ($ver > 30) {
+                # this is Java bytecode
+                $et->SetFileType('Java bytecode', 'application/java-byte-code', 'class');
+                return 1;
+            }
             $et->SetFileType('Mach-O fat binary executable', undef, '');
             return 1 if $fast3;
             my $count = Get32u(\$buff, 4);  # get architecture count