Skip to content

Commit 6f5839c

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #104 from woss/v13.30
Update exiftool to version v13.30
2 parents 5c18a06 + 536cf57 commit 6f5839c

18 files changed

Lines changed: 3882 additions & 3773 deletions

‎exiftool/exiftool‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use strict;
1111
use warnings;
1212
require 5.004;
1313

14-
my $version = '13.29';
14+
my $version = '13.30';
1515

1616
$^W = 1; # enable global warnings
1717

@@ -35,9 +35,9 @@ BEGIN {
3535
# add lib directory at start of include path
3636
unshift @INC, $incDir;
3737
# load or disable config file if specified
38-
if (@ARGV and lc($ARGV[0]) eq '-config') {
38+
while (@ARGV and lc($ARGV[0]) eq '-config') {
3939
shift;
40-
$Image::ExifTool::configFile = shift;
40+
push @Image::ExifTool::configFiles, shift;
4141
}
4242
}
4343
use Image::ExifTool qw{:Public};
@@ -6052,7 +6052,7 @@ with this command:
60526052
60536053
produces output like this:
60546054
6055-
-- Generated by ExifTool 13.29 --
6055+
-- Generated by ExifTool 13.30 --
60566056
File: a.jpg - 2003:10:31 15:44:19
60576057
(f/5.6, 1/60s, ISO 100)
60586058
File: b.jpg - 2006:05:23 11:57:38
@@ -7150,6 +7150,9 @@ accessing tags from the corresponding C<FileNUM> group.
71507150
User-defined Composite tags may access tags from alternate files using the
71517151
appropriate (case-sensitive) family 8 group name.
71527152
7153+
The B<-fast> option, if used, also applies to processing of the alternate
7154+
files.
7155+
71537156
=item B<-list_dir>
71547157
71557158
List directories themselves instead of their contents. This option

‎exiftool/lib/Image/ExifTool.pm‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
2727
%noWriteFile %magicNumber @langs $defaultLang %langName %charsetName
2828
%mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
2929
%jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
30-
%static_vars $advFmtSelf);
30+
%static_vars $advFmtSelf $configFile @configFiles $noConfig);
3131

