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

Merge pull request #3170 from Beep6581/sonylensfix

Browse Source 
Fix Sony LensID issue, kudos to dschlegel
This commit is contained in:
Ingo Weyrich
2016-02-23 23:57:33 +01:00
parent 3f85ee00e9 686b25f33d
commit ad32009c53
1 changed files with 137 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/imagedata.cc
View File

@@ -284,13 +284,19 @@ void ImageData::extractInfo ()
} else if(!make.compare (0, 4, "SONY")) { } else if(!make.compare (0, 4, "SONY")) {
if (iso_speed == 65535 || iso_speed == 0) { if (iso_speed == 65535 || iso_speed == 0) {
rtexif::Tag* isoTag = exif->getTag ("RecommendedExposureIndex"); rtexif::Tag* isoTag = exif->getTag ("RecommendedExposureIndex");
if(isoTag)
if(isoTag) {
iso_speed = isoTag->toDouble(); iso_speed = isoTag->toDouble();
} }
}
} }
else if (root->findTag("MakerNote")) {
rtexif::TagDirectory* mnote = root->findTag("MakerNote")->getDirectory(); if (lens == "Unknown") {
rtexif::Tag* mnoteTag = root->findTag("MakerNote");
if (mnoteTag) {
rtexif::TagDirectory* mnote = mnoteTag->getDirectory();
if (mnote && !make.compare (0, 5, "NIKON")) { if (mnote && !make.compare (0, 5, "NIKON")) {
// ISO at max value supported, check manufacturer specific // ISO at max value supported, check manufacturer specific
@@ -456,6 +462,7 @@ void ImageData::extractInfo ()
lens = exif->getTag ("LensInfo")->valueToString (); lens = exif->getTag ("LensInfo")->valueToString ();
} }
} }
}
} }
ImageData::~ImageData () ImageData::~ImageData ()