treat black levels > 0xffff in camconst.json as absolute level & 0xffff

This commit is contained in:
heckflosse
2016-05-24 18:14:09 +02:00
parent 18243db5ba
commit f86a0811aa

View File

@@ -580,7 +580,9 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
if (cc) {
for (int i = 0; i < 4; i++) {
if (RT_blacklevel_from_constant) {
black_c4[i] = cblack[i] + cc->get_BlackLevel(i, iso_speed);
int blackFromCc = cc->get_BlackLevel(i, iso_speed);
// if black level from camconst > 0xffff it is an absolute value.
black_c4[i] = blackFromCc > 0xffff ? (blackFromCc & 0xffff) : blackFromCc + cblack[i];
}
// load 4 channel white level here, will be used if available