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

Get lens name from EXIF group for ILCE/NEX cameras

Browse Source 
Fix incorrect lens name read in certain cases from Sony cameras (see
https://discuss.pixls.us/t/call-for-testing-rawtherapee-metadata-handling-with-exiv2-includes-cr3-support/36240/87).
This commit is contained in:
Lawrence Lee 2023-05-12 22:44:04 -07:00
parent 1f8e2aaf55
commit 8c98925f3d
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/imagedata.cc
View File

@ -336,9 +336,20 @@ FramesData::FramesData(const Glib::ustring &fname, time_t ts) :
} }
} }
} else if (!make.compare(0, 4, "SONY")) { } else if (!make.compare(0, 4, "SONY")) {
if (find_exif_tag("Exif.Sony2.LensID") && pos->toLong()) { // ExifTool prefers LensType2 over LensType (called
// Exif.Sony2.LensID by Exiv2). Exiv2 doesn't support LensType2 yet,
// so we let Exiv2 try it's best. For non ILCE/NEX cameras which
// likely don't have LensType2, we use Exif.Sony2.LensID because
// 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.
(!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") && pos->toLong()) {
lens = pos->print(&exif); lens = pos->print(&exif);
if (lens == std::to_string(pos->toLong())) { // Not know to Exiv2. if (lens == std::to_string(pos->toLong())) { // Not known to Exiv2.
lens.clear(); lens.clear();
} else { } else {
lens = validateUft8(lens); lens = validateUft8(lens);