merge with dev

This commit is contained in:
Desmis
2017-09-14 09:09:18 +02:00
40 changed files with 2861 additions and 1388 deletions

View File

@@ -820,10 +820,8 @@ 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, imgsrc->getMetaData()->getFocalLen(), imgsrc->getMetaData()->getFocalLen35mm(),
imgsrc->getMetaData()->getFocusDist(),
imgsrc->getMetaData()->getFNumber(),
imgsrc->getRotateDegree(), true);
ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
imgsrc->getMetaData(), imgsrc->getRotateDegree(), true);
delete baseImg;
baseImg = trImg;
}