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

Work around strange side effects when parsing Exif (#5207)

Browse Source
This commit is contained in:
Flössie
2019-03-10 14:56:36 +01:00
parent d89364fcc0
commit c2405585cf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/imagedata.cc
View File

@@ -448,8 +448,6 @@ FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
found = true; found = true;
lens = "Canon " + ldata; lens = "Canon " + ldata;
} }
} else {
found = lens_from_make_and_model();
} }
} }
@@ -464,6 +462,10 @@ FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
} }
} }
} }
if (!found) {
lens_from_make_and_model();
}
} 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) {