exiftool_vendored 13.12.0 → 13.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee34189fb74202a66c58d76f0168f01089b47ca963c5f60124bcf5d73d2aecf
-  data.tar.gz: b8e53f5654ff7090fa938edadb5de5c21794e9b8184439a67dc7d967b7a38945
+  metadata.gz: 84e9102db0da669ac4a4f0a5c4cb35058eee35318fa727ecf365f36341e9d9b9
+  data.tar.gz: baef093ba9ac71da9d59fc8239d9ca9ea3a5bab5a856fca5f33a3f8fcf6e6ba8
 SHA512:
-  metadata.gz: e91976cbd88e3de90455e5879c583c6f48c15a0b12f102b0b8e6f8cedf1e61026e5e5d543e7c3848e1008feb842f46f709f3d87e012202b1bcda4fd3ebab3f2d
-  data.tar.gz: c4c6ac6f3e7ed34e426b3f83a44d5fa9964b609e02613715cbbacc69c00ffa5a81f6bc0b13b3fb8a2b00b481966453ae7f102002f6c34cf2de663a8d019453e5
+  metadata.gz: 2a4abf6f32a17150d1b3b30b43204b8440b1e0c600df23ac992085a423942105067e02922cdcfdfa3a185fa867e138eab5e1a3a4cf3add9b8113afa6e167a038
+  data.tar.gz: da5b5975b6c1d20dc90d3c45179892297ab655f5e2dd76bac6180221ff5598895da66abc76a073561175d30a490444d56f701860e54fc70f21e93cd55cc0fd2d

data/bin/Changes

@@ -7,6 +7,29 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.10. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Jan. 20, 2025 - Version 13.14
+
+  - Fixed bug where ItemList tags weren't created when creating new AudioKeys or
+    VideoKeys tags in the same command and neither tag group pre-existed in the
+    file
+
+Jan. 20, 2025 - Version 13.13
+
+  - Added ability to write tags to the audio/video tracks of MOV/MP4 videos
+    using the new AudioKeys and VideoKeys group names
+  - Added support for another DJI protobuf format (Mavic 3)
+  - Decode yet another type of LIGOGPSINFO timed GPS from a dashcam video
+  - Extract some proprietary information from JPEG images of Vivo phones
+  - Enhanced Geolocation feature to allow the nearest cities to a specified city
+    to be returned
+  - Updated xmp2exif.args and exif2xmp.args to properly handle time zones in
+    XMP-exif date/time tags
+  - Changed family 1 group names for Keys, ItemList and UserData tags in a track
+  - Patched github #306 issue where a torrent file would return a format error
+    when reading if it didn't contain an "announce" or "created by" entry
+  - Fixed "uninitialized value" runtime warning when reading some EXE files
+  - Fixed -diff output to add colon missing from some lines when used with -g
+
 Jan. 13, 2025 - Version 13.12
 
   - Added a few new Panasonic AFAreaMode values (thanks Andrew J)
@@ -15,12 +38,12 @@ Jan. 13, 2025 - Version 13.12
   - Decode AF points for some newer Nikon models (thanks Warren Hatch)
   - Decode a new Panasonic tag (thanks Andrew J)
   - Decode a couple of previously unknown tags from LIGOGPSINFO records
