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

Fixed Bug issue #6067 - right side border with dynamic range

Browse Source
This commit is contained in:
Desmis 2021-01-19 09:13:12 +01:00
parent c5f6692492
commit 26a97468d9
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/iplocallab.cc
View File

@ -6545,7 +6545,7 @@ void optfft(int N_fftwsize, int &bfh, int &bfw, int &bfhr, int &bfwr, struct loc
//optimize with size fftw //optimize with size fftw
bool reduW = false; bool reduW = false;
bool reduH = false; bool reduH = false;
bool exec = true;
if (ystart == 0 && yend < H) { if (ystart == 0 && yend < H) {
lp.ly -= (bfh - ftsizeH); lp.ly -= (bfh - ftsizeH);
} else if (ystart != 0 && yend == H) { } else if (ystart != 0 && yend == H) {
@ -6557,8 +6557,10 @@ void optfft(int N_fftwsize, int &bfh, int &bfw, int &bfhr, int &bfwr, struct loc
lp.ly -= (bfh - ftsizeH); lp.ly -= (bfh - ftsizeH);
} }
} else if (ystart == 0 && yend == H) { } else if (ystart == 0 && yend == H) {
bfhr = ftsizeH; // bfhr = ftsizeH;
bfhr = bfh;
reduH = true; reduH = true;
exec = false;
} }
if (xstart == 0 && xend < W) { if (xstart == 0 && xend < W) {
@ -6572,8 +6574,10 @@ void optfft(int N_fftwsize, int &bfh, int &bfw, int &bfhr, int &bfwr, struct loc
lp.lx -= (bfw - ftsizeW); lp.lx -= (bfw - ftsizeW);
} }
} else if (xstart == 0 && xend == W) { } else if (xstart == 0 && xend == W) {
bfwr = ftsizeW; // bfwr = ftsizeW;
bfwr = bfw;
reduW = true; reduW = true;
exec = false;
} }
//new values optimized //new values optimized
@ -6584,14 +6588,18 @@ void optfft(int N_fftwsize, int &bfh, int &bfw, int &bfhr, int &bfwr, struct loc
bfh = bfhr = yend - ystart; bfh = bfhr = yend - ystart;
bfw = bfwr = xend - xstart; bfw = bfwr = xend - xstart;
if (reduH) { if (reduH && exec) {
bfhr = ftsizeH; bfhr = ftsizeH;
} else {
bfhr = bfh;
} }
if (reduW) { if (reduW && exec) {
bfwr = ftsizeW; bfwr = ftsizeW;
} else {
bfwr = bfw;
} }
if (settings->verbose) { if (settings->verbose) {
printf("Nyst=%i Nyen=%i lp.yc=%f lp.lyT=%f lp.ly=%f bfh=%i bfhr=%i origH=%i ftsizeH=%i\n", ystart, yend, lp.yc, lp.lyT, lp.ly, bfh, bfhr, H, ftsizeH); printf("Nyst=%i Nyen=%i lp.yc=%f lp.lyT=%f lp.ly=%f bfh=%i bfhr=%i origH=%i ftsizeH=%i\n", ystart, yend, lp.yc, lp.lyT, lp.ly, bfh, bfhr, H, ftsizeH);
printf("Nxst=%i Nxen=%i lp.xc=%f lp.lxL=%f lp.lx=%f bfw=%i bfwr=%i origW=%i ftsizeW=%i\n", xstart, xend, lp.xc, lp.lxL, lp.lx, bfw, bfwr, W, ftsizeW); printf("Nxst=%i Nxen=%i lp.xc=%f lp.lxL=%f lp.lx=%f bfw=%i bfwr=%i origW=%i ftsizeW=%i\n", xstart, xend, lp.xc, lp.lxL, lp.lx, bfw, bfwr, W, ftsizeW);