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

Merge remote-tracking branch 'origin/lensfix'

Browse Source
This commit is contained in:
Morgan Hardwood
2015-08-29 11:50:12 +02:00
parent d4e083ab0e 71eb36535d
commit 4777020a04
7 changed files with 653 additions and 358 deletions
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");
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"))) {
rtexif::Tag* flt = mnote->getTag ("FocalLength");
focal_len = flt->toDouble ();