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

Merge branch 'dev' into newlocallab2

Browse Source
This commit is contained in:
Ingo Weyrich
2020-06-14 22:03:26 +02:00
parent d0e44374c2 c2eb20be70
commit beb8fd8f74
13 changed files with 304 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/imagedata.cc
View File

@@ -546,9 +546,9 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
if (mnote->getTag("FocalLengthIn35mmFilm")) {
focal_len35mm = mnote->getTag("FocalLengthIn35mmFilm")->toDouble();
}
} else if (mnote && (!make.compare(0, 4, "SONY") || !make.compare(0, 6, "KONICA"))) {
if (mnote->getTag("LensID")) {
lens = mnote->getTag("LensID")->valueToString();
} else if (!make.compare (0, 4, "SONY") || !make.compare (0, 6, "KONICA")) {
if (mnote->getTag ("LensID")) {
lens = mnote->getTag ("LensID")->valueToString ();
if (lens == "Unknown") {
lens_from_make_and_model();
}
@@ -564,8 +564,8 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
if (lens == "Unknown") {
lens_from_make_and_model();
}
} else if (mnote && !make.compare(0, 9, "Panasonic")) {
if (mnote->getTag("LensType")) {
} else if (!make.compare (0, 9, "Panasonic")) {
if (mnote->getTag ("LensType")) {
std::string panalens = mnote->getTag("LensType")->valueToString();
if (panalens.find("LUMIX") != Glib::ustring::npos) {