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

Revert latest commit (kind of) and disable automatic global green equilibration for OLYMPUS E-M1MarkII

Browse Source
This commit is contained in:
heckflosse
2018-06-05 18:51:07 +02:00
parent 72cd11aa21
commit e542a38f85
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/green_equil_RT.cc
View File

@@ -48,10 +48,10 @@ void RawImageSource::green_equilibrate_global(array2D<float> &rawData)
double avgg = 0.; double avgg = 0.;
int ng = 0; int ng = 0;
for (int j = border + ((FC(i, border) & 1) ^ 1); j < W - border; j += 2) { for (int j = border + ((FC(i, border) & 1) ^ 1); j < W - border; j += 2) {
if(rawData[i][j] > 0.f) { // if(rawData[i][j] > 0.f) {
avgg += rawData[i][j]; avgg += rawData[i][j];
ng++; ng++;
} // }
} }
if (i & 1) { if (i & 1) {

2
rtengine/rawimagesource.cc
View File

@@ -1952,7 +1952,7 @@ void RawImageSource::preprocess (const RAWParams &raw, const LensProfParams &le
for(int i = 0; i < 4; ++i) { for(int i = 0; i < 4; ++i) {
green_equilibrate_global(*rawDataFrames[i]); green_equilibrate_global(*rawDataFrames[i]);
} }
} else { } else if(idata->getModel() != "E-M1MarkII") {
green_equilibrate_global(rawData); green_equilibrate_global(rawData);
} }
} }