Merge branch 'dev' into newlocallab2
This commit is contained in:
@@ -952,13 +952,8 @@ BENCHFUN
|
|||||||
labdn->b[i1][j1] = B_ < 65535.f ? gamcurve[B_] : Color::gammanf(B_ / 65535.f, gam) * 32768.f;
|
labdn->b[i1][j1] = B_ < 65535.f ? gamcurve[B_] : Color::gammanf(B_ / 65535.f, gam) * 32768.f;
|
||||||
|
|
||||||
if (((i1 | j1) & 1) == 0) {
|
if (((i1 | j1) & 1) == 0) {
|
||||||
if (numTries == 1) {
|
|
||||||
noisevarlum[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseLCurve ? lumcalc[i >> 1][j >> 1] : noisevarL;
|
noisevarlum[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseLCurve ? lumcalc[i >> 1][j >> 1] : noisevarL;
|
||||||
noisevarchrom[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseCCurve ? maxNoiseVarab * ccalc[i >> 1][j >> 1] : 1.f;
|
noisevarchrom[(i1 >> 1) * width2 + (j1 >> 1)] = useNoiseCCurve ? maxNoiseVarab * ccalc[i >> 1][j >> 1] : 1.f;
|
||||||
} else {
|
|
||||||
noisevarlum[(i1 >> 1) * width2 + (j1 >> 1)] = lumcalc[i >> 1][j >> 1];
|
|
||||||
noisevarchrom[(i1 >> 1) * width2 + (j1 >> 1)] = ccalc[i >> 1][j >> 1];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//end chroma
|
//end chroma
|
||||||
|
Reference in New Issue
Block a user