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

further tweaks to lens identification

Browse Source 
(cherry picked from commit 4fd18fed00eb799b8d82f472a98f270617bc3fb4)
This commit is contained in:
Alberto Griggio
2022-04-15 04:53:49 -07:00
committed by Lawrence Lee
parent 00c13bf2af
commit 2ac459e927
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/imagedata.cc
View File

@@ -284,10 +284,13 @@ FramesData::FramesData(const Glib::ustring &fname) :
auto p = pos; auto p = pos;
if (find_exif_tag("Exif.CanonFi.RFLensType") && find_exif_tag("Exif.Canon.LensModel")) { if (find_exif_tag("Exif.CanonFi.RFLensType") && find_exif_tag("Exif.Canon.LensModel")) {
lens = validateUft8(pos->print(&exif)); // validateUft8 (#5923) still needed? lens = validateUft8(pos->print(&exif)); // validateUft8 (#5923) still needed?
} else if (p->count() == 1 && lens == std::to_string(p->toLong()) && } else if (p->count() == 1 && lens == std::to_string(p->toLong())) {
find_exif_tag("Exif.Photo.LensModel")) { 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? lens = validateUft8(p->print(&exif)); // validateUft8 (#5923) still needed?
} }
}
} else if (find_exif_tag("Exif.Photo.LensSpecification") && pos->count() == 4) { } else if (find_exif_tag("Exif.Photo.LensSpecification") && pos->count() == 4) {
const auto round = const auto round =
[](float f) -> float [](float f) -> float