third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#816. Fix for Pentax K-3 Camera.

Browse Source
This commit is contained in:
Robin Mills
2015-12-20 21:31:41 +00:00
parent ecedab80a5
commit e07eecd689
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pentaxmn.cpp
+9 -3
View File
@@ -1181,10 +1181,16 @@ namespace Exiv2 {
} else if ( value.count() == 3 ) {
// http://dev.exiv2.org/attachments/download/858/_IGP9032.DNG
// $ exiv2 -pv --grep Lens ~/Downloads/_IGP9032.DNG
// 0x003f PentaxDng LensType Byte 3 3 255 0
// 0x0207 PentaxDng LensInfo Undefined 69 131 0 0 255 0 40 148 68 244 ...
// 0 1 2 3 4 5 6
// 0x003f PentaxDng LensType Byte 3 3 255 0
// 0x0207 PentaxDng LensInfo Undefined 69 131 0 0 255 0 40 148 68 244 ...
// 0 1 2 3 4 5 6
if ( lensInfo->toLong(4) == 0 && lensInfo->toLong(5) == 40 && lensInfo->toLong(6) == 148 ) index = 8;
} else if ( value.count() == 4 ) {
// http://dev.exiv2.org/attachments/download/868/IMGP2221.JPG
// 0x0207 PentaxDng LensInfo Undefined 128 0 131 128 0 0 255 1 184 0 0 0 0 0
// 0 1 2 3 4 5 6
if ( lensInfo->count() == 128 && lensInfo->toLong(1) == 131 && lensInfo->toLong(2) == 128 ) index = 8;
}
if ( index > 0 ) {
test/bugfixes-test.sh
+1 -1
View File
@@ -222,7 +222,7 @@ source ./functions.source
num=816 # test Camera: Pentax + Lens:Sigma 55-200mm F4-5.6 DC is correctly reported
printf "$num " >&3
echo '------>' Bug $num '<-------' >&2
for X in a b c d; do
for X in a b c d e; do
filename=exiv2-bug${num}${X}.exv
copyTestFile $filename
runTest exiv2 -pa --grep Lens $filename
test/data/bugfixes-test.out
BIN
View File
Binary file not shown.
test/data/exiv2-bug816e.exv
BIN
View File
Binary file not shown.