Skip to content

Commit

Permalink
Upgrading to exiftool v12.93
Browse files Browse the repository at this point in the history
  • Loading branch information
morozgrafix committed Aug 27, 2024
1 parent eab38da commit 5d48edf
Show file tree
Hide file tree
Showing 19 changed files with 241 additions and 70 deletions.
18 changes: 15 additions & 3 deletions bin/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,25 @@ 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.)

Aug. 20, 2024 - Version 12.93

- Added a new Nikon LensID
- Added a couple of new OpenEXR Compression types
- Added a couple of new QuickTime Keys tags
- Decode timed metadata from E-ACE B44 DashCam videos
- Make "Unrecognized" Samsung Meta warnings minor
- Fixed bug in -listg6 option which resulted in "uninitialized value" warnings
- Fixed decoding of Func1Button and Func2Button for the Nikon Z6/Z7
- Fixed bug reading JUMB metadata from JXL images

July 24, 2024 - Version 12.92

- Removed -w from exiftool shebang
- Removed -w from exiftool shebang due to compatibility issues on some systems

July 24, 2024 - Version 12.91

- Fixed 2 test files that were causing failed tests (ExifTool itself is
- Added a couple of new OpenEXR Compression values (github#276)
- Updated 2 test files that were causing failed tests (ExifTool itself is
unchanged)

July 24, 2024 - Version 12.90
Expand All @@ -25,7 +37,7 @@ July 24, 2024 - Version 12.90
- Drop Nikon ShotInfo record when copying MakerNotes from NEF to JPG if it is
larger than 50000 bytes (then MakerNotes would be too large for a single
JPEG segment)
- Changed exiftool shebang from "#!/usr/bin/perl" to "#!/usr/bin/env perl"
- Changed exiftool shebang to use env: "#!/usr/bin/env perl -w"
- Revert change of 12.84 to iterate through sub-documents with the -p option
only if -ee is used

Expand Down
2 changes: 1 addition & 1 deletion bin/META.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
}
},
"release_status" : "stable",
"version" : "12.92"
"version" : "12.93"
}
2 changes: 1 addition & 1 deletion bin/META.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ recommends:
Time::HiRes: '0'
requires:
perl: '5.004'
version: '12.92'
version: '12.93'
4 changes: 2 additions & 2 deletions bin/README
Original file line number Diff line number Diff line change
Expand Up @@ -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.92.tar.gz | tar -xf -
cd Image-ExifTool-12.92
gzip -dc Image-ExifTool-12.93.tar.gz | tar -xf -
cd Image-ExifTool-12.93
./exiftool t/images/ExifTool.jpg

Note: These commands extract meta information from one of the test images.
Expand Down
4 changes: 2 additions & 2 deletions bin/exiftool
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use strict;
use warnings;
require 5.004;

my $version = '12.92';
my $version = '12.93';

# add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
my $exePath;
Expand Down Expand Up @@ -5684,7 +5684,7 @@ with this command:
produces output like this:
-- Generated by ExifTool 12.92 --
-- Generated by ExifTool 12.93 --
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
Expand Down
2 changes: 1 addition & 1 deletion bin/lib/Image/ExifTool.pm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
%jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
%static_vars $advFmtSelf);

$VERSION = '12.92';
$VERSION = '12.93';
$RELEASE = '';
@ISA = qw(Exporter);
%EXPORT_TAGS = (
Expand Down
11 changes: 8 additions & 3 deletions bin/lib/Image/ExifTool/Canon.pm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
sub ProcessExifInfo($$$);
sub SwapWords($);

$VERSION = '4.79';
$VERSION = '4.80';

# Note: Removed 'USM' from 'L' lenses since it is redundant - PH
# (or is it? Ref 32 shows 5 non-USM L-type lenses)
Expand Down Expand Up @@ -9199,14 +9199,19 @@ my %filterConv = (
PrintConvInv => '$val=~s/\s*mm//;$val',
},
8 => {
Name => 'MinFocalLength',
Name => 'MinFocalLength2',
Notes => q{
these seem to be min/max focal length without teleconverter, as opposed to
MinFocalLength and MaxFocalLength which include the effect of a
teleconverter
}, #forum16309
ValueConv => '$val / 10',
ValueConvInv => 'int($val * 10 + 0.5)',
PrintConv => '"$val mm"',
PrintConvInv => '$val=~s/\s*mm//;$val',
},
9 => {
Name => 'MaxFocalLength',
Name => 'MaxFocalLength2',
ValueConv => '$val / 10',
ValueConvInv => 'int($val * 10 + 0.5)',
PrintConv => '"$val mm"',
Expand Down
4 changes: 2 additions & 2 deletions bin/lib/Image/ExifTool/Jpeg2000.pm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use strict;
use vars qw($VERSION);
use Image::ExifTool qw(:DataAccess :Utils);

$VERSION = '1.39';
$VERSION = '1.40';

sub ProcessJpeg2000Box($$$);
sub ProcessJUMD($$$);
Expand Down Expand Up @@ -1442,7 +1442,7 @@ sub ProcessBrotli($$$)
}
} elsif ($type eq 'jumb') {
return undef if $isWriting; # (can't yet write JUMBF)
Image::ExifTool::ProcessJUMB($et, \%dirInfo, $tagTablePtr); # (untested)
Image::ExifTool::Jpeg2000::ProcessJUMB($et, \%dirInfo, $tagTablePtr); # (untested)
}
if ($isWriting) {
return undef unless defined $dat;
Expand Down
3 changes: 2 additions & 1 deletion bin/lib/Image/ExifTool/Nikon.pm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
use Image::ExifTool::GPS;
use Image::ExifTool::XMP;

$VERSION = '4.36';
$VERSION = '4.37';

sub LensIDConv($$$);
sub ProcessNikonAVI($$$);
Expand Down Expand Up @@ -367,6 +367,7 @@ sub GetAFPointGrid($$;$);
'02 46 37 37 25 25 02 00' => 'Sigma 24mm F2.8 Super Wide II Macro',
'7E 54 37 37 0C 0C 4B 06' => 'Sigma 24mm F1.4 DG HSM | A', #30
'26 58 3C 3C 14 14 1C 02' => 'Sigma 28mm F1.8 EX DG Aspherical Macro',
'BC 54 3C 3C 0C 0C 4B 46' => 'Sigma 28mm F1.4 DG HSM | A', #30
'48 54 3E 3E 0C 0C 4B 06' => 'Sigma 30mm F1.4 EX DC HSM',
'F8 54 3E 3E 0C 0C 4B 06' => 'Sigma 30mm F1.4 EX DC HSM', #JD
'91 54 44 44 0C 0C 4B 06' => 'Sigma 35mm F1.4 DG HSM', #30
Expand Down
57 changes: 56 additions & 1 deletion bin/lib/Image/ExifTool/NikonSettings.pm
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,57 @@ use strict;
use vars qw($VERSION);
use Image::ExifTool qw(:DataAccess :Utils);

$VERSION = '1.07';
$VERSION = '1.08';

sub ProcessNikonSettings($$$);

my %enableDisable = ( 1 => 'Enable', 2 => 'Disable' );

my %funcButtonZ6 = ( #forum16316
1 => 'AF-On or Subject Tracking', # (bug in 3.xx firmware?)
2 => 'AF Lock Only',
3 => 'AE Lock (hold)',
4 => 'AE Lock (reset on release)',
5 => 'AE Lock Only',
6 => 'AE/AF Lock',
7 => 'FV Lock',
8 => 'Flash Disable/Enable',
9 => 'Preview',
10 => 'Matrix Metering',
11 => 'Center-weighted Metering',
12 => 'Spot Metering',
13 => 'Highlight-weighted Metering',
14 => 'Bracketing Burst',
15 => 'Synchronized Release (Master)',
16 => 'Synchronized Release (Remote)', # no settings map to 17 or 18
19 => '+NEF(RAW)',
20 => 'Framing Grid Display',
# 21 - missing
22 => 'Zoom On/Off',
# 23 - missing
24 => 'My Menu',
25 => 'My Menu Top Item',
26 => 'Playback',
27 => 'Protect',
28 => 'Image Area',
29 => 'Image Quality',
30 => 'White Balance',
31 => 'Picture Control',
32 => 'Active D-Lighting',
33 => 'Metering',
34 => 'Flash Mode',
35 => 'Focus Mode',
36 => 'Auto Bracketing',
37 => 'Multiple Exposure',
38 => 'HDR',
39 => 'Exposure Delay Mode',
40 => 'Shutter/Aperture Lock',
41 => 'Focus Peaking',
42 => 'Rating',
43 => 'Non-CPU Lens',
44 => 'None',
);

my %funcButtonZ7m2 = (
1 => 'AF-On',
2 => 'AF Lock Only',
Expand Down Expand Up @@ -1117,6 +1162,11 @@ my %infoZSeries = (
Name => 'Func1Button',
PrintConv => \%previewButtonD6,
%infoD6,
},{ # CSf2-a (Z6)
Name => 'Func1Button',
Condition => '$$self{Model} =~ /^NIKON Z [67]\b/',
Notes => 'Z6 and Z7',
PrintConv => \%funcButtonZ6,
},{ # CSf2-a (Z7_2)
Name => 'Func1Button',
PrintConv => \%funcButtonZ7m2,
Expand All @@ -1126,6 +1176,11 @@ my %infoZSeries = (
Name => 'Func2Button',
PrintConv => \%previewButtonD6,
%infoD6,
},{ # CSf2-b (Z6)
Name => 'Func2Button',
Condition => '$$self{Model} =~ /^NIKON Z [67]\b/',
Notes => 'Z6 and Z7',
PrintConv => \%funcButtonZ6,
},{ # CSf2-b (Z7_2)
Name => 'Func2Button',
PrintConv => \%funcButtonZ7m2,
Expand Down
4 changes: 3 additions & 1 deletion bin/lib/Image/ExifTool/OpenEXR.pm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use vars qw($VERSION);
use Image::ExifTool qw(:DataAccess :Utils);
use Image::ExifTool::GPS;

$VERSION = '1.06';
$VERSION = '1.07';

# supported EXR value format types (other types are extracted as undef binary data)
my %formatType = (
Expand Down Expand Up @@ -91,6 +91,8 @@ my %formatType = (
5 => 'PXR24',
6 => 'B44',
7 => 'B44A',
8 => 'DWAA', #github276
9 => 'DWAB', #github276
},
},
dataWindow => { },
Expand Down
8 changes: 7 additions & 1 deletion bin/lib/Image/ExifTool/QuickTime.pm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
use Image::ExifTool::Exif;
use Image::ExifTool::GPS;

$VERSION = '2.99';
$VERSION = '3.00';

sub ProcessMOV($$;$);
sub ProcessKeys($$$);
Expand Down Expand Up @@ -6606,6 +6606,12 @@ my %userDefined = (
PrintConv => '$val * 1e6 . " microseconds"',
PrintConvInv => '$val =~ s/ .*//; $val * 1e-6',
},
'camera.focal_length.35mm_equivalent' => {
Name => 'FocalLengthIn35mmFormat',
PrintConv => '"$val mm"',
PrintConvInv => '$val=~s/\s*mm$//;$val',
},
'camera.lens_model' => { Name => 'LensModel' },
'location.ISO6709' => {
Name => 'GPSCoordinates',
Groups => { 2 => 'Location' },
Expand Down
Loading

0 comments on commit 5d48edf

Please sign in to comment.