liz/rawTherapee
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
Show Stats 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 ();
}
}
}

1
rtexif/nikonattribs.cc
View File

@ -414,7 +414,6 @@ class NALensDataInterpreter : public Interpreter {
lenses["54 44 5C 7C 34 3C 58 02"] = "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED";
lenses["56 3C 5C 8E 30 3C 1C 02"] = "Sigma 70-300mm F4-5.6 APO Macro Super II";
lenses["56 48 5C 8E 30 3C 5A 02"] = "AF Zoom-Nikkor 70-300mm f/4-5.6D ED";
lenses["56 9C 54 56 56 24 24 06"] = "AF-S Micro Nikkor 60mm f/2.8G ED";
lenses["59 48 98 98 24 24 5D 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED";
lenses["59 48 98 98 24 24 E1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E";
lenses["59 48 98 98 24 24 F1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E";