Merge pull request #3502 from Beep6581/pentaxhighiso

Pentax: ISO > 65535 was reported as 65535 in info dialog
This commit is contained in:
Ingo Weyrich 2016-11-08 20:59:02 +01:00 committed by GitHub
commit f4b8c0fcc0

View File

@ -440,6 +440,16 @@ void ImageData::extractInfo ()
}
}
} else if (mnote && (!make.compare (0, 6, "PENTAX") || (!make.compare (0, 5, "RICOH") && !model.compare (0, 6, "PENTAX")))) {
// ISO at max value supported, check manufacturer specific
if (iso_speed == 65535 || iso_speed == 0) {
rtexif::Tag* baseIsoTag = mnote->getTag("ISO");
if (baseIsoTag) {
std::string isoData = baseIsoTag->valueToString();
if (isoData.size() > 1) {
iso_speed = stoi(isoData);
}
}
}
if (mnote->getTag ("LensType")) {
lens = mnote->getTag ("LensType")->valueToString ();
}