From 572a75f02a25111fbc1b2163c4ae3c801ef9a879 Mon Sep 17 00:00:00 2001 From: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com> Date: Sun, 14 May 2023 11:06:23 -0700 Subject: [PATCH] Fix lens model reading for Sony ILMEs and ZV-E10 Use lens model from the EXIF group for these cameras. --- rtengine/imagedata.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index 4ff918c21..430559f3d 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -356,11 +356,11 @@ FramesData::FramesData(const Glib::ustring &fname, time_t ts) : // Exif.Photo.LensModel may be incorrect (see // https://discuss.pixls.us/t/call-for-testing-rawtherapee-metadata-handling-with-exiv2-includes-cr3-support/36240/36). if ( - // Camera model is neither a ILCE nor NEX. + // Camera model is neither a ILCE, ILME, nor NEX. (!find_exif_tag("Exif.Image.Model") || - (pos->toString().compare(0, 4, "ILCE") && pos->toString().compare(0, 3, "NEX"))) && - // LensID exists. - find_exif_tag("Exif.Sony2.LensID") && to_long(pos)) { + (pos->toString().compare(0, 4, "ILCE") && pos->toString().compare(0, 4, "ILME") && pos->toString().compare(0, 3, "NEX"))) && + // LensID exists. 0xFFFF could be one of many lenses. + find_exif_tag("Exif.Sony2.LensID") && to_long(pos) && to_long(pos) != 0xFFFF) { lens = pos->print(&exif); if (lens == std::to_string(to_long(pos))) { // Not known to Exiv2. lens.clear();