exiftool_vendored 12.80.0 → 12.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f29848f7a068302c03f2847eff9e3daf8ce7379cc676fcbfda76a3ef534fba4
-  data.tar.gz: 80952d3f13272898576e90899f3b3623eec46d3a193fa334daaa7838219a12f0
+  metadata.gz: e72fd223e20ba074cc12f4a4b8746c48911099845c2b0bdabb3066ba3b68c930
+  data.tar.gz: 03c78c3768b36216b3ad2c5d83d1fbd9e3e702581d2bd2cd09ce85b895fe169e
 SHA512:
-  metadata.gz: f8c2b1352e32b75492ab82b890c9745e5fab108779eb0411d6fdfc76d2584e26082a9cbd8cdf9e4a1fe3bd7b370cec4969d3e84459db4e8876155304d3f0f524
-  data.tar.gz: daeab0ada07d19fa91766bff48d1e3c5d31ea4b3f3856d21972bc31890fbe9f1cba4cf6b1b66672cec07ffa0df62b9432a02960e4a0ab97365c0fecdf8bf030a
+  metadata.gz: 1a0c7336b467061e914f44977a25fa24cb67572998306b21b1019b346ecd423a908774759c9af636f79ff3467624762cd5437d5c347e1a6475f78e6ea839fba5
+  data.tar.gz: b654799b378c684a8d2ec1d2638e3d16de1d9daf91b67f1c0c681fc1407872e057f94b90d630a0cc2218ec286c4d92e5c0a2df4f01ed730f9852feb527857d98

data/bin/Changes

