"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/Image/ExifTool/Pentax.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.

Pentax.pm  (Image-ExifTool-12.26):Pentax.pm  (Image-ExifTool-12.27)
skipping to change at line 61 skipping to change at line 61
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
package Image::ExifTool::Pentax; package Image::ExifTool::Pentax;
use strict; use strict;
use vars qw($VERSION %pentaxLensTypes); use vars qw($VERSION %pentaxLensTypes);
use Image::ExifTool::Exif; use Image::ExifTool::Exif;
use Image::ExifTool::GPS; use Image::ExifTool::GPS;
use Image::ExifTool::HP; use Image::ExifTool::HP;
$VERSION = '3.37'; $VERSION = '3.38';
sub CryptShutterCount($$); sub CryptShutterCount($$);
sub PrintFilter($$$); sub PrintFilter($$$);
sub DecodeAFPoints($$$$;$); sub DecodeAFPoints($$$$;$);
# pentax lens type codes (ref 4) # pentax lens type codes (ref 4)
# The first number gives the lens series, and the 2nd gives the model number # The first number gives the lens series, and the 2nd gives the model number
# Series numbers: K=1; A=2; F=3; FAJ=4; DFA=4,7; FA=3,4,5,6; FA*=5,6; # Series numbers: K=1; A=2; F=3; FAJ=4; DFA=4,7; FA=3,4,5,6; FA*=5,6;
# DA=3,4,7; DA*=7,8; FA645=11; DFA645=13; Q=21 # DA=3,4,7; DA*=7,8; FA645=11; DFA645=13; Q=21
%pentaxLensTypes = ( %pentaxLensTypes = (
skipping to change at line 2226 skipping to change at line 2226
10 => '10 (K-01,K-30,K-50,K-500)', 10 => '10 (K-01,K-30,K-50,K-500)',
11 => '11 (Q10)', 11 => '11 (Q10)',
12 => '12 (MX-1,Q-S1,Q7)', 12 => '12 (MX-1,Q-S1,Q7)',
13 => '13 (K-3,K-3II)', 13 => '13 (K-3,K-3II)',
14 => '14 (645Z)', 14 => '14 (645Z)',
15 => '15 (K-S1,K-S2)', #PH 15 => '15 (K-S1,K-S2)', #PH
16 => '16 (K-1)', #PH 16 => '16 (K-1)', #PH
17 => '17 (K-70)', #29 17 => '17 (K-70)', #29
18 => '18 (KP)', #PH 18 => '18 (KP)', #PH
19 => '19 (GR III)', #PH 19 => '19 (GR III)', #PH
20 => '20 (K-3III)', #PH
}, },
}, },
0x0067 => { #PH (K-5) 0x0067 => { #PH (K-5)
Name => 'Hue', Name => 'Hue',
Writable => 'int16u', Writable => 'int16u',
PrintConvColumns => 2, PrintConvColumns => 2,
PrintConv => { PrintConv => {
0 => -2, 0 => -2,
1 => 'Normal', 1 => 'Normal',
2 => 2, 2 => 2,
skipping to change at line 2458 skipping to change at line 2459
}, },
0x007a => { #PH 0x007a => { #PH
Name => 'ISOAutoParameters', Name => 'ISOAutoParameters',
Writable => 'int8u', Writable => 'int8u',
Count => 2, Count => 2,
PrintConv => { PrintConv => {
'1 0' => 'Slow', '1 0' => 'Slow',
'2 0' => 'Standard', '2 0' => 'Standard',
'3 0' => 'Fast', '3 0' => 'Fast',
# '1 108' - seen for GR III # '1 108' - seen for GR III
# '3 84' - seen for K-3III
}, },
}, },
0x007b => { #PH (K-5) 0x007b => { #PH (K-5)
Name => 'CrossProcess', Name => 'CrossProcess',
Writable => 'int8u', Writable => 'int8u',
PrintConvColumns => 2, PrintConvColumns => 2,
PrintConv => { PrintConv => {
0 => 'Off', 0 => 'Off',
1 => 'Random', 1 => 'Random',
2 => 'Preset 1', 2 => 'Preset 1',
skipping to change at line 2601 skipping to change at line 2603
my ($val, $inv) = @_; my ($val, $inv) = @_;
if ($inv) { if ($inv) {
$val =~ tr/0-9 //dc; $val =~ tr/0-9 //dc;
} else { } else {
$val =~ s/(\d+) (\d+)/Shot $1 of $2/; $val =~ s/(\d+) (\d+)/Shot $1 of $2/;
} }
return $val; return $val;
}, },
}, },
}, },
0x0095 => { #31 0x0095 => [{ #31
Name => 'SkinToneCorrection', Name => 'SkinToneCorrection',
Condition => '$count == 2',
Writable => 'int8s', Writable => 'int8s',
Count => 2, Count => 2,
PrintConv => { PrintConv => {
'0 0' => 'Off', '0 0' => 'Off',
'1 1' => 'On (type 1)', '1 1' => 'On (type 1)',
'1 2' => 'On (type 2)', '1 2' => 'On (type 2)',
}, },
}, },{
Name => 'SkinToneCorrection',
Condition => '$count == 3',
Writable => 'int8s',
Count => 3,
PrintConv => {
'0 0 0' => 'Off',
},
}],
0x0096 => { #31 0x0096 => { #31
Name => 'ClarityControl', Name => 'ClarityControl',
Writable => 'int8s', Writable => 'int8s',
Count => 2, Count => 2,
PrintConv => { PrintConv => {
'0 0' => 'Off', '0 0' => 'Off',
OTHER => sub { OTHER => sub {
my ($val, $inv) = @_; my ($val, $inv) = @_;
if ($inv) { if ($inv) {
$val =~ /(\d+ -?\d+)/ and return $1; $val =~ /(\d+ -?\d+)/ and return $1;
skipping to change at line 2846 skipping to change at line 2857
Notes => 'only in PEF and DNG images', Notes => 'only in PEF and DNG images',
# K10D values with various Saturation settings (ref 19): # K10D values with various Saturation settings (ref 19):
# Very Low: 000000022820f9a0fe4000802660f92002e0fee01e402c40f880fb40ffc0 2b20f52002e0fe401ee0 # Very Low: 000000022820f9a0fe4000802660f92002e0fee01e402c40f880fb40ffc0 2b20f52002e0fe401ee0
# Low: 000000022ae0f700fe20ff402840f88001e0fcc021602f60f560fb40fe60 2d20f48001c0fbc02280 # Low: 000000022ae0f700fe20ff402840f88001e0fcc021602f60f560fb40fe60 2d20f48001c0fbc02280
# Med Low: 000000022dc0f420fe20fe002a20f7e000c0fa8024c032c0f220fb20fce0 2f60f3c000a0f9202640 # Med Low: 000000022dc0f420fe20fe002a20f7e000c0fa8024c032c0f220fb20fce0 2f60f3c000a0f9202640
# Normal: 000000023120f0e0fe00fc802c40f740ffa0f7e028803660ee80fb20fb40 31c0f300ff60f6202a80 # Normal: 000000023120f0e0fe00fc802c40f740ffa0f7e028803660ee80fb20fb40 31c0f300ff60f6202a80
# Med High: 0000000234e0ed40fde0fae02ea0f680fe60f5002ca03a80ea80fb00f960 3480f220fe00f2e02f20 # Med High: 0000000234e0ed40fde0fae02ea0f680fe60f5002ca03a80ea80fb00f960 3480f220fe00f2e02f20
# High: 0000000238c0e960fde0f9203140f5a0fce0f1e031403f00e600fb00f780 3760f120fc60ef403460 # High: 0000000238c0e960fde0f9203140f5a0fce0f1e031403f00e600fb00f780 3760f120fc60ef403460
# Very High:000000023d20e520fdc0f7203420f4c0fb60ee6036404400e120fae0f540 3aa0f020fac0eb403a00 # Very High:000000023d20e520fdc0f7203420f4c0fb60ee6036404400e120fae0f540 3aa0f020fac0eb403a00
}, },
# 0x021c - undef[18] (K-5) 0x021c => { #IB
# 0x021d - undef[18] (K-5) Name => 'ColorMatrixA2',
Format => 'int16s',
Writable => 'undef',
Count => 9,
},
0x021d => { #IB
Name => 'ColorMatrixB2',
Format => 'int16s',
Writable => 'undef',
Count => 9,
},
# 0x021e - undef[8] (K-5, Q) # 0x021e - undef[8] (K-5, Q)
0x021f => { #JD 0x021f => { #JD
Name => 'AFInfo', Name => 'AFInfo',
SubDirectory => { SubDirectory => {
# NOTE: Most of these subdirectories are 'undef' format, and as such the # NOTE: Most of these subdirectories are 'undef' format, and as such the
# byte ordering is not changed when changed via the Pentax software (which # byte ordering is not changed when changed via the Pentax software (which
# will write a little-endian TIFF on an Intel system). So we must d efine # will write a little-endian TIFF on an Intel system). So we must d efine
# BigEndian byte ordering for any of these which contain multi-byte values. - PH # BigEndian byte ordering for any of these which contain multi-byte values. - PH
ByteOrder => 'BigEndian', ByteOrder => 'BigEndian',
TagTable => 'Image::ExifTool::Pentax::AFInfo', TagTable => 'Image::ExifTool::Pentax::AFInfo',
 End of changes. 7 change blocks. 
5 lines changed or deleted 26 lines changed or added

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