From c2405585cf048e69e13361f30f8f7f0699b9f3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Sun, 10 Mar 2019 14:56:36 +0100 Subject: [PATCH] Work around strange side effects when parsing Exif (#5207) --- rtengine/imagedata.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index bb43acd67..a7d2d157f 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -448,8 +448,6 @@ FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory* found = true; 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"))) { // ISO at max value supported, check manufacturer specific if (iso_speed == 65535 || iso_speed == 0) {