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

fix broken crop lines in file browser, fixes #5440

Browse Source
This commit is contained in:
Ingo Weyrich
2019-09-05 15:16:24 +02:00
parent 9165d0acb7
commit 11bf7e5eb5
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/rtthumbnail.cc
View File

@@ -1483,23 +1483,20 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
delete labView; delete labView;
delete baseImg; delete baseImg;
// apply crop
if (params.crop.enabled) {
double lscale;
// calculate scale // calculate scale
if (params.coarse.rotate == 90 || params.coarse.rotate == 270) { if (params.coarse.rotate == 90 || params.coarse.rotate == 270) {
lscale = scale * thumbImg->getWidth() / fh; myscale = scale * thumbImg->getWidth() / fh;
} else { } else {
lscale = scale * thumbImg->getHeight() / fh; myscale = scale * thumbImg->getHeight() / fh;
} }
lscale = 1.0 / lscale; myscale = 1.0 / myscale;
// apply crop
if (params.crop.enabled) {
int ix = 0; int ix = 0;
for (int i = 0; i < fh; ++i) { for (int i = 0; i < fh; ++i) {
for (int j = 0; j < fw; ++j) { for (int j = 0; j < fw; ++j) {
if (i < params.crop.y * lscale || i > (params.crop.y + params.crop.h) * lscale || j < params.crop.x * lscale || j > (params.crop.x + params.crop.w) * lscale) { if (i < params.crop.y * myscale || i > (params.crop.y + params.crop.h) * myscale || j < params.crop.x * myscale || j > (params.crop.x + params.crop.w) * myscale) {
readyImg->data[ix++] /= 3; readyImg->data[ix++] /= 3;
readyImg->data[ix++] /= 3; readyImg->data[ix++] /= 3;
readyImg->data[ix++] /= 3; readyImg->data[ix++] /= 3;