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

Don't replace focal_len from Exif by focal_len from Makernotes is Makernotes focal_len is 0

Browse Source
This commit is contained in:
Morgan Hardwood 2015-08-21 11:01:03 +02:00
parent 4198ac1083
commit b3a12b699a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/imagedata.cc
View File

@ -406,7 +406,10 @@ void ImageData::extractInfo ()
rtexif::Tag* flt = mnote->getTagP ("LensInfo/FocalLength"); rtexif::Tag* flt = mnote->getTagP ("LensInfo/FocalLength");
if (flt) { if (flt) {
focal_len = flt->toDouble (); // Don't replace Exif focal_len if Makernotes focal_len is 0
if (flt->toDouble() > 0) {
focal_len = flt->toDouble ();
}
} else if ((flt = mnote->getTagP ("FocalLength"))) { } else if ((flt = mnote->getTagP ("FocalLength"))) {
rtexif::Tag* flt = mnote->getTag ("FocalLength"); rtexif::Tag* flt = mnote->getTag ("FocalLength");
focal_len = flt->toDouble (); focal_len = flt->toDouble ();