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

resize: added "allow upscaling" checkbox (issue #4643)

Browse Source
This commit is contained in:
Alberto Griggio
2018-07-04 13:32:12 +02:00
parent 370e5d0222
commit 8c3e14b7f0
10 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/simpleprocess.cc
View File

@@ -1192,7 +1192,8 @@ private:
}
if (labResize) { // resize lab data
if(labView->W != imw || labView->H != imh) {
if ((labView->W != imw || labView->H != imh) &&
(params.resize.allowUpscaling || (labView->W >= imw && labView->H >= imh))) {
// resize image
tmplab = new LabImage (imw, imh);
ipf.Lanczos (labView, tmplab, tmpScale);
@@ -1265,7 +1266,8 @@ private:
pl->setProgress (0.70);
}
if (tmpScale != 1.0 && params.resize.method == "Nearest") { // resize rgb data (gamma applied)
if (tmpScale != 1.0 && params.resize.method == "Nearest" &&
(params.resize.allowUpscaling || (readyImg->getWidth() >= imw && readyImg->getHeight() >= imh))) { // resize rgb data (gamma applied)
Imagefloat* tempImage = new Imagefloat (imw, imh);
ipf.resize (readyImg, tempImage, tmpScale);
delete readyImg;
@@ -1383,7 +1385,7 @@ private:
assert (params.resize.enabled);
// resize image
{
if (params.resize.allowUpscaling || (imw <= fw && imh <= fh)) {
std::unique_ptr<LabImage> resized (new LabImage (imw, imh));
ipf.Lanczos (tmplab.get(), resized.get(), scale_factor);
tmplab = std::move (resized);