32-
$VERSION = '13.29';
32+
$VERSION = '13.30';
3333
$RELEASE = '';
3434
@ISA = qw(Exporter);
3535
%EXPORT_TAGS = (
@@ -10047,8 +10047,9 @@ sub ProcessBinaryData($$$)
1004710047
#..............................................................................
1004810048
# Load .ExifTool_config file from user's home directory
1004910049
# (use of noConfig is now deprecated, use configFile = '' instead)
10050-
until ($Image::ExifTool::noConfig) {
10051-
my $config = $Image::ExifTool::configFile;
10050+
push @configFiles, $configFile if defined $configFile;
10051+
until ($noConfig) {
10052+
my $config = shift @configFiles;
1005210053
my $file;
1005310054
if (not defined $config) {
1005410055
$config = '.ExifTool_config';
@@ -10073,7 +10074,7 @@ until ($Image::ExifTool::noConfig) {
1007310074
shift @INC;
1007410075
# print warning (minus "Compilation failed" part)
1007510076
$@ and $_=$@, s/Compilation failed.*//s, warn $_;
10076-
last;
10077+
last unless @configFiles;
1007710078
}
1007810079
# read user-defined lenses (may have been defined by script instead of config file)
1007910080
if (@Image::ExifTool::UserDefined::Lenses) {

‎exiftool/lib/Image/ExifTool/BuildTagLookup.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ TagID: foreach $tagID (@keys) {
995995
if ($format and $format =~ /\$val\{/ and
996996
($$tagInfo{Writable} or not defined $$tagInfo{Writable}))
997997
{
998-
warn "Warning: \$var{} used in Format of writable tag - $short $name\n"
998+
warn "Warning: \$val{} used in Format of writable tag - $short $name\n"
999999
}
10001000
}
10011001
if ($$tagInfo{Hidden}) {

‎exiftool/lib/Image/ExifTool/Canon.pm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
8888
sub ProcessExifInfo($$$);
8989
sub SwapWords($);
9090

91-
$VERSION = '4.90';
91+
$VERSION = '4.91';
9292

9393
# Note: Removed 'USM' from 'L' lenses since it is redundant - PH
9494
# (or is it? Ref 32 shows 5 non-USM L-type lenses)
@@ -638,6 +638,7 @@ $VERSION = '4.90';
638638
'61182.60' => 'Canon RF 16-28mm F2.8 IS STM', #42
639639
'61182.61' => 'Canon RF 50mm F1.4 L VCM', #42
640640
'61182.62' => 'Canon RF 24mm F1.4 L VCM', #42
641+
'61182.63' => 'Canon RF 20mm F1.4 L VCM', #42
641642
65535 => 'n/a',
642643
);
643644

@@ -7033,6 +7034,7 @@ my %ciMaxFocal = (
70337034
323 => 'Canon RF 16-28mm F2.8 IS STM', #42
70347035
325 => 'Canon RF 50mm F1.4 L VCM', #42
70357036
326 => 'Canon RF 24mm F1.4 L VCM', #42
7037+
327 => 'Canon RF 20mm F1.4 L VCM', #42
70367038
# Note: add new RF lenses to %canonLensTypes with ID 61182
70377039
},
70387040
},

‎exiftool/lib/Image/ExifTool/Exif.pm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
5757
use Image::ExifTool qw(:DataAccess :Utils);
5858
use Image::ExifTool::MakerNotes;
5959

60-
$VERSION = '4.56';
60+
$VERSION = '4.57';
6161

6262
sub ProcessExif($$$);
6363
sub WriteExif($$$);
@@ -5804,6 +5804,8 @@ sub PrintLensID($$@)
58045804
}
58055805
if ($$et{Make} eq 'SONY') {
58065806
if ($lensType eq 65535) {
5807+
# patch for manual lens (forum17379)
5808+
return $$printConv{$lensType} if $$printConv{$lensType} and not $focalLength and $maxAperture == 1;
58075809
# handle Sony E-type lenses when LensType2 isn't valid (NEX/ILCE models only)
58085810
if ($$et{Model} =~ /NEX|ILCE/) {
58095811
unless (%sonyEtype) {

‎exiftool/lib/Image/ExifTool/FujiFilm.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use vars qw($VERSION);
3131
use Image::ExifTool qw(:DataAccess :Utils);
3232
use Image::ExifTool::Exif;
3333

34-
$VERSION = '1.96';
34+
$VERSION = '1.97';
3535

3636
sub ProcessFujiDir($$$);
3737
sub ProcessFaceRec($$$);
@@ -628,6 +628,7 @@ my %faceCategories = (
628628
0x60006 => 'Partial Color Purple',
629629
0x70000 => 'Soft Focus',
630630
0x90000 => 'Low Key',
631+
0x100000 => 'Light Leak', #forum17392
631632
},
632633
},
633634
0x1210 => { #2

‎exiftool/lib/Image/ExifTool/Geolocation.dat‎

34.5 KB
Binary file not shown.

‎exiftool/lib/Image/ExifTool/LigoGPS.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use strict;
1111
use vars qw($VERSION);
1212
use Image::ExifTool;
1313

14-
$VERSION = '1.04';
14+
$VERSION = '1.05';
1515

1616
sub ProcessLigoGPS($$$;$);
1717
sub ProcessLigoJSON($$$);
@@ -329,7 +329,7 @@ sub ProcessLigoJSON($$$)
329329
my $dataPt = $$dirInfo{DataPt};
330330
my $dirLen = $$dirInfo{DirLen};
331331
require Image::ExifTool::Import;
332-
$et->VerboseDir('LIGO_JSON', undef, length($$dataPt) - pos($$dataPt));
332+
$et->VerboseDir('LIGO_JSON', undef, length($$dataPt) - (pos($$dataPt) || 0));
333333
$$et{SET_GROUP1} = 'LIGO';
334334
while ($$dataPt =~ /LIGOGPSINFO (\{.*?\})/g) {
335335
my $json = $1;

‎exiftool/lib/Image/ExifTool/MakerNotes.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
2121
sub WriteUnknownOrPreview($$$);
2222
sub FixLeicaBase($$;$);
2323

24-
$VERSION = '2.16';
24+
$VERSION = '2.17';
2525

2626
my $debug; # set to 1 to enable debugging code
2727

@@ -991,9 +991,9 @@ my $debug; # set to 1 to enable debugging code
991991
{
992992
Name => 'MakerNoteSigma',
993993
Condition => q{
994-
return undef unless $$self{Make}=~/^(SIGMA|FOVEON)/;
994+
return undef unless $$self{Make}=~/^(SIGMA|FOVEON)/i;
995995
# save version number in "MakerNoteSigmaVer" member variable
996-
$$self{MakerNoteSigmaVer} = $$valPt=~/^SIGMA\0\0\0\0(.)/ ? ord($1) : -1;
996+
$$self{MakerNoteSigmaVer} = $$valPt=~/^SIGMA\0\0\0.(.)/s ? ord($1) : -1;
997997
return 1;
998998
},
999999
SubDirectory => {

‎exiftool/lib/Image/ExifTool/Olympus.pm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
4040
use Image::ExifTool::Exif;
4141
use Image::ExifTool::APP12;
4242

43-
$VERSION = '2.85';
43+
$VERSION = '2.86';
4444

4545
sub PrintLensInfo($$$);
4646

@@ -550,6 +550,7 @@ my %filters = (
550550
4 => 'Light Tone',
551551
5 => 'Pin Hole', # (SZ-10 magic filter 2,SZ-31MR,E-PL3)
552552
6 => 'Grainy Film',
553+
8 => 'Underwater', #forum17348
553554
9 => 'Diorama',
554555
10 => 'Cross Process',
555556
12 => 'Fish Eye', # (SZ-10 magic filter 3)
@@ -581,6 +582,9 @@ my %filters = (
581582
39 => 'Partial Color', #forum6269
582583
40 => 'Partial Color II', #forum6269
583584
41 => 'Partial Color III', #forum6269
585+
42 => 'Bleach Bypass', #forum17348
586+
43 => 'Bleach Bypass II', #forum17348
587+
44 => 'Instant Film', #forum17348
584588
);
585589

586590
my %toneLevelType = (

0 commit comments

Comments
 (0)