exiftool_vendored 12.76.1 → 12.81.0

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.76';
+my $version = '12.81';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -166,6 +166,7 @@ my $filtered;       # flag indicating file was filtered by name
 my $filterFlag;     # file filter flag (0x01=deny extensions, 0x02=allow extensions, 0x04=add ext)
 my $fixLen;         # flag to fix description lengths when writing alternate languages
 my $forcePrint;     # string to use for missing tag values (undef to not print them)
+my $geoOnly;        # flag to extract Geolocation tags only
 my $helped;         # flag to avoid printing help if no tags specified
 my $html;           # flag for html-formatted output (2=html dump)
 my $interrupted;    # flag set if CTRL-C is pressed during a critical process
@@ -490,6 +491,7 @@ undef $fileHeader;
 undef $filtered;
 undef $fixLen;
 undef $forcePrint;
+undef $geoOnly;
 undef $ignoreHidden;
 undef $joinLists;
 undef $langOpt;
@@ -587,6 +589,11 @@ if (not $preserveTime and $^O eq 'MSWin32') {
     $preserveTime = 2 if  eval { require Win32::API } and eval { require Win32API::File };
 }
 
+# add user-defined command-line arguments
+if (@Image::ExifTool::UserDefined::Arguments) {
+    unshift @ARGV, @Image::ExifTool::UserDefined::Arguments;
+}
+
 # parse command-line options in 2 passes...
 # pass 1: set all of our ExifTool options
 # pass 2: print all of our help and informational output (-list, -ver, etc)
@@ -663,7 +670,7 @@ for (;;) {
         next;
     }
     my $a = lc $_;
