Cleanups and also some speedups for RT 5.9, to be continued

This commit is contained in:
Ingo Weyrich
2020-05-31 17:27:44 +02:00
parent 1fe03b298e
commit 41675913d6
9 changed files with 96 additions and 213 deletions

View File

@@ -536,7 +536,7 @@ 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"))) {
} else if (!make.compare (0, 4, "SONY") || !make.compare (0, 6, "KONICA")) {
if (mnote->getTag ("LensID")) {
lens = mnote->getTag ("LensID")->valueToString ();
if (lens == "Unknown") {
@@ -554,7 +554,7 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
if (lens == "Unknown") {
lens_from_make_and_model();
}
} else if (mnote && !make.compare (0, 9, "Panasonic")) {
} else if (!make.compare (0, 9, "Panasonic")) {
if (mnote->getTag ("LensType")) {
std::string panalens = mnote->getTag("LensType")->valueToString();