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

Add linear mode to HSL

Browse Source
This commit is contained in:
Desmis
2015-09-10 07:11:17 +02:00
parent 528d85b1f9
commit e82c79bd8a
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/ipdehaz.cc
View File

@@ -207,8 +207,9 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, int width
float delta;
float eps = 2.f;
bool useHsl = deh.dehazcolorspace == "HSL";
bool useHslLin = deh.dehazcolorspace == "HSLLIN";
float gain2 = (float) deh.gain / 100.f; //def =1 not use
// gain2 = useHsl ? gain2 * 0.5f : gain2;
gain2 = useHslLin ? gain2 * 0.5f : gain2;
float offse = (float) deh.offs; //def = 0 not use
int scal = deh.scal; //def=3
int nei = (int) 2.8f * deh.neigh; //def = 220
@@ -216,7 +217,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, int width
float strength = (float) deh.str / 100.f; // Blend with original L channel data
float limD = (float) deh.limd;
limD = pow(limD, 1.7f);//about 2500 enough
// limD *= useHsl ? 10.f : 1.f;
limD *= useHslLin ? 10.f : 1.f;
float ilimD = 1.f / limD;
int modedehaz = 0; // default to 0 ( deh.dehazmet == "uni" )
bool execcur = false;
@@ -283,9 +284,9 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, int width
for (int i = 0; i < H_L; i++) {
int j = 0;
#ifdef __SSE2__
if(useHsl) {
if(useHslLin) {
for (; j < W_L - 3; j += 4) {
_mm_storeu_ps(&luminance[i][j], LVFU(luminance[i][j]) + pondv * xlogf(LIMV(LVFU(src[i][j]) / LVFU(out[i][j]), limMinv, limMaxv) ));
_mm_storeu_ps(&luminance[i][j], LVFU(luminance[i][j]) + pondv * (LIMV(LVFU(src[i][j]) / LVFU(out[i][j]), limMinv, limMaxv) ));
}
} else {
for (; j < W_L - 3; j += 4) {
@@ -293,9 +294,9 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, int width
}
}
#endif
if(useHsl) {
if(useHslLin) {
for (; j < W_L; j++) {
luminance[i][j] += pond * xlogf(LIM(src[i][j] / out[i][j], ilimD, limD));
luminance[i][j] += pond * (LIM(src[i][j] / out[i][j], ilimD, limD));
}
} else {
for (; j < W_L; j++) {