Sigma.pm (Image-ExifTool-12.57) | : | Sigma.pm (Image-ExifTool-12.58) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
# NJ) Niels Kristian Bech Jensen | # NJ) Niels Kristian Bech Jensen | |||
# JR) Jos Roost | # JR) Jos Roost | |||
#------------------------------------------------------------------------------ | #------------------------------------------------------------------------------ | |||
package Image::ExifTool::Sigma; | package Image::ExifTool::Sigma; | |||
use strict; | use strict; | |||
use vars qw($VERSION %sigmaLensTypes); | use vars qw($VERSION %sigmaLensTypes); | |||
use Image::ExifTool::Exif; | use Image::ExifTool::Exif; | |||
$VERSION = '1.33'; | $VERSION = '1.34'; | |||
# sigma LensType lookup (ref IB) | # sigma LensType lookup (ref IB) | |||
%sigmaLensTypes = ( | %sigmaLensTypes = ( | |||
Notes => q{ | Notes => q{ | |||
Sigma LensType values are hexadecimal numbers stored as a string (withou t | Sigma LensType values are hexadecimal numbers stored as a string (withou t | |||
the leading "0x"). Decimal values have been added to differentiate lens | the leading "0x"). | |||
es | ||||
which would otherwise have the same LensType, and are used by the Compos | ||||
ite | ||||
LensID tag when attempting to identify the specific lens model. | ||||
}, | }, | |||
# 0x0 => 'Sigma 50mm F2.8 EX Macro', (0x0 used for other lenses too) | # 0x0 => 'Sigma 50mm F2.8 EX Macro', (0x0 used for other lenses too) | |||
# 0x8 - 18-125mm LENSARANGE@18mm=22-4 | # 0x8 - 18-125mm LENSARANGE@18mm=22-4 | |||
0x10, 'Sigma 50mm F2.8 EX DG MACRO', | 0x10, 'Sigma 50mm F2.8 EX DG MACRO', | |||
# (0x10 = 16) | # (0x10 = 16) | |||
16.1 => 'Sigma 70mm F2.8 EX DG Macro', | 16.1 => 'Sigma 70mm F2.8 EX DG Macro', | |||
16.2 => 'Sigma 105mm F2.8 EX DG Macro', | 16.2 => 'Sigma 105mm F2.8 EX DG Macro', | |||
0x16 => 'Sigma 18-50mm F3.5-5.6 DC', #PH | 0x16 => 'Sigma 18-50mm F3.5-5.6 DC', #PH | |||
0x103 => 'Sigma 180mm F3.5 EX IF HSM APO Macro', | 0x103 => 'Sigma 180mm F3.5 EX IF HSM APO Macro', | |||
0x104 => 'Sigma 150mm F2.8 EX DG HSM APO Macro', | 0x104 => 'Sigma 150mm F2.8 EX DG HSM APO Macro', | |||
skipping to change at line 560 | skipping to change at line 558 | |||
0x0027 => [{ #PH | 0x0027 => [{ #PH | |||
Name => 'LensType', | Name => 'LensType', | |||
Condition => '$$self{MakerNoteSigmaVer} >= 3 and $format eq "string"', | Condition => '$$self{MakerNoteSigmaVer} >= 3 and $format eq "string"', | |||
Notes => 'some newer models only', | Notes => 'some newer models only', | |||
ValueConv => '$val =~ /^[0-9a-f]+$/i ? hex($val) : $val', | ValueConv => '$val =~ /^[0-9a-f]+$/i ? hex($val) : $val', | |||
# (truncate decimal part and convert hex) | # (truncate decimal part and convert hex) | |||
ValueConvInv => '$val=~s/\.\d+$//;$val=~/^0x/ and $val=hex($val);IsInt($ val) ? sprintf("%x",$val) : $val', | ValueConvInv => '$val=~s/\.\d+$//;$val=~/^0x/ and $val=hex($val);IsInt($ val) ? sprintf("%x",$val) : $val', | |||
SeparateTable => 'LensType', | SeparateTable => 'LensType', | |||
PrintHex => 1, | PrintHex => 1, | |||
PrintConv => \%sigmaLensTypes, | PrintConv => \%sigmaLensTypes, | |||
PrintInt => 1, | ||||
},{ #PH | },{ #PH | |||
Name => 'LensType', | Name => 'LensType', | |||
Condition => '$$self{MakerNoteSigmaVer} >= 3', | Condition => '$$self{MakerNoteSigmaVer} >= 3', | |||
Notes => 'some other models like the fp', | Notes => 'some other models like the fp', | |||
Writable => 'int16u', | Writable => 'int16u', | |||
SeparateTable => 'LensType', | SeparateTable => 'LensType', | |||
PrintHex => 1, | PrintHex => 1, | |||
PrintConv => \%sigmaLensTypes, | PrintConv => \%sigmaLensTypes, | |||
PrintInt => 1, | ||||
}], | }], | |||
0x002a => { #PH | 0x002a => { #PH | |||
Name => 'LensFocalRange', | Name => 'LensFocalRange', | |||
Condition => '$$self{MakerNoteSigmaVer} >= 3', | Condition => '$$self{MakerNoteSigmaVer} >= 3', | |||
Notes => 'some newer models only', | Notes => 'some newer models only', | |||
Writable => 'rational64u', | Writable => 'rational64u', | |||
Count => 2, | Count => 2, | |||
PrintConv => '$val=~s/ / to /; $val', | PrintConv => '$val=~s/ / to /; $val', | |||
PrintConvInv => '$val=~s/to //; $val', | PrintConvInv => '$val=~s/to //; $val', | |||
}, | }, | |||
End of changes. 4 change blocks. | ||||
6 lines changed or deleted | 4 lines changed or added |