-    if (/^list([wfrdx]|wf|g(\d*))?$/i) {
+    if (/^list([wfrdx]|wf|g(\d*)|geo)?$/i) {
         $pass or push @nextPass, "-$_";
         my $type = lc($1 || '');
         if (not $type or $type eq 'w' or $type eq 'x') {
@@ -712,6 +719,28 @@ for (;;) {
             PrintTagList('Recognized file extensions', GetFileType(undef, 0));
         } elsif ($type eq 'd') {
             PrintTagList('Deletable groups', GetDeleteGroups());
+        } elsif ($type eq 'geo') {
+            require Image::ExifTool::Geolocation;
+            my ($i, $entry);
+            print "Geolocation database:\n" unless $quiet;
+            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,1) or last;
+                push @entry, Image::ExifTool::Geolocation::GetAltNames($i,1) if $isAlt;
+                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[@isUTF8];
+                print join(',', @entry), "\n";
+            }
         } else { # 'g(\d*)'
             # list all groups in specified family
             my $family = $2 || 0;
@@ -1102,7 +1131,7 @@ for (;;) {
         } else {
             $pass or push(@nextPass, '-lang'), next;
         }
-        my $langs = "Available languages:\n";
+        my $langs = $quiet ? '' : "Available languages:\n";
         $langs .= "  $_ - $Image::ExifTool::langName{$_}\n" foreach @Image::ExifTool::langs;
         $langs =~ tr/_/-/;  # display dashes instead of underlines in language codes
         $langs = Image::ExifTool::HTML::EscapeHTML($langs) if $escapeHTML;
@@ -1341,11 +1370,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#';
@@ -1414,8 +1443,15 @@ if ($useMWG and not defined $mt->Options('CharsetEXIF')) {
     $mt->Options(CharsetEXIF => 'UTF8');
 }
 
+# allow geolocation without input file if set to a position
+if (not @files and not $outOpt and not @newValues) {
+    my $loc = $mt->Options('Geolocation');
+    # use undocumented feature to input JSON file directly from command line
+    $loc and $loc ne '1' and push(@files, qq(\@JSON:{})), $geoOnly = 1;
+}
+
 # print help
-unless ((@tags and not $outOpt) or @files or @newValues) {
+unless ((@tags and not $outOpt) or @files or @newValues or $geoOnly) {
     if ($doGlob and $doGlob == 2) {
         Warn "No matching files\n";
         $rtnVal = 1;
@@ -2113,6 +2149,11 @@ sub GetImageInfo($$)
         # can't make use of $info if verbose because we must reprocess
         # the file anyway to generate the verbose output
         undef $info if $verbose or defined $fastCondition;
+    } elsif ($file =~ s/^(\@JSON:)(.*)/$1/) {
+        # read JSON file from command line
+        my $dat = $2;
+        $info = $et->ImageInfo(\$dat, \@foundTags);
+        if ($geoOnly) { /^Geolocation/ or delete $$info{$_} foreach keys %$info; $file = ' ' }
     }
     if (defined $deleteOrig) {
         Progress($vout, "======== $file") if defined $verbose;
@@ -2169,7 +2210,7 @@ sub GetImageInfo($$)
     }
 
     # extract information from this file
-    unless ($file eq '-' or $et->Exists($file)) {
+    unless ($file eq '-' or $et->Exists($file) or $info) {
         Warn "Error: File not found - $file\n";
         FileNotFound($file);
         defined $outfile and close($fp), undef($tmpText), $et->Unlink($outfile);
@@ -2354,7 +2395,7 @@ sub GetImageInfo($$)
                 # set delimiters for JSON or PHP output
                 ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
                 print $fp ",\n" if $comma;
-                print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file));
+                print $fp qq($bra\n  "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file),1);
                 $comma = 1;
                 $ind = (defined $showGroup and not $allGroup) ? '    ' : '  ';
             } elsif ($csv) {
@@ -3372,7 +3413,22 @@ sub FormatXML($$$)
         my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
         foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
-            my $tok = /:/ ? $_ : ($grp . ':' . $_);
+            my ($ns, $tg) = ($grp, $_);
+            if (/^(.*?):(.*)/) {
+                if ($grp eq 'JSON') {
+                    $tg =~ tr/:/_/; # colons in JSON structure elements are not namespaces
+                } else {
+                    ($ns, $tg) = ($1, $2);
+                }
+            }
+            # validate XML attribute name
+            my $name;
+            foreach $name ($ns, $tg) {
+                # make sure name is valid for XML
+                $name =~ tr/-_A-Za-z0-9.//dc;
+                $name = '_' . $name if $name !~ /^[_A-Za-z]/;
+            }
+            my $tok = $ns . ':' . $tg;
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
         }
         $val = "$val2\n$ind";
@@ -3515,7 +3571,7 @@ sub PrintCSV()
 }
 
 #------------------------------------------------------------------------------
-# Add tag groups from structure fields to a list
+# Add tag groups from structure fields to a list for xmlns
 # Inputs: 0) tag value, 1) parent group, 2) group hash ref, 3) group list ref
 sub AddGroups($$$$)
 {
@@ -3523,7 +3579,7 @@ sub AddGroups($$$$)
     my ($key, $val2);
     if (ref $val eq 'HASH') {
         foreach $key (sort keys %$val) {
-            if ($key =~ /(.*?):/ and not $$groupHash{$1}) {
+            if ($key =~ /^(.*?):/ and not $$groupHash{$1} and $grp ne 'JSON') {
                 $$groupHash{$1} = $grp;
                 push @$groupList, $1;
             }
@@ -4614,7 +4670,7 @@ B<exiftool> [I<OPTIONS>] B<-tagsFromFile> I<SRCFILE>
 =head2 Other
 
 B<exiftool> [ B<-ver> |
-B<-list>[B<w>|B<f>|B<r>|B<wf>|B<g>[I<NUM>]|B<d>|B<x>] ]
+B<-list>[B<w>|B<f>|B<r>|B<wf>|B<g>[I<NUM>]|B<d>|B<x>|B<geo>] ]
 
 For specific examples, see the L<EXAMPLES|/READING EXAMPLES> sections below.
 
@@ -4655,7 +4711,7 @@ supported by ExifTool (r = read, w = write, c = create):
   3GP   r/w   | DSS   r     | JP2   r/w   | ODT   r     | RWL   r/w
   7Z    r     | DV    r     | JPEG  r/w   | OFR   r     | RWZ   r
   A     r     | DVB   r/w   | JSON  r     | OGG   r     | RM    r
-  AA    r     | DVR-MS r    | JXL   r     | OGV   r     | SEQ   r
+  AA    r     | DVR-MS r    | JXL   r/w   | OGV   r     | SEQ   r
   AAC   r     | DYLIB r     | K25   r     | ONP   r     | SKETCH r
   AAE   r     | EIP   r     | KDC   r     | OPUS  r     | SO    r
   AAX   r/w   | EPS   r/w   | KEY   r     | ORF   r/w   | SR2   r/w
@@ -4824,7 +4880,7 @@ L<Advanced options|/Advanced options>
   -common_args                     Define common arguments
   -config CFGFILE                  Specify configuration file name
   -echo[NUM] TEXT                  Echo text to stdout or stderr
-  -efile[NUM][!] ERRFILE           Save names of files with errors
+  -efile[NUM][!] TXTFILE           Save names of files with errors
   -execute[NUM]                    Execute multiple commands on one line
   -fileNUM ALTFILE                 Load tags from alternate file
   -list_dir                        List directories, not their contents
@@ -5216,8 +5272,9 @@ Notes:
 when copying tags using the B<-tagsFromFile> option.
 
 2) If the hemisphere is known, a reference direction (N, S, E or W) is
-appended to each printed coordinate, but adding a C<+> to the format
-specifier (eg. C<%+.6f>) prints a signed coordinate instead.
+appended to each printed coordinate, but adding a C<+> or C<-> to the format
+specifier (eg. C<%+.6f> or C<%-.6f>) prints a signed coordinate instead. 
+(C<+> adds a leading "+" for positive coordinates, but C<-> does not.)
 
 3) This print formatting may be disabled with the B<-n> option to extract
 coordinates as signed decimal degrees.
@@ -5605,7 +5662,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.76 --
+    -- Generated by ExifTool 12.81 --
     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
@@ -6367,22 +6424,25 @@ prevent the command window from closing when run as a Windows drag and drop
 application.
 
 =item B<-list>, B<-listw>, B<-listf>, B<-listr>, B<-listwf>,
-B<-listg>[I<NUM>], B<-listd>, B<-listx>
+B<-listg>[I<NUM>], B<-listd>, B<-listx>, B<-listgeo>
 
 Print a list of all valid tag names (B<-list>), all writable tag names
 (B<-listw>), all supported file extensions (B<-listf>), all recognized file
 extensions (B<-listr>), all writable file extensions (B<-listwf>), all tag
 groups [in a specified family] (B<-listg>[I<NUM>]), all deletable tag groups
-(B<-listd>), or an XML database of tag details including language
-translations (B<-listx>).  The B<-list>, B<-listw> and B<-listx> options may
-be followed by an additional argument of the form C<-GROUP:All> to list only
-tags in a specific group, where C<GROUP> is one or more family 0-2 group
-names (excepting EXIF IFD groups) separated by colons.  With B<-listg>,
-I<NUM> may be given to specify the group family, 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.  Here
-are some examples:
+(B<-listd>), an XML database of tag details including language translations
+(B<-listx>), or the Geolocation database (B<-listgeo>).  The B<-list>,
+B<-listw> and B<-listx> options may be followed by an additional argument of
+the form C<-GROUP:All> to list only tags in a specific group, where C<GROUP>
+is one or more family 0-2 group names (excepting EXIF IFD groups) separated
+by colons.  With B<-listg>, I<NUM> may be given to specify the group family,
+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, 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
@@ -6395,6 +6455,7 @@ are some examples:
     -listd              # list all deletable groups
     -listx -EXIF:All    # list database of EXIF tags in XML format
     -listx -XMP:All -s  # list short XML database of XMP tags
+    -listgeo -lang de   # list geolocation database in German
 
 When combined with B<-listx>, the B<-s> option shortens the output by
 omitting the descriptions and values (as in the last example above), and
@@ -6483,6 +6544,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. 
@@ -6596,15 +6661,15 @@ respectively) after processing is complete.  For B<-echo3> and B<-echo4>,
 "${status}" may be used in the I<TEXT> string to represent the numerical
 exit status of the command (see L</EXIT STATUS>).
 
-=item B<-efile>[I<NUM>][!] I<ERRFILE>
+=item B<-efile>[I<NUM>][!] I<TXTFILE>
 
 Save the names of files giving errors (I<NUM> missing or 1), files that were
 unchanged (I<NUM> is 2), files that fail the B<-if> condition (I<NUM> is 4),
 files that were updated (I<NUM> is 8), files that were created (I<NUM> is
 16), or any combination thereof by summing I<NUM> (eg. B<-efile3> is the
 same has having both B<-efile> and B<-efile2> options with the same
-I<ERRFILE>). By default, file names are appended to any existing I<ERRFILE>,
-but I<ERRFILE> is overwritten if an exclamation point is added to the option
+I<TXTFILE>). By default, file names are appended to any existing I<TXTFILE>,
+but I<TXTFILE> is overwritten if an exclamation point is added to the option
 (eg. B<-efile!>).  Saves the name of the file specified by the B<-srcfile>
 option if applicable.
 
@@ -7380,6 +7445,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/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.73';
+$VERSION = '4.74';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -203,7 +203,8 @@ $VERSION = '4.73';
     52 => 'Canon EF-S 18-55mm f/3.5-5.6 IS II', #PH
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
     54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
-    60 => 'Irix 11mm f/4', #50
+    60 => 'Irix 11mm f/4 or 15mm f/2.4', #50
+    60.1 => 'Irix 15mm f/2.4', #forum15655
     63 => 'Irix 30mm F1.4 Dragonfly', #IB
     80 => 'Canon TS-E 50mm f/2.8L Macro', #42
     81 => 'Canon TS-E 90mm f/2.8L Macro', #42
@@ -4731,6 +4732,7 @@ my %ciMaxFocal = (
     NOTES => 'CameraInfo tags for the PowerShot G5 X Mark II.',
     0x0293 => {
         Name => 'ShutterCount',
+        Condition => '$$self{FileType} eq "JPEG"',
         Format => 'int32u',
         Notes => 'includes electronic + mechanical shutter',
         # - advances by 1 for each photo file, regardless of mechanical or electronic shutter
@@ -4738,26 +4740,27 @@ my %ciMaxFocal = (
         # - advances for time lapse video files
         # - creating a new directory or resetting the counter from the menu doesn't affect this shutter count
     },
+    0x0a95 => {
+        Name => 'ShutterCount',
+        Condition => '$$self{FileType} eq "CR3"',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+    },
     0x0b21 => {
         Name => 'DirectoryIndex',
+        Condition => '$$self{FileType} eq "JPEG"',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
     },
     0x0b2d => {
         Name => 'FileIndex',
+        Condition => '$$self{FileType} eq "JPEG"',
         Format => 'int32u',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
         ValueConv => '$val + 1',
         ValueConvInv => '$val - 1',
     },
-    #0x0b39 => {
-    #    Name => 'DirectoryIndex',
-    #    Groups => { 2 => 'Image' },
-    #    Format => 'int32u',
-    #    ValueConv => '$val - 1',
-    #    ValueConvInv => '$val + 1',
-    #},
 );
 
 # Canon camera information for 70D (MakerNotes tag 0x0d) (ref PH)

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.37';
+$VERSION = '1.39';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -51,6 +51,7 @@ my %vrdFormat = (
     8 => 'int32u',
     9 => 'int32s',
     13 => 'double',
+    24 => 'int32s', # (rectangle coordinates)
     33 => 'int32u', # (array)
     38 => 'double', # (array)
     # 254 => 'undef', ?
@@ -1226,6 +1227,11 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     # 0x20a08 - (unknown picture style settings)
     # 0x20a09 - Custom picture style settings
     # 0x20a20 - Fine Detail picture style settings
+    0x20b10 => 'DPRAWMicroadjustBackFront', #forum15660
+    0x20b12 => 'DPRAWMicroadjustStrength', #forum15660
+    0x20b20 => 'DPRAWBokehShift', #forum15660
+    0x20b21 => 'DPRAWBokehShiftArea', #PH
+    0x20b30 => 'DPRAWGhostingReductionArea', #forum15660
     0x30101 => {
         Name => 'CropAspectRatio',
         PrintConv => {
@@ -1752,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/Exif.pm

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.50';
+$VERSION = '4.51';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -593,6 +593,14 @@ my %opcodeInfo = (
             OffsetPair => 0x117,  # point to associated byte counts
             DataTag => 'OtherImage',
         },
+        {
+            Condition => '$$self{Compression} and $$self{Compression} eq "52546"', # DNG 1.7 Jpeg XL
+            Name => 'PreviewJXLStart',
+            IsOffset => 1,
+            IsImageData => 1,
+            OffsetPair => 0x117,  # point to associated byte counts
+            DataTag => 'PreviewJXL',
+        },
         {
             # (APP1 IFD2 is for Leica JPEG preview)
             Condition => q[
@@ -687,6 +695,12 @@ my %opcodeInfo = (
             OffsetPair => 0x111,   # point to associated offset
             DataTag => 'OtherImage',
         },
+        {
+            Condition => '$$self{Compression} and $$self{Compression} eq "52546"', # DNG 1.7 Jpeg XL
+            Name => 'PreviewJXLLength',
+            OffsetPair => 0x111,   # point to associated offset
+            DataTag => 'PreviewJXL',
+        },
         {
             # (APP1 IFD2 is for Leica JPEG preview)
             Condition => q[
@@ -2421,7 +2435,7 @@ my %opcodeInfo = (
         Count => -1, # 2, 3 or 4 values
     },
     0x9215 => 'ExposureIndex', #12
-    0x9216 => 'TIFF-EPStandardID', #12
+    0x9216 => { Name => 'TIFF-EPStandardID', PrintConv => '$val =~ tr/ /./; $val' }, #12
     0x9217 => { #12
         Name => 'SensingMethod',
         Groups => { 2 => 'Camera' },
@@ -2711,7 +2725,7 @@ my %opcodeInfo = (
         Count => 2,
     },
     0xa215 => { Name => 'ExposureIndex', Writable => 'rational64u' },
-    0xa216 => 'TIFF-EPStandardID',
+    0xa216 => { Name => 'TIFF-EPStandardID', PrintConv => '$val =~ tr/ /./; $val' },
     0xa217 => {
         Name => 'SensingMethod',
         Groups => { 2 => 'Camera' },
@@ -4971,6 +4985,39 @@ my %subSecConv = (
             Image::ExifTool::Exif::ExtractImage($self,$val[0],$val[1],"OtherImage");
         },
     },
+    PreviewJXL => {
+        Groups => { 0 => 'EXIF', 1 => 'SubIFD', 2 => 'Preview' },
+        Require => {
+            0 => 'PreviewJXLStart',
+            1 => 'PreviewJXLLength',
+        },
+        Desire => {
+            2 => 'PreviewJXLStart (1)',
+            3 => 'PreviewJXLLength (1)',
+        },
+        # retrieve all other JXL 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});
+            my $image = $self->ExtractBinary($val[0], $val[1], 'PreviewJXL');
+            unless ($image =~ /^(Binary data|\xff\x0a|\0\0\0\x0cJXL \x0d\x0a......ftypjxl )/s) {
+                $self->Warn("$tag is not a valid JXL image",1);
+                return undef;
+            }
+            return \$image;
+        },
+    },
     PreviewImageSize => {
         Require => {
             0 => 'PreviewImageWidth',
@@ -5096,7 +5143,8 @@ my %subSecConv = (
             GPSLongitudeRef => '(defined $val and $val =~ / (-?)/) ? ($1 ? "W" : "E") : undef',
         },
         PrintConvInv => q{
-            return undef unless $val =~ /(.*? ?[NS]?), ?(.*? ?[EW]?)$/;
+            return undef unless $val =~ /(.*? ?[NS]?), ?(.*? ?[EW]?)$/ or
+                $val =~ /^\s*(-?\d+(?:\.\d+)?)\s*(-?\d+(?:\.\d+)?)\s*$/;
             my ($lat, $lon) = ($1, $2);
             require Image::ExifTool::GPS;
             $lat = Image::ExifTool::GPS::ToDegrees($lat, 1, "lat");

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.93';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -528,6 +528,7 @@ my %faceCategories = (
             1 => 'Full-frame on GFX', #IB
             2 => 'Sports Finder Mode', # (mechanical shutter)
             4 => 'Electronic Shutter 1.25x Crop', # (continuous high)
+            8 => 'Digital Tele-Conv', #forum15784
         },
     },
     0x104e => { #forum10800 (X-Pro3)
@@ -549,6 +550,9 @@ my %faceCategories = (
             3 => 'Electronic Front Curtain', #10
         },
     },
+    0x1051 => { Name => 'Cropped',     Writable => 'int8u', PrintConv => { 0 => 'No', 1 => 'Yes' } }, #forum15784
+    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',
@@ -1030,14 +1034,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";
             },
         },
     },

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.55';
+$VERSION = '1.56';
 
 my %coordConv = (
     ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
@@ -491,7 +491,7 @@ sub PrintTimeStamp($)
 sub ToDMS($$;$$)
 {
     my ($et, $val, $doPrintConv, $ref) = @_;
-    my ($fmt, @fmt, $num, $sign, $rtnVal, $neg);
+    my ($fmt, @fmt, $num, $sign, $minus, $rtnVal, $neg);
 
     unless (length $val) {
         # don't convert an empty value
@@ -503,8 +503,10 @@ sub ToDMS($$;$$)
             $val = -$val;
             $ref = {N => 'S', E => 'W'}->{$ref};
             $sign = '-';
+            $minus = '-';
         } else {
             $sign = '+';
+            $minus = '';
         }
         $ref = " $ref" unless $doPrintConv and $doPrintConv eq '2';
     } else {
@@ -522,7 +524,7 @@ sub ToDMS($$;$$)
                 $fmt = q{%d deg %d' %.2f"} . $ref;
             } elsif ($ref) {
                 # use signed value instead of reference direction if specified
-                $fmt =~ s/%\+/$sign%/g or $fmt .= $ref;
+                $fmt =~ s/%\+/$sign%/g or $fmt =~ s/%-/$minus%/g or $fmt .= $ref;
             } else {
                 $fmt =~ s/%\+/%/g;  # don't know sign, so don't print it
             }