-  - Extract some PDB information if available from Win32 EXE files (github#303)
+  - Extract some PDB information if available from Win32 EXE files (github #303)
   - Improved handling of duplicate tags in -diff output
   - Improved handling of QuickTime zero date/time values
   - Enchanced -csv= and -json= options to allow group names and wildcards to be
     used when specifying which tags to import
-  - Updated some EXIF:Compression values (github#304)
+  - Updated some EXIF:Compression values (github #304)
   - Changed wording of warning when file time couldn't be updated
   - Fixed bug introduced in 13.11 reading EXIF from some EXV files
   - Fixed bug introduced in 12.99 where empty entries in a CSV file weren't
@@ -33,7 +56,7 @@ Jan. 13, 2025 - Version 13.12
 Jan. 1, 2025 - Version 13.11
 
   - Added warning for an unknown DJI protobuf schema
-  - Decode timed GPS from the DJI Osmo Action 5
+  - Decode timed GPS from DJI Osmo Action 5 videos
   - Decode yet another type of LIGOGPSINFO timed GPS from a dashcam video
   - Made Matroska Keywords and Instruments List-type tags
   - Fixed problem were EXIF couldn't be added to some AVIF files
@@ -286,7 +309,7 @@ July 24, 2024 - Version 12.92
 
 July 24, 2024 - Version 12.91
 
-  - Added a couple of new OpenEXR Compression values (github#276)
+  - Added a couple of new OpenEXR Compression values (github #276)
   - Updated 2 test files that were causing failed tests (ExifTool itself is
     unchanged)
 
@@ -753,7 +776,7 @@ Aug. 10, 2023 - Version 12.65
     provided
   - Lowered priority of IFD1 tags in ARW images so IFD0/SubIFD take precedence
   - Changed QuickTime tag names for atID (AlbumTitleID to ArtistID) and plID
-    (PlayListID to AlbumID) (github issue #216), and added cmID (ComposerID)
+    (PlayListID to AlbumID) (github #216), and added cmID (ComposerID)
   - Changed Apple:MediaGroupUUID tag name back to ContentIdentifier
   - Patched the -d option to handle the %s format code internally when writing
     (avoids problems due to inconsistent behaviour of this format code in the
@@ -1304,7 +1327,15 @@ Dec. 8, 2021 - Version 12.37
   - Extract TransparentColor from GIF images
   - Improved parsing of input time values for GPSTimeStamp to properly handle a
     "." separator
-  - Improved warning when incorrectly using "
+  - Improved warning when incorrectly using "<" instead of "=" to assign a tag
+    value
+  - Shortened a few of the new obscenely-long XMP-crs tag names 
+  - Avoid writing XMP-dwc:EventID and XMP-tiff:NativeDigest
+  - Avoid printing same structure twice in -j and -X output when -l is used
+  - Fixed typo in a QuickTime tag name (thanks Hubert)
+  - Fixed two XMP-crs tag names and typo in a NikonSettings value (thanks Herb)
+  - Fixed patch of version 12.25 to avoid writing XMP which contains an
+    undefined namespace
 
 Nov. 16, 2021 - Version 12.36
 
@@ -1616,7 +1647,7 @@ Feb. 3, 2021 - Version 12.17
   - Avoid extracting audio/video data from AVI videos when -ee -u is used
   - Patched decoding of Canon ContinuousShootingSpeed for newer firmware
     versions of the EOS-1DXmkIII
-  - Re-worked LensID patch of version 12.00 (github issue #51)
+  - Re-worked LensID patch of version 12.00 (github #51)
   - Fixed a few typos in newly-added NikonSettings tags (thanks Herb)
   - Fixed problem where group could not be specified for PNG-pHYs tags when
     writing
@@ -1687,7 +1718,7 @@ Nov. 27, 2020 - Version 12.11
 
   - Added -csvDelim option
   - Added new Canon and Olympus LensType values (thanks LibRaw)
-  - Added a warning if ICC_Profile is deleted from an image (github issue #63)
+  - Added a warning if ICC_Profile is deleted from an image (github #63)
   - EndDir() function for -if option now works when -fileOrder is used
   - Changed FileSize conversion to use binary prefixes since that is how the
     conversion is currently done (eg. MiB instead of MB)
@@ -2061,7 +2092,7 @@ Jan. 8, 2020 - Version 11.82
   - Added a new Canon LensType
   - Added a new CanonModelID (thanks LibRaw)
   - Added ability to process SubDirectories in QuickTime Keys tags
-  - Removed minor error when writing PDF 2.0 files (github issue #30)
+  - Removed minor error when writing PDF 2.0 files (github #30)
   - Fixed problem where trailing null bytes were removed from binary values in
     the -php output when the -b option was used
 
@@ -2075,8 +2106,7 @@ Jan. 2, 2020 - Version 11.81
   - Patched Composite sub-second date/time tags to do additional validation of
     source EXIF date/time tags before adding sub seconds
   - Fixed problem where -json output could produce invalid JSON when -struct was
-    used and the structure field names contained special characters (github
-    issue #32)
+    used and the structure field names contained special characters (github #32)
   - Fixed spelling in a Panasonic SceneMode value (thanks Hubert)
 
 Dec. 17, 2019 - Version 11.80
@@ -2096,7 +2126,7 @@ Dec. 12, 2019 - Version 11.79
 
   - Added support for AVIF files
   - Added new Canon, Sigma and Sony LensType values (thanks LibRaw)
-  - Made PDF 2.0 writable at your own risk with the -m option (github issue #30)
+  - Made PDF 2.0 writable at your own risk with the -m option (github #30)
   - Enhanced -validate feature to warn about duplicate languages in an XMP
     lang-alt list
   - Fixed inconsistency between documentation and ExifTool capabilities for
@@ -2182,7 +2212,7 @@ Oct. 16, 2019 - Version 11.71
 Oct. 10, 2019 - Version 11.70 (production release)
 
   - Added a new CanonModelID (thanks Laurent Clevy)
-  - Improved identification of Office Open XML files (github issue #27)
+  - Improved identification of Office Open XML files (github #27)
   - Removed RAF version check when writing FujiFilm RAF files
   - Limited the number of accelerometer records that ExifTool will read by
     default with the -ee option from INSV files to avoid excessive processing
@@ -2264,7 +2294,7 @@ Aug. 20, 2019 - Version 11.63 - "PNG Early Text"
   - Added a few new Sigma lenses (thanks LibRaw)
   - Improved handling of Canon CNTH atom in MOV/MP4 videos
   - Changed PNG writer to place all text chunks before IDAT (not just XMP)
-    (github issue #23)
+    (github #23)
   - Issue minor warning for any text chunk after PNG IDAT (not just XMP)
   - Enhanced ForceWrite feature to allow "PNG" to be specified (to move existing
     text chunks to before IDAT without editing any metadata)
@@ -2421,7 +2451,7 @@ June 17, 2019 - Version 11.52
   - Fixed problem where reading a large, corrupt AIFF file may could take an
     excessively long time
   - API Changes:
-      - Enhanced Compact option to add levels 3, 4 and 5 (github issue #16)
+      - Enhanced Compact option to add levels 3, 4 and 5 (github #16)
 
 June 13, 2019 - Version 11.51
 
@@ -2559,7 +2589,7 @@ May 3, 2019 - Version 11.39 - "Create QuickTime tags"
   - Decode Canon EOS D60 black levels
   - Split off some QuickTime tags into different family 1 groups
   - Fixed "Chunk offset outside movie data" error when writing some HEIC files
-  - Fixed decoding of Pentax AutoBracketing for K-1 and K-5 (github issue #15)
+  - Fixed decoding of Pentax AutoBracketing for K-1 and K-5 (github #15)
   - Fixed some QuickTime family 2 group names
   - Fixed bug introduced in 11.38 that broke extraction of thumbnail images from
     Canon MOV videos
@@ -2663,7 +2693,7 @@ Mar. 14, 2019 - Version 11.32
 Mar. 7, 2019 - Version 11.31
 
   - Added read support for FITS images
-  - Another try at removing spaces from some DICOM values (github issues #10/12)
+  - Another try at removing spaces from some DICOM values (github #10 and #12)
 
 Mar. 6, 2019 - Version 11.30 (production release)
 
@@ -2672,7 +2702,7 @@ Mar. 6, 2019 - Version 11.30 (production release)
   - Decode Reconyx HF2 PRO maker notes
   - Decode ColorData for some new Canon models (thanks LibRaw)
   - Enhanced -geotag feature to set AmbientTemperature if available
-  - Remove non-significant spaces from some DICOM values (github issues #10/12)
+  - Remove non-significant spaces from some DICOM values (github #10 and #12)
   - Fixed possible "'x' outside of string" error when reading corrupted EXIF
   - Fixed incorrect write group for GeoTIFF tags added in version 11.24
 
@@ -2680,13 +2710,13 @@ Feb. 28, 2019 - Version 11.29
 
   - Added support for Ricoh GR III maker notes
   - Added a new Canon LensType (thanks Claude Jolicoeur)
-  - Added a new XMP-crs tag (github issue #8)
+  - Added a new XMP-crs tag (github #8)
   - Enhanced -csv option to output base64-encoded binary data when combined with
     -b or when the -charset option is used and the text has invalid characters
-    (github issue #11)
-  - Remove trailing space from even-length DICOM values (github issue #9)
+    (github #11)
+  - Remove trailing space from even-length DICOM values (github #9)
   - Patched to avoid "Hexadecimal number > 0xffffffff non-portable" warning
-    (github issue #6)
+    (github #6)
   - Fixed meta charset attribute in -htmlDump output
 
 Feb. 21, 2019 - Version 11.28

data/bin/MANIFEST

@@ -180,6 +180,7 @@ html/TagNames/Theora.html
 html/TagNames/Torrent.html
 html/TagNames/Unknown.html
 html/TagNames/VCard.html
+html/TagNames/Vivo.html
 html/TagNames/Vorbis.html
 html/TagNames/WPG.html
 html/TagNames/WTV.html
@@ -431,6 +432,7 @@ lib/Image/ExifTool/Torrent.pm
 lib/Image/ExifTool/Unknown.pm
 lib/Image/ExifTool/VCard.pm
 lib/Image/ExifTool/Validate.pm
+lib/Image/ExifTool/Vivo.pm
 lib/Image/ExifTool/Vorbis.pm
 lib/Image/ExifTool/WPG.pm
 lib/Image/ExifTool/WTV.pm
@@ -826,7 +828,10 @@ t/QuickTime_14.out
 t/QuickTime_15.out
 t/QuickTime_16.out
 t/QuickTime_17.out
+t/QuickTime_18.out
+t/QuickTime_19.out
 t/QuickTime_2.out
+t/QuickTime_20.out
 t/QuickTime_3.out
 t/QuickTime_4.out
 t/QuickTime_5.out

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.12"
+   "version" : "13.14"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.12'
+version: '13.14'

data/bin/README

@@ -109,8 +109,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-13.12.tar.gz | tar -xf -
-  cd Image-ExifTool-13.12
+  gzip -dc Image-ExifTool-13.14.tar.gz | tar -xf -
+  cd Image-ExifTool-13.14
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/arg_files/exif2xmp.args

@@ -14,6 +14,7 @@
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
 #               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #               2024/10/24 - PH Additions for the 2024 EXIF for XMP spec
+#               2025/01/16 - PH Copy Composite SubSec tags to XMP-exif
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -54,4 +55,7 @@
 # new for the 2024 EXIF for XMP specification
 -XMP-exifEX:PhotographicSensitivity < EXIF:ISO
 -XMP-exif:DateTimeDigitized < EXIF:CreateDate
+# add sub-seconds and time-zone to XMP-exif tags if available
+-XMP-exif:DateTimeOriginal < Composite:SubSecDateTimeOriginal
+-XMP-exif:DateTimeDigitized < Composite:SubSecCreateDate
 # end

data/bin/arg_files/xmp2exif.args

@@ -18,6 +18,7 @@
 #               2023/01/30 - PH Also write Composite:SubSecDateTimeOriginal from
 #                               XMP-exif:DateTimeOriginal
 #               2024/10/24 - PH Additions for the 2024 EXIF for XMP spec
+#               2025/01/16 - PH Write Composite:SubSecCreateDate from XMP-exif
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -39,11 +40,11 @@
 -EXIF:DateTimeOriginal < XMP-photoshop:DateCreated
 # new for the 2024 EXIF for XMP specification
 -EXIF:ISO < XMP-exifEX:PhotographicSensitivity
--EXIF:CreateDate < XMP-exif:DateTimeDigitized
 # 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-exif:DateTimeDigitized
 -Composite:SubSecCreateDate < XMP-xmp:CreateDate
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
 -EXIF:Software < XMP-xmp:CreatorTool

data/bin/build_geolocation

@@ -228,7 +228,7 @@ Options:
               feature-code list may begin with a dash to remove entries from
               the default list, or a plus sign to add entries.  May be
               multiple -c options for each intput DBFILE.  Country/region and
-              feature names are case insensitive. Default is "$defaults{def_codes}".
+              feature names are case insensitive.  Default is "$defaults{def_codes}".
   -cp CODE  - Additional features to include if above minimum population.
               Default is "$defcp".
   -l LANG   - Alternate languages to read from $altNamesFile if

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.12';
+my $version = '13.14';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -2455,7 +2455,7 @@ T2:         foreach $t2 (@tags2) {
                 } else {
                     push @diffs, sprintf "< %s%s: %s\n", $desc, $pad, Printable($val);
                     $desc = ' ' x $len if $v < 3;
-                    push @diffs, sprintf "> %s%s  %s\n", $desc, $pad, Printable($val2) if defined $val2;
+                    push @diffs, sprintf "> %s%s: %s\n", $desc, $pad, Printable($val2) if defined $val2;
                 }
             }
             $done2{$tag2} = 1 if defined $tag2;
@@ -5983,7 +5983,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.12 --
+    -- Generated by ExifTool 13.14 --
     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
@@ -6000,8 +6000,8 @@ name, a value of 1 is returned if any tag exists in the specified group, or
 values of all matching tags are joined).
 
 The B<-p> output iterates through the family 3 group names, with each
-sub-document producing additional output.  This feature is most useful when
-used in combination with the B<-ee> option to extract embedded documents.
+sub-document producing additional output when combined with the B<-ee>
+(ExtractEmbedded) option.
 
 If a specified tag does not exist, a minor warning is issued and the line
 with the missing tag is not printed.  However, the B<-f> option may be used

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessAFCP($$);
 
@@ -63,10 +63,10 @@ for the AFCP specification.
 #------------------------------------------------------------------------------
 # Read/write AFCP information in a file
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
-# (Set 'ScanForAFCP' member in dirInfo to scan from current position for AFCP)
+# (Set 'ScanForTrailer' member in dirInfo to scan from current position for AFCP)
 # Returns: 1 on success, 0 if this file didn't contain AFCP information
 #          -1 on write error or if the offsets were incorrect on reading
-# - updates DataPos to point to actual AFCP start if ScanForAFCP is set
+# - updates DataPos to point to actual AFCP start if ScanForTrailer is set
 # - updates DirLen to trailer length
 # - returns Fixup reference in dirInfo hash when writing
 sub ProcessAFCP($$)
@@ -91,8 +91,8 @@ NoAFCP: for (;;) {
             $fix = 0;
         } else {
             $rtnVal = -1;
-            # look for start of AXS trailer if 'ScanForAFCP'
-            last unless $$dirInfo{ScanForAFCP} and $raf->Seek($curPos, 0);
+            # look for start of AXS trailer if 'ScanForTrailer'
+            last unless $$dirInfo{ScanForTrailer} and $raf->Seek($curPos, 0);
             my $actualPos = $curPos;
             # first look for header right at current position
             for (;;) {

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.60';
+$VERSION = '3.61';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -84,7 +84,8 @@ my %tweakOrder = (
     Nintendo => 'NikonCapture',
     Pentax  => 'Panasonic',
     SonyIDC => 'Sony',
-    Unknown => 'SonyIDC',
+    Vivo    => 'SonyIDC',
+    Unknown => 'Vivo',
     DNG     => 'Unknown',
     PrintIM => 'ICC_Profile',
     Vorbis  => 'Ogg',
@@ -100,6 +101,8 @@ my %tweakOrder = (
     MWG     => 'Shortcuts',
     'FujiFilm::RAF' => 'FujiFilm::RAFHeader',
     'FujiFilm::RAFData' => 'FujiFilm::RAF',
+    'QuickTime::AudioKeys' => 'QuickTime::Keys',
+    'QuickTime::VideoKeys' => 'QuickTime::AudioKeys',
 );
 
 # list of all recognized Format strings
@@ -437,15 +440,22 @@ appropriate table in the config file (see
 L<example.config|../config.html#PREF> in the full distribution for an
 example).  Note that some tags with the same name but different ID's may
 exist in the same location, but the family 7 group names may be used to
-differentiate these.  ExifTool currently writes only top-level metadata in
-QuickTime-based files; it extracts other track-specific and timed metadata,
-but can not yet edit tags in these locations (with the exception of
-track-level date/time tags).
+differentiate these.
 
-Beware that the Keys tags are actually stored inside the ItemList in the
-file, so deleting the ItemList group as a block (ie. C<-ItemList:all=>) also
-deletes Keys tags.  Instead, to preserve Keys tags the ItemList tags may be
-deleted individually with C<-QuickTime:ItemList:all=>.
+ExifTool currently writes
+L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
+L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags> only as
+top-level metadata, but select Keys tags are may be written to the audio or
+video track.  See the
+L<AudioKeys|Image::ExifTool::TagNames/QuickTime AudioKeys Tags> and
+L<VideoKeys|Image::ExifTool::TagNames/QuickTime VideoKeys Tags> tags for
+more information.
+
+Beware that the values of the Keys tags are actually stored inside an
+ItemList atom in the file, so deleting the ItemList group as a block (ie.
+C<-ItemList:all=>) also deletes Keys tags.  Instead, to preserve Keys tags
+the ItemList tags may be deleted individually with
+C<-QuickTime:ItemList:all=>.
 
 Alternate language tags may be accessed for
 L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
@@ -1783,9 +1793,10 @@ sub NumbersFirst($$)
         $rtnVal = $numbersFirst;
     } else {
         my ($a2, $b2) = ($a, $b);
-        # expand numbers to 3 digits (with restrictions to avoid messing up ascii-hex tags)
-        $a2 =~ s/(\d+)/sprintf("%.3d",$1)/eg if $a2 =~ /^(APP|DMC-\w+ )?[.0-9 ]*$/ and length($a2)<16;
-        $b2 =~ s/(\d+)/sprintf("%.3d",$1)/eg if $b2 =~ /^(APP|DMC-\w+ )?[.0-9 ]*$/ and length($b2)<16;
+        # expand numbers to 3 digits (with restrictions to avoid messing up
+        # ascii-hex tags -- Nikon LensID's are 23 characters long)
+        $a2 =~ s/(\d+)/sprintf("%.3d",$1)/eg if $a2 =~ /^(APP|DMC-\w+ |dvtm_.*)?[.0-9 ]*$/ and length($a2)<23;
+        $b2 =~ s/(\d+)/sprintf("%.3d",$1)/eg if $b2 =~ /^(APP|DMC-\w+ |dvtm_.*)?[.0-9 ]*$/ and length($b2)<23;
         $caseInsensitive and $rtnVal = (lc($a2) cmp lc($b2));
         $rtnVal or $rtnVal = ($a2 cmp $b2);
     }

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

@@ -18,14 +18,15 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 use Image::ExifTool::Protobuf;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub ProcessDJIInfo($$$);
 
 %knownProtocol = (
-    'dvtm_ac203.proto' => 1,
-    'dvtm_ac204.proto' => 1,
-    'dvtm_AVATA2.proto' => 1,
+    'dvtm_ac203.proto' => 1,    # Osmo Action 4
+    'dvtm_ac204.proto' => 1,    # Osmo Action 5
+    'dvtm_AVATA2.proto' => 1,   # Avanta 2
+    'dvtm_wm265e.proto' => 1,   # Mavic 3
 );
 
 my %convFloat2 = (
@@ -200,15 +201,19 @@ my %convFloat2 = (
     TAG_PREFIX => '',
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
     NOTES => q{
-        Tags found in protobuf-format DJI djmd and dbgi timed metadata.  Only a few
-        tags are currently known, but unknown djmd tags may be extracted by setting
-        the Unknown option to 1 (or 2 to also extract unknown dbgi debug tags).  Tag
-        ID's are composed of the corresponding .proto file name combined with the
-        hierarchical protobuf field numbers.
+        Tags found in protobuf-format DJI djmd and dbgi timed metadata.  The known
+        tags listed below are extracted by default, but unknown djmd tags may be
+        extracted as well by setting the Unknown option to 1, or 2 to also extract
+        unknown dbgi debug tags.  Tag ID's are composed of the corresponding .proto
+        file name combined with the hierarchical protobuf field numbers.
 
         ExifTool currently extracts timed GPS plus a few other tags from DJI devices
         which use the following protocols:  dvtm_AVATA2.proto (Avanta 2),
-        dvtm_ac203.proto (Osmo Action 4), and dvtm_ac204.proto (Osmo Action 5).
+        dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5) and
+        dvtm_wm265e.proto (Mavic 3).
+
+        Note that with the protobuf format, numerical tags missing from the output
+        for a given protocol should be considered to have the default value of 0.
     },
     Protocol => {
         RawConv => q{
@@ -218,6 +223,10 @@ my %convFloat2 = (
             return $val;
         },
     },
+#
+# Osmo Action 4
+#
+    'dvtm_ac203_1-1-5' => 'SerialNumber', # (NC)
    # dvtm_ac203_1-1-6 - some version number
     'dvtm_ac203_1-1-10' => 'Model',
     'dvtm_ac203_2-3' => {
@@ -243,6 +252,10 @@ my %convFloat2 = (
         ValueConv => '$val =~ tr/-/:/; $val',
         PrintConv => '$self->ConvertDateTime($val)',
     },
+#
+# Osmo Action 5
+#
+    'dvtm_ac204_1-1-5' => 'SerialNumber', # (NC)
    # dvtm_ac204_1-1-6 - some version number
     'dvtm_ac204_1-1-10' => 'Model',
     'dvtm_ac204_2-3' => {
@@ -254,6 +267,7 @@ my %convFloat2 = (
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
+   # dvtm_ac204_3-2-4-1 - shutter speed? (rational)
     'dvtm_ac204_3-4-2-2' => {
         Name => 'GPSAltitude',
         Groups => { 2 => 'Location' },
@@ -268,10 +282,15 @@ my %convFloat2 = (
         ValueConv => '$val =~ tr/-/:/; $val',
         PrintConv => '$self->ConvertDateTime($val)',
     },
+#
+# Avanta 2
+#
    # dvtm_AVATA2_1-1-2 - some version number
    # dvtm_AVATA2_1-1-3 - some version number
+    'dvtm_AVATA2_1-1-5' => 'SerialNumber', # (NC)
     'dvtm_AVATA2_1-1-10' => 'Model',
-    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber', # (NC)
+   # dvtm_AVATA2_2-2-1-4 - model code?
+    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber2', # (NC)
     'dvtm_AVATA2_2-3' => {
         Name => 'FrameInfo', 
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
@@ -285,11 +304,45 @@ my %convFloat2 = (
         ValueConv => '$val / 1e6',
     },
    # dvtm_AVATA2_3-2-1-4 - model code?
+   # dvtm_AVATA2_3-2-1-5 - frame rate?
+   # dvtm_AVATA2_3-2-4-1 - shutter speed? (rational)
    # dvtm_AVATA2_3-4-1-4 - model code?
+   # dvtm_AVATA2_3-4-3-1,2,3 - YPR? (int64s)
     'dvtm_AVATA2_3-4-4-1' => {
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
+#
+# Mavic 3
+#
+    'dvtm_wm265e_1-1-5' => 'SerialNumber', # (confirmed)
+    'dvtm_wm265e_1-1-10' => 'Model',
+    'dvtm_wm265e_2-2' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+   # dvtm_wm265e_3-2-1-4 - model code?
+    'dvtm_wm265e_3-2-2-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_wm265e_3-2-3-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        ValueConv => '$val =~ m{(.*)/(.*)} ? $1 / $2 : $val',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+   # dvtm_wm265e_3-2-5-1 - unknown rational (xxxx / 1000)
+    'dvtm_wm265e_3-2-6-1' => { Name => 'DigitalZoom', Format => 'float' },
+    'dvtm_wm265e_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_wm265e_3-3-3-1' => { Name => 'DroneRoll',  Format => 'int64s', ValueConv => '$val/10' },
+    'dvtm_wm265e_3-3-3-2' => { Name => 'DronePitch', Format => 'int64s', ValueConv => '$val/10' },
+    'dvtm_wm265e_3-3-3-3' => { Name => 'DroneYaw',   Format => 'int64s', ValueConv => '$val/10' },
+    'dvtm_wm265e_3-3-4-2' => { Name => 'AbsoluteAltitude', ValueConv => '$val / 1000' },
+    'dvtm_wm265e_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_wm265e_3-4-3-1' => { Name => 'GimbalPitch',Format => 'int64s', ValueConv => '$val / 10' },
+    'dvtm_wm265e_3-4-3-2' => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' },
+    'dvtm_wm265e_3-4-3-3' => { Name => 'GimbalYaw',  Format => 'int64s', ValueConv => '$val / 10' },
 );
 
 %Image::ExifTool::DJI::FrameInfo = (

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

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.20';
+$VERSION = '1.21';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -1283,7 +1283,7 @@ sub ProcessEXE($$)
                     # read the rest of the optional header if necessary
                     my $optSize = Get16u(\$buff, 20);
                     my $more = $optSize + 24 - $size;
-                    my $magic;
+                    my $magic = 0;
                     if ($more > 0) {
                         if ($raf->Read($buf2, $more) == $more) {
                             $buff .= $buf2;