merge with Dev

This commit is contained in:
Desmis
2017-09-18 16:28:28 +02:00
23 changed files with 235 additions and 125 deletions

View File

@@ -819,11 +819,17 @@ private:
// perform transform (excepted resizing)
if (ipf.needsTransform()) {
Imagefloat* trImg = new Imagefloat (fw, fh);
ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
Imagefloat* trImg = nullptr;
if (ipf.needsLuminanceOnly()) {
trImg = baseImg;
} else {
trImg = new Imagefloat (fw, fh);
} ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
imgsrc->getMetaData(), imgsrc->getRotateDegree(), true);
delete baseImg;
baseImg = trImg;
if(trImg != baseImg) {
delete baseImg;
baseImg = trImg;
}
}
}