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

Changed channelsAverage() to sample values from the original data in the RawImage instance, taking into account black levels. This lets me completely revert my awful commit 22f6297a5 and clip values to 65535, as it should be to avoid trouble downstream.

Browse Source
This commit is contained in:
rom9 2019-06-28 20:44:40 +02:00
parent 938fc63dd0
commit d7bab9ba9f
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rtengine/filmnegativeproc.cc
View File

@ -49,6 +49,7 @@ bool channelsAvg(
int width, int width,
int height, int height,
array2D<float>& rawData, array2D<float>& rawData,
const float* cblacksom,
rtengine::Coord spotPos, rtengine::Coord spotPos,
int spotSize, int spotSize,
const rtengine::procparams::FilmNegativeParams& params, const rtengine::procparams::FilmNegativeParams& params,
@ -83,13 +84,9 @@ bool channelsAvg(
++pxCount[ch]; ++pxCount[ch];
// If film negative is currently enabled, undo the effect by elevating to 1/exp, // Sample the original unprocessed values from RawImage, subtracting black levels.
// in order to sample the original, linear value // Scaling is irrelevant, as we are only interested in the ratio between two spots.
if (params.enabled) { avgs[ch] += ri->data[r][c] - cblacksom[ch];
avgs[ch] += powf(rawData[r][c], -1.f / (ch == 0 ? params.redExp : ch == 1 ? params.greenExp : params.blueExp));
} else {
avgs[ch] += rawData[r][c];
}
} }
} }
@ -118,13 +115,13 @@ bool rtengine::RawImageSource::getFilmNegativeExponents(Coord2D spotA, Coord2D s
// Sample first spot // Sample first spot
transformPosition(spotA.x, spotA.y, tran, spot.x, spot.y); transformPosition(spotA.x, spotA.y, tran, spot.x, spot.y);
if (!channelsAvg(ri, W, H, rawData, spot, spotSize, currentParams, clearVals)) { if (!channelsAvg(ri, W, H, rawData, cblacksom, spot, spotSize, currentParams, clearVals)) {
return false; return false;
} }
// Sample second spot // Sample second spot
transformPosition(spotB.x, spotB.y, tran, spot.x, spot.y); transformPosition(spotB.x, spotB.y, tran, spot.x, spot.y);
if (!channelsAvg(ri, W, H, rawData, spot, spotSize, currentParams, denseVals)) { if (!channelsAvg(ri, W, H, rawData, cblacksom, spot, spotSize, currentParams, denseVals)) {
return false; return false;
} }
@ -263,7 +260,7 @@ void rtengine::RawImageSource::filmNegativeProcess(const procparams::FilmNegativ
printf("Median calc time us: %d\n", t3.etime(t2)); printf("Median calc time us: %d\n", t3.etime(t2));
} }
constexpr float CLIP_VAL = 20 * MAX_OUT_VALUE; constexpr float CLIP_VAL = 65535.f;
t3.set(); t3.set();