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

Revert "Merged master into gtk3, fixed three conflicts."

Browse Source 
This reverts commit c857bba95e.
This commit is contained in:
Beep6581
2016-06-09 23:24:55 +02:00
parent bd1a7fc4a7
commit 3da7d84ba9
50 changed files with 5937 additions and 6037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/rawimage.cc
View File

@@ -580,9 +580,7 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
if (cc) {
for (int i = 0; i < 4; i++) {
if (RT_blacklevel_from_constant) {
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];
black_c4[i] = cblack[i] + cc->get_BlackLevel(i, iso_speed);
}
// load 4 channel white level here, will be used if available