liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into exiftool1049

Browse Source
This commit is contained in:
Morgan Hardwood
2017-04-18 21:00:42 +02:00
parent 33a940cef4 e33457cb6e
commit cb4e6c83dd
9 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtexif/rtexif.cc
View File

@@ -976,7 +976,7 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
// There are 2 format pentaxLensDataAttribs
int offsetFirst = 4; // LensInfo2
if ( strstr (model, "*ist") || strstr (model, "GX-1") || strstr (model, "K100D") || strstr (model, "K110D") ) {
if ( strstr (model, "*ist") || strstr (model, "GX-1") || strstr (model, "K200D") || (strstr (model, "K100D") && !strstr (model, "K100D Super")) || strstr (model, "K110D") || strstr (model, "645Z")) {
offsetFirst = 3; // LensInfo
} else if ( strstr (model, "645D") ) {
offsetFirst = 13; // LensInfo3