@@ -7,6 +7,47 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.76. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Apr. 5, 2024 - Version 12.82 - "GM PDR"
+
+  - Added support for reading GM PDR data from MP4 videos written by cars such
+    as Corvettes and Cameros
+  - Added support for reading timed GPS from Wolfbox dashcam videos
+  - Added "Unknown trailer" to QuickTime warnings originating from an unknown
+    trailer
+  - Added a new Nikon LensID
+  - Extract PreviewImage from Chigee AIO-5 dashcam videos
+  - Changed name and print conversion of a recently added FujiFilm tag
+  - Only issue "Tag not defined" warnings for the first sub-document when using
+    the -p option
+  - Fixed a Nikon Z lens name (github #250)
+  - Fixed Windows version so -sort works properly with -listgeo
+  - API Changes:
+      - Added PrintCSV option for optimized extraction of GM PDR data in CSV
+        format
+
+Mar. 27, 2024 - Version 12.81
+
+  - Added ability to read EXIF and XMP from EXR images
+  - Added ability to delete unknown trailer when writing MOV/MP4 videos
+  - Added ability to write a couple of Stable Diffusion PNG tags
+  - Added ability to write one of the Microsoft Xtra Description tags (github
+    #248)
+  - Added support for using alternate city names in reverse Geolocation
+  - Added support for reading timed GPS from DOD LS600W TS videos
+  - Added support for new version of Canon DR4 files
+  - Added a number of new iTunesInfo tags
+  - Added a new Olympus LensType
+  - Decode a number of new Nikon tags (thanks Warren Hatch)
+  - Allow regular expressions to be used when writing Geolocate tag
+  - Enhanced writing of Geolocate tag to also write Keys:LocationName
+  - Cache the results of the last reverse geolocation search to speed batch
+    processing when multiple files have the same search parameters
+  - Patched problem that could cause runtime errors with some invaid tag names
+  - Fixed a couple of newly added FujiFilm tags
+  - Fixed decoding of FujiFilm AFAreaZoneSize
+  - API Changes:
+      - Added GeolocAltNames option
+
 Mar. 19, 2024 - Version 12.80
 
   - Added GeolocationFeatureCode tag
@@ -19,6 +60,8 @@ Mar. 19, 2024 - Version 12.80
   - Improved accuracy of Geolocation distance/bearing calculations
   - Changed structure of Geolocation database (now version 1.02)
   - Minor change to key format for user-defined Geolocation name translations
+  - Ignore API Geolocation option when copying tags if none of the Geolocation
+    tags are being copied
   - Fixed case/spacing of "C2PA" in some CBOR tag descriptions
   - Fixed bug extracting binary data from EXR files
   - API Changes:
@@ -29,6 +72,7 @@ Mar. 15, 2024 - Version 12.79
   - Improvements to new Geolocation feature:
       - Added reverse Geolocation ability (obtain GPS coordinates from city
         name), with support for regular expressions
+      - Added ability to geolocate while geotagging
       - Added -listgeo option to list the Geolocation database
       - Added the ability to include user-defined cities in the Geolocation
         database

data/bin/MANIFEST

@@ -80,6 +80,7 @@ html/TagNames/FujiFilm.html
 html/TagNames/GE.html
 html/TagNames/GIF.html
 html/TagNames/GIMP.html
+html/TagNames/GM.html
 html/TagNames/GPS.html
 html/TagNames/GeoTiff.html
 html/TagNames/GoPro.html
@@ -293,6 +294,7 @@ lib/Image/ExifTool/FujiFilm.pm
 lib/Image/ExifTool/GE.pm
 lib/Image/ExifTool/GIF.pm
 lib/Image/ExifTool/GIMP.pm
+lib/Image/ExifTool/GM.pm
 lib/Image/ExifTool/GPS.pm
 lib/Image/ExifTool/GeoLang/cs.pm
 lib/Image/ExifTool/GeoLang/de.pm
@@ -626,6 +628,8 @@ t/Geolocation_3.out
 t/Geolocation_4.out
 t/Geolocation_5.out
 t/Geolocation_6.out
+t/Geolocation_7.out
+t/Geolocation_8.out
 t/Geotag.t
 t/Geotag_10.out
 t/Geotag_11.out

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.80"
+   "version" : "12.82"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.80
+version: 12.82

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-12.80.tar.gz | tar -xf -
-  cd Image-ExifTool-12.80
+  gzip -dc Image-ExifTool-12.82.tar.gz | tar -xf -
+  cd Image-ExifTool-12.82
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -238,6 +238,7 @@ information:
   html/ExifTool.html        - API documentation
   html/TagNames/index.html  - Tag name documentation
   html/geotag.html          - Geotag feature
+  html/geolocation.html     - Geolocation feature
   html/faq.html             - Frequently asked questions
   html/filename.html        - Renaming/moving files
   html/metafiles.html       - Working with metadata sidecar files

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.80';
+my $version = '12.82';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -217,7 +217,7 @@ my $tmpFile;        # temporary file to delete on exit
 my $tmpText;        # temporary text file
 my $validFile;      # flag indicating we processed a valid file
 my $verbose;        # verbose setting
-my $vout;           # verbose output file reference (\*STDOUT or \*STDERR)
+my $vout;           # verbose output file reference (\*STDOUT or \*STDERR by default)
 my $windowTitle;    # title for console window
 my %wroteHEAD;      # list of output txt files to which we wrote HEAD
 my $xml;            # flag for XML-formatted output
@@ -723,17 +723,23 @@ for (;;) {
             require Image::ExifTool::Geolocation;
             my ($i, $entry);
             print "Geolocation database:\n" unless $quiet;
-            print "City,Region,Subregion,CountryCode,Country,TimeZone,FeatureCode,Population,Latitude,Longitude\n";
+            my $isAlt = $mt->Options('GeolocAltNames') ? ',AltNames' : '';
+            $isAlt = '' if $isAlt and not Image::ExifTool::Geolocation::ReadAltNames();
+            print "City,Region,Subregion,CountryCode,Country,TimeZone,FeatureCode,Population,Latitude,Longitude$isAlt\n";
             Image::ExifTool::Geolocation::SortDatabase('City') if $sortOpt;
             my $minPop = $mt->Options('GeolocMinPop');
             my $feature = $mt->Options('GeolocFeature') || '';
             my $neg = $feature =~ s/^-//;
             my %fcodes = map { lc($_) => 1 } split /\s*,\s*/, $feature;
+            my @isUTF8 = (0,1,2,4);   # items that need converting from UTF8
+            push @isUTF8, 10 if $isAlt;
             for ($i=0; ; ++$i) {
-                my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt) or last;
+                my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt,1) or last;
                 next if $minPop and $entry[7] < $minPop;
                 next if %fcodes and $neg ? $fcodes{lc $entry[6]} : not $fcodes{lc $entry[6]};
-                $_ = defined $_ ? $mt->Decode($_, 'UTF8') : '' foreach @entry[0,1,2,4];
+                push @entry, Image::ExifTool::Geolocation::GetAltNames($i,1) if $isAlt;
+                $_ = defined $_ ? $mt->Decode($_, 'UTF8') : '' foreach @entry[@isUTF8];
+                pop @entry if $isAlt and not $entry[10];
                 print join(',', @entry), "\n";
             }
         } else { # 'g(\d*)'
@@ -1365,11 +1371,11 @@ for (;;) {
             $useMWG = 1;
         } elsif (/^([-\w]+:)*(filename|directory|testname)\b/i) {
             $doSetFileName = 1;
-        } elsif (/^([-\w]+:)*(geotag|geotime|geosync)\b/i) {
+        } elsif (/^([-\w]+:)*(geotag|geotime|geosync|geolocate)\b/i) {
             if (lc $2 eq 'geotime') {
                 $addGeotime = '';
             } else {
-                # add geotag/geosync commands first
+                # add geotag/geosync/geolocate commands first
                 unshift @newValues, pop @newValues;
                 if (lc $2 eq 'geotag' and (not defined $addGeotime or $addGeotime) and length $val) {
                     $addGeotime = ($1 || '') . 'Geotime<DateTimeOriginal#';
@@ -2175,7 +2181,7 @@ sub GetImageInfo($$)
 
     my $lineCount = 0;
     my ($fp, $outfile, $append);
-    if ($textOut and $verbose and not $tagOut) {
+    if ($textOut and ($verbose or $et->Options('PrintCSV')) and not $tagOut) {
         ($fp, $outfile, $append) = OpenOutputFile($orig);
         $fp or EFile($file), ++$countBad, return;
         # delete file if we exit prematurely (unless appending)
@@ -2298,7 +2304,7 @@ sub GetImageInfo($$)
             $lastDoc = 0;
         }
         for ($doc=0; $doc<=$lastDoc; ++$doc) {
-            my $skipBody;
+            my ($skipBody, $opt);
             foreach $type (qw(HEAD SECT IF BODY ENDS TAIL)) {
                 my $prf = $printFmt{$type} or next;
                 if ($type eq 'HEAD' and defined $outfile) {
@@ -2306,6 +2312,12 @@ sub GetImageInfo($$)
                     $wroteHEAD{$outfile} = 1;
                 }
                 next if $type eq 'BODY' and $skipBody;
+                # silence "IF" warnings and warnings for subdocuments > 1
+                if ($type eq 'IF' or ($doc > 1 and not $$et{OPTIONS}{IgnoreMinorErrors})) {
+                    $opt = 'Silent';
+                } else {
+                    $opt = 'Warn';
+                }
                 if ($lastDoc) {
                     if ($doc) {
                         next if $type eq 'HEAD' or $type eq 'TAIL'; # only repeat SECT/IF/BODY/ENDS
@@ -2315,7 +2327,6 @@ sub GetImageInfo($$)
                     }
                 }
                 my @lines;
-                my $opt = $type eq 'IF' ? 'Silent' : 'Warn'; # silence "IF" warnings
                 foreach (@$prf) {
                     my $line = $et->InsertTagValues($_, \@foundTags, $opt, $grp, $cache);
                     if ($type eq 'IF') {
@@ -5657,7 +5668,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.80 --
+    -- Generated by ExifTool 12.82 --
     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
@@ -6435,8 +6446,9 @@ otherwise family 0 is assumed.  The B<-l> option may be combined with
 B<-listf>, B<-listr> or B<-listwf> to add file descriptions to the list. 
 The B<-lang> option may be combined with B<-listx> to output descriptions in
 a single language, and the B<-sort> and/or B<-lang> options may be combined
-with B<-listgeo>.  Also, the API GeolocMinPop and GeolocFeature options
-apply to the B<-listgeo> output.  Here are some examples:
+with B<-listgeo>.  Also, the API GeolocMinPop, GeolocFeature and
+GeolocAltNames options apply to the B<-listgeo> output.  Here are some
+examples:
 
     -list               # list all tag names
     -list -EXIF:All     # list all EXIF tags
@@ -6538,6 +6550,10 @@ examples. Also see "geotag.html" in the full ExifTool distribution and the
 L<Image::ExifTool Options|Image::ExifTool/Options> for more details and for
 information about geotag configuration options.
 
+The API Geolocation option may be set to the value "geotag" to also write
+the name, province/state and country of the nearest city while geotagging.
+See L<https://exiftool.org/geolocation.html> for details.
+
 =item B<-globalTimeShift> I<SHIFT>
 
 Shift all formatted date/time values by the specified amount when reading. 
@@ -7435,6 +7451,12 @@ Geotag an image (C<a.jpg>) from position information in a GPS track log
 DateTimeOriginal is used for geotagging.  Local system time is assumed
 unless DateTimeOriginal contains a timezone.
 
+=item exiftool -geotag track.log -geolocate=geotag a.jpg
+
+Geotag an image and also write geolocation information of the nearest city
+(city name, state/province and country).  Read here for more details about
+the Geolocation feature: L<https://exiftool.org/geolocation.html#Write>
+
 =item exiftool -geotag t.log -geotime='2009:04:02 13:41:12-05:00' a.jpg
 
 Geotag an image with the GPS position for a specific time.

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.54';
+$VERSION = '3.55';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -95,16 +95,9 @@ my %tweakOrder = (
     Lytro   => 'SigmaRaw',
     PhotoMechanic => 'FotoStation',
     Microsoft     => 'PhotoMechanic',
-   'Microsoft::MP'=> 'Microsoft::MP1',
     GIMP    => 'Microsoft',
-   'Nikon::CameraSettingsD300' => 'Nikon::ShotInfoD300b',
-   'Pentax::LensData' => 'Pentax::LensInfo2',
-   'Sony::SRF2' => 'Sony::SRF',
     DarwinCore => 'AFCP',
-   'MWG::Regions' => 'MWG::Composite',
-   'MWG::Keywords' => 'MWG::Regions',
-   'MWG::Collections' => 'MWG::Keywords',
-   'GoPro::fdsc' => 'GoPro::KBAT',
+    MWG     => 'Shortcuts',
 );
 
 # list of all recognized Format strings
@@ -671,6 +664,15 @@ will extract all available information even for tags not listed.
 Tags in these tables are referred to as "pseudo" tags because their
 information is not stored in the file itself.  As such, B<Writable> tags in
 these tables may be changed without having to rewrite the file.
+},
+    GM => q{
+These tags are extracted from GM/Cosworth PDR (Performance Data Recorder)
+information found in videos from General Motors cars such as Corvette and
+Camero.
+
+Use the API L<PrintCSV|../ExifTool.html#PrintCSV> option to output all timed
+PDR data in CSV format at greatly increased speed and with much lower memory
+usage.
 },
     PodTrailer => q{
 ~head1 NOTES
@@ -708,7 +710,7 @@ my %shortcutNotes = (
         color space when deleting all other metadata
     },
     CommonIFD0 => q{
-        common metadata tags found in IFD0 of TIFF-format images.  Used to simpify
+        common metadata tags found in IFD0 of TIFF-format images.  Used to simplify
         deletion of all metadata from these images.  See
         L<FAQ number 7|../faq.html#Q7> for details
     },
@@ -852,7 +854,7 @@ sub new
         my ($tagID, $binaryTable, $noID, $hexID, $isIPTC, $isXMP);
         $isIPTC = 1 if $writeProc and $writeProc eq \&Image::ExifTool::IPTC::WriteIPTC;
         # generate flattened tag names for structure fields if this is an XMP table
-        if ($$table{GROUPS} and $$table{GROUPS}{0} eq 'XMP') {
+        if ($$table{GROUPS} and $$table{GROUPS}{0} eq 'XMP' or $$vars{ADD_FLATTENED}) {
             Image::ExifTool::XMP::AddFlattenedTags($table);
             $isXMP = 1;
         }
@@ -1526,7 +1528,8 @@ TagID:  foreach $tagID (@keys) {
         my $fullName = ($strName =~ / / ? '' : 'XMP ') . "$strName Struct";
         my $info = $tagNameInfo{$fullName} = [ ];
         my $tag;
-        foreach $tag (sort keys %$struct) {
+        my $order = $$struct{SORT_ORDER} || [ sort keys %$struct ];
+        foreach $tag (@$order) {
             my $tagInfo = $$struct{$tag};
             next unless ref $tagInfo eq 'HASH' and $tag ne 'NAMESPACE' and $tag ne 'GROUPS';
             warn "WARNING: $strName Struct containes $tag\n" if $Image::ExifTool::specialTags{$tag};
@@ -1539,6 +1542,8 @@ TagID:  foreach $tagID (@keys) {
                     push @vals, $writable;
                     $structs{$writable} = 1;
                     $writable = "=$writable";
+                } elsif (defined $$tagInfo{Writable}) {
+                    $writable = 'no';
                 } else {
                     $writable = 'string';
                 }
@@ -1548,7 +1553,7 @@ TagID:  foreach $tagID (@keys) {
             # handle PrintConv lookups in Structure elements
             my $printConv = $$tagInfo{PrintConv};
             if (ref $printConv eq 'HASH') {
-                foreach (sort keys %$printConv) {
+                foreach (sort { NumbersFirst($a,$b) } keys %$printConv) {
                     next if /^(OTHER|BITMASK)$/;
                     push @vals, "$_ = $$printConv{$_}";
                 }
@@ -1822,24 +1827,7 @@ sub TweakOrder($$)
     local $_;
     my ($sortedTables, $tweakOrder) = @_;
     my @tweak = sort keys %$tweakOrder;
-    my (%addedMain, @sorted);
-    # flag files which have a "Main" table
-    foreach (@$sortedTables) {
-        $addedMain{$1} = 0 if /^Image::ExifTool::(\w+)::(\w+)/ and $2 eq 'Main';
-    }
-    # make sure that the main table always comes first in each file
-    foreach (@$sortedTables) {
-        if (/^Image::ExifTool::(\w+)::(\w+)/) {
-            if ($addedMain{$1}) {
-                next if $2 eq 'Main';   # don't add again
-            } elsif (defined $addedMain{$1}) {
-                push @sorted, "Image::ExifTool::${1}::Main" if $2 ne 'Main';
-                $addedMain{$1} = 1;
-            }
-        }
-        push @sorted, $_;
-    }
-    @$sortedTables = @sorted;
+    my (@sorted, %hasMain, %module, $entry);
     # apply manual tweaks
     while (@tweak) {
         my $table = shift @tweak;
@@ -1858,6 +1846,31 @@ sub TweakOrder($$)
         }
         @$sortedTables = (@notMoving, @moving, @after);
     }
+    # flag modules which have a "Main" table, and organize tables by module name
+    foreach (@$sortedTables) {
+        if (not /^Image::ExifTool::(\w+)::(\w+)/) {
+            push @sorted, $_;
+        } else {
+            $hasMain{$1} = 1 if $2 eq 'Main';
+            push @sorted, $module{$1} = [ ] unless $module{$1};
+            push @{$module{$1}}, $_;
+        }
+    }
+    # force MWG::Composite table first
+    my @mwg = ( 'Image::ExifTool::MWG::Composite' );
+    /Composite/ or push @mwg, $_ foreach @{$module{MWG}};
+    @{$module{MWG}} = @mwg;
+    # make sure that the main table always comes first in each file
+    # and that all other tables from this group follow
+    @$sortedTables = ( );
+    foreach $entry (@sorted) {
+        ref $entry or push(@$sortedTables, $entry), next;
+        $$entry[0] =~ /^Image::ExifTool::(\w+)::(\w+)/ or die 'Internal error';
+        my $main = "Image::ExifTool::$1::Main";
+        # main table must come first (even if it doesn't exist)
+        push @$sortedTables, $main if $hasMain{$1};
+        $_ eq $main or push(@$sortedTables, $_) foreach @$entry;
+    }
 }
 
 #------------------------------------------------------------------------------

data/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.38';
+$VERSION = '1.39';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -1758,7 +1758,7 @@ sub ProcessDR4($$;$)
     } else {
         # load DR4 file into memory
         my $buff;
-        $raf->Read($buff, 8) == 8 and $buff eq "IIII\x04\0\x04\0" or return 0;
+        $raf->Read($buff, 8) == 8 and $buff =~ /^IIII[\x04|\x05]\0\x04\0/ or return 0;
         $et->SetFileType();
         $raf->Seek(0, 2) or return $err = 1;
         $dirLen = $raf->Tell();

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.92';
+$VERSION = '1.94';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -550,8 +550,16 @@ my %faceCategories = (
             3 => 'Electronic Front Curtain', #10
         },
     },
-    0x1051 => { Name => 'CropTopLeft', Writable => 'int32u' }, #forum15784
-    0x1052 => { Name => 'CropCenter',  Writable => 'int32u' }, #forum15784
+    0x1051 => { #forum15784
+        Name => 'CropFlag',
+        Writable => 'int8u',
+        Notes => q(
+            this tag exists only if the image was cropped, and is 0 for cropped JPG
+            image or 1 for a cropped RAF
+        ),
+    },
+    0x1052 => { Name => 'CropTopLeft', Writable => 'int32u' }, #forum15784
+    0x1053 => { Name => 'CropSize',    Writable => 'int32u' }, #forum15784
     # 0x1100 - This may not work well for newer cameras (ref forum12682)
     0x1100 => [{
         Name => 'AutoBracketing',
@@ -1033,14 +1041,19 @@ my %faceCategories = (
     },
     0.5 => {
         Name => 'AFAreaZoneSize',
-        Mask => 0xf0000,
+        Mask => 0xff0000,
         PrintConv => {
             0 => 'n/a',
             OTHER => sub {
                 my ($val, $inv) = @_;
-                return "$val x $val" unless $inv;
-                $val =~ s/ ?x.*//;
-                return $val;
+                my ($w, $h);
+                if ($inv) {
+                    my ($w, $h) = $val =~ /(\d+)/g;
+                    return 0 unless $w and $h;
+                    return((($h << 5) & 0xf0) | ($w & 0x0f));
+                }
+                ($w, $h) = ($val & 0x0f, $val >> 5);
+                return "$w x $h";
             },
         },
     },