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

Refine lens name reading for Nikon Z and Sony

Browse Source 
Fall back to other EXIF tags in case Exiv2 cannot interpret the lens ID.
This commit is contained in:
Lawrence Lee 2023-04-09 17:08:54 -07:00
parent 0bbcea8806
commit ab79a4fc3e
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rtengine/imagedata.cc
View File

@ -320,10 +320,33 @@ FramesData::FramesData(const Glib::ustring &fname, time_t ts) :
//orientation = pos->print(&exif); //orientation = pos->print(&exif);
} }
if ((find_exif_tag("Exif.NikonLd4.LensID") && pos->toLong()) || if (!make.compare(0, 5, "NIKON")) {
(find_exif_tag("Exif.NikonLd4.LensIDNumber") && pos->toLong()) || if (find_exif_tag("Exif.NikonLd4.LensID")) {
(find_exif_tag("Exif.Sony2.LensID") && pos->toLong())) { if (!pos->toLong()) { // No data, look in LensIDNumber.
lens = validateUft8(pos->print(&exif)); const auto p = pos;
if (!find_exif_tag("Exif.NikonLd4.LensIDNumber")) {
pos = p; // Tag not found, so reset pos.
}
}
lens = pos->print(&exif);
if (lens == std::to_string(pos->toLong())) { // Not known to Exiv2.
lens.clear();
} else {
lens = validateUft8(lens);
}
}
} else if (!make.compare(0, 4, "SONY")) {
if (find_exif_tag("Exif.Sony2.LensID") && pos->toLong()) {
lens = pos->print(&exif);
if (lens == std::to_string(pos->toLong())) { // Not know to Exiv2.
lens.clear();
} else {
lens = validateUft8(lens);
}
}
}
if (!lens.empty()) {
// Already found the lens name.
} else if (find_tag(Exiv2::lensName)) { } else if (find_tag(Exiv2::lensName)) {
lens = validateUft8(pos->print(&exif)); lens = validateUft8(pos->print(&exif));
auto p = pos; auto p = pos;