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

Change DNG lens detection priority; had to remove Nikkor 60mm patch

Browse Source
This commit is contained in:
Oliver Duis
2010-11-04 08:21:01 +01:00
parent fd6505caf1
commit d834af78c7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/imagedata.cc
View File

@@ -181,13 +181,8 @@ void ImageData::extractInfo () {
lens = "Unknown";
// Sometimes (e.g. DNG) EXIF already contains lens data
if (exif->getTag ("LensModel")) {
lens = exif->getTag ("LensModel")->valueToString ();
} else if (exif->getTag ("LensInfo")) {
lens = exif->getTag ("LensInfo")->valueToString ();
} else if (exif->getTag ("DNGLensInfo")) {
lens = exif->getTag ("DNGLensInfo")->valueToString ();
} else if (exif->getTag ("MakerNote")) {
if (exif->getTag ("MakerNote")) {
rtexif::TagDirectory* mnote = exif->getTag ("MakerNote")->getDirectory();
if (mnote && !make.compare (0, 5, "NIKON")) {
bool lensOk = false;
@@ -275,6 +270,12 @@ void ImageData::extractInfo () {
lens = eq->getTag ("LensType")->valueToString ();
}
}
} else if (exif->getTag ("DNGLensInfo")) {
lens = exif->getTag ("DNGLensInfo")->valueToString ();
} if (exif->getTag ("LensModel")) {
lens = exif->getTag ("LensModel")->valueToString ();
} else if (exif->getTag ("LensInfo")) {
lens = exif->getTag ("LensInfo")->valueToString ();
}
}
}