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

Merge branch 'dev' into newlocallab

Browse Source
This commit is contained in:
Ingo Weyrich
2019-08-08 16:18:58 +02:00
parent 3603cad472 82e329ca83
commit b3e0013e56
96 changed files with 1000 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/imagedata.cc
View File

@@ -265,7 +265,6 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
tag = exif->getTag("SubjectDistance");
if (tag) {
int num, denom;
tag->toRational(num, denom);
} else {
// Second try, XMP data
@@ -533,9 +532,8 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
if (flt->toDouble() > 0) {
focal_len = flt->toDouble();
}
} else if ((flt = mnote->getTagP("FocalLength"))) {
rtexif::Tag* flt = mnote->getTag("FocalLength");
focal_len = flt->toDouble();
} else if ((flt = mnote->getTagP ("FocalLength"))) {
focal_len = mnote->getTag("FocalLength")->toDouble ();
}
if (mnote->getTag("FocalLengthIn35mmFilm")) {