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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-09-06 10:56:03 +02:00
parent dfc4715a82 1eb4aac404
commit 202fb8084d
9 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/rtthumbnail.cc
View File

@@ -1484,7 +1484,6 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
delete labView;
delete baseImg;
/*
// calculate scale
if (params.coarse.rotate == 90 || params.coarse.rotate == 270) {
myscale = scale * thumbImg->getWidth() / fh;
@@ -1496,17 +1495,19 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
// apply crop
if (params.crop.enabled) {
int ix = 0;
for (int i=0; i<fh; i++)
for (int j=0; j<fw; j++)
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) {
for (int i = 0; i < fh; ++i) {
for (int j = 0; j < fw; ++j) {
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;
}
else
} else {
ix += 3;
}
}
}
}
*/
return readyImg;
}