From 2ac459e927db8abb9f1f6c8a00a5cec2aa5c91df Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Fri, 15 Apr 2022 04:53:49 -0700 Subject: [PATCH] further tweaks to lens identification (cherry picked from commit 4fd18fed00eb799b8d82f472a98f270617bc3fb4) --- rtengine/imagedata.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index 40a2baba4..8697aea09 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -284,9 +284,12 @@ FramesData::FramesData(const Glib::ustring &fname) : auto p = pos; if (find_exif_tag("Exif.CanonFi.RFLensType") && find_exif_tag("Exif.Canon.LensModel")) { lens = validateUft8(pos->print(&exif)); // validateUft8 (#5923) still needed? - } else if (p->count() == 1 && lens == std::to_string(p->toLong()) && - find_exif_tag("Exif.Photo.LensModel")) { - lens = validateUft8(p->print(&exif)); // validateUft8 (#5923) still needed? + } else if (p->count() == 1 && lens == std::to_string(p->toLong())) { + if (find_exif_tag("Exif.Canon.LensModel")) { + lens = validateUft8(pos->print(&exif)); // validateUft8 (#5923) still needed? + } else if (find_exif_tag("Exif.Photo.LensModel")) { + lens = validateUft8(p->print(&exif)); // validateUft8 (#5923) still needed? + } } } else if (find_exif_tag("Exif.Photo.LensSpecification") && pos->count() == 4) { const auto round =