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

Incorporate FreeBSD fix from @mandree (#5651) plus a little hardening

Browse Source
This commit is contained in:
Flössie
2020-02-14 11:44:57 +01:00
parent 67ca8e2c19
commit 1069c890f5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/imagedata.cc
View File

@@ -502,11 +502,11 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
} else if (!make.compare (0, 6, "PENTAX") || (!make.compare (0, 5, "RICOH") && !model.compare (0, 6, "PENTAX"))) { } else if (!make.compare (0, 6, "PENTAX") || (!make.compare (0, 5, "RICOH") && !model.compare (0, 6, "PENTAX"))) {
// ISO at max value supported, check manufacturer specific // ISO at max value supported, check manufacturer specific
if (iso_speed == 65535 || iso_speed == 0) { if (iso_speed == 65535 || iso_speed == 0) {
rtexif::Tag* baseIsoTag = mnote->getTag("ISO"); const rtexif::Tag* const baseIsoTag = mnote->getTag("ISO");
if (baseIsoTag) { if (baseIsoTag) {
std::string isoData = baseIsoTag->valueToString(); const std::string isoData = baseIsoTag->valueToString();
if (isoData.size() > 1) { if (isoData.size() > 1) {
iso_speed = stoi(isoData); iso_speed = std::stoi(isoData);
} }
} }
} }

3
rtengine/procparams.cc
View File

@@ -4606,8 +4606,9 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
Glib::ustring temp; Glib::ustring temp;
assignFromKeyfile(keyFile, "Wavelet", "LevMethod", pedited, temp, pedited->wavelet.Lmethod); assignFromKeyfile(keyFile, "Wavelet", "LevMethod", pedited, temp, pedited->wavelet.Lmethod);
if (!temp.empty()) { try {
wavelet.Lmethod = std::stoi(temp); wavelet.Lmethod = std::stoi(temp);
} catch (...) {
} }
} else { } else {
assignFromKeyfile(keyFile, "Wavelet", "LevMethod", pedited, wavelet.Lmethod, pedited->wavelet.Lmethod); assignFromKeyfile(keyFile, "Wavelet", "LevMethod", pedited, wavelet.Lmethod, pedited->wavelet.Lmethod);