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:
heckflosse
2019-03-12 14:57:17 +01:00
parent 4756e5184c 86690f1ca0
commit 020204e0cb
150 changed files with 1822 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/imagedata.cc
View File

@@ -25,6 +25,8 @@
#include "iptcpairs.h"
#include "imagesource.h"
#include "rt_math.h"
#include "procparams.h"
#pragma GCC diagnostic warning "-Wextra"
#define PRINT_HDR_PS_DETECTION 0
@@ -456,10 +458,18 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
found = true;
lens = "Canon " + ldata;
}
} else {
found = lens_from_make_and_model();
}
}
if (!found || lens.substr(lens.find(' ')).length() < 7) {
const std::string::size_type first_space_pos = lens.find(' ');
const std::string::size_type remaining_size =
first_space_pos != std::string::npos
? lens.size() - first_space_pos
: 0;
if( !found || remaining_size < 7U ) {
lt = mnote->findTag("LensID");
if (lt) {
@@ -470,11 +480,7 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
}
}
}
if (!found) {
lens_from_make_and_model();
}
} else if (!make.compare(0, 6, "PENTAX") || (!make.compare(0, 5, "RICOH") && !model.compare(0, 6, "PENTAX"))) {
} else if (!make.compare (0, 6, "PENTAX") || (!make.compare (0, 5, "RICOH") && !model.compare (0, 6, "PENTAX"))) {
// ISO at max value supported, check manufacturer specific
if (iso_speed == 65535 || iso_speed == 0) {
rtexif::Tag* baseIsoTag = mnote->getTag("ISO");