"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/Image/ExifTool/Canon.pm" between
Image-ExifTool-12.26.tar.gz and Image-ExifTool-12.27.tar.gz

About: ExifTool is a platform-independent Perl library plus a command-line application for reading, writing and editing meta information in a wide variety of files.

Canon.pm  (Image-ExifTool-12.26):Canon.pm  (Image-ExifTool-12.27)
skipping to change at line 91 skipping to change at line 91
use Image::ExifTool qw(:DataAccess :Utils); use Image::ExifTool qw(:DataAccess :Utils);
use Image::ExifTool::Exif; use Image::ExifTool::Exif;
sub WriteCanon($$$); sub WriteCanon($$$);
sub ProcessSerialData($$$); sub ProcessSerialData($$$);
sub ProcessFilters($$$); sub ProcessFilters($$$);
sub ProcessCTMD($$$); sub ProcessCTMD($$$);
sub ProcessExifInfo($$$); sub ProcessExifInfo($$$);
sub SwapWords($); sub SwapWords($);
$VERSION = '4.48'; $VERSION = '4.49';
# Note: Removed 'USM' from 'L' lenses since it is redundant - PH # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
# (or is it? Ref 32 shows 5 non-USM L-type lenses) # (or is it? Ref 32 shows 5 non-USM L-type lenses)
# --> have relaxed this for new lenses because Canon has been # --> have relaxed this for new lenses because Canon has been
# consistent about keeping "USM" in the model name # consistent about keeping "USM" in the model name
%canonLensTypes = ( #4 %canonLensTypes = ( #4
Notes => q{ Notes => q{
Decimal values have been added to differentiate lenses which would other wise Decimal values have been added to differentiate lenses which would other wise
have the same LensType, and are used by the Composite LensID tag when have the same LensType, and are used by the Composite LensID tag when
attempting to identify the specific lens model. attempting to identify the specific lens model.
skipping to change at line 9256 skipping to change at line 9256
$sa *= $1; $la *= $1; $sa *= $1; $la *= $1;
} }
next if abs($shortFocal - $sf * $tc) > 0.9; next if abs($shortFocal - $sf * $tc) > 0.9;
my $tclens = $lens; my $tclens = $lens;
$tclens .= " + ${tc}x" if $tc > 1; $tclens .= " + ${tc}x" if $tc > 1;
push @maybe, $tclens; push @maybe, $tclens;
next if abs($longFocal - $lf * $tc) > 0.9; next if abs($longFocal - $lf * $tc) > 0.9;
push @likely, $tclens; push @likely, $tclens;
if ($maxAperture) { if ($maxAperture) {
# (not 100% sure that TC affects MaxAperture, but it should! ) # (not 100% sure that TC affects MaxAperture, but it should! )
next if $maxAperture < $sa * $tc - 0.15; # (RF 24-105mm F4L IS USM shows a MaxAperture of 4.177)
next if $maxAperture > $la * $tc + 0.15; next if $maxAperture < $sa * $tc - 0.18;
next if $maxAperture > $la * $tc + 0.18;
} }
push @matches, $tclens; push @matches, $tclens;
} }
last if @maybe; last if @maybe;
} }
if (@user) { if (@user) {
# choose the best match if we have more than one # choose the best match if we have more than one
if (@user > 1) { if (@user > 1) {
my ($try, @good); my ($try, @good);
foreach $try (\@matches, \@likely, \@maybe) { foreach $try (\@matches, \@likely, \@maybe) {
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)