small change to take into account new scale with iterations
This commit is contained in:
parent
73b0bb14c0
commit
67a19d0cc9
@ -297,7 +297,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
|
|||||||
|
|
||||||
if(gradient == 0) {
|
if(gradient == 0) {
|
||||||
grad = 1.f;
|
grad = 1.f;
|
||||||
sc = scal;//3.f
|
sc = 3.f;
|
||||||
} else if(gradient == 1) {
|
} else if(gradient == 1) {
|
||||||
grad = 0.25f * it + 0.75f;
|
grad = 0.25f * it + 0.75f;
|
||||||
sc = -0.5f * it + 4.5f;
|
sc = -0.5f * it + 4.5f;
|
||||||
@ -339,6 +339,19 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
|
|||||||
|
|
||||||
if(iter == 1) {
|
if(iter == 1) {
|
||||||
sc = scal;
|
sc = scal;
|
||||||
|
} else {
|
||||||
|
//adjust sc in function of choice of scale by user if iterations
|
||||||
|
if(scal < 3) {
|
||||||
|
sc -= 1;
|
||||||
|
|
||||||
|
if(sc < 1.f) {//avoid 0
|
||||||
|
sc = 1.f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(scal > 4) {
|
||||||
|
sc += 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
float varx;
|
float varx;
|
||||||
|
@ -158,7 +158,7 @@ void RetinexParams::setDefaults()
|
|||||||
{
|
{
|
||||||
enabled = false;
|
enabled = false;
|
||||||
str = 20;
|
str = 20;
|
||||||
scal = 0;
|
scal = 3;
|
||||||
iter = 1;
|
iter = 1;
|
||||||
grad = 1;
|
grad = 1;
|
||||||
grads = 1;
|
grads = 1;
|
||||||
|
@ -2234,7 +2234,6 @@ void RawImageSource::retinexPrepareCurves(RetinexParams retinexParams, LUTf &cdc
|
|||||||
|
|
||||||
void RawImageSource::retinex(ColorManagementParams cmp, RetinexParams deh, ToneCurveParams Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D<float, 4> &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI)
|
void RawImageSource::retinex(ColorManagementParams cmp, RetinexParams deh, ToneCurveParams Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D<float, 4> &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI)
|
||||||
{
|
{
|
||||||
|
|
||||||
MyTime t4, t5;
|
MyTime t4, t5;
|
||||||
t4.set();
|
t4.set();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user