merge with dev

This commit is contained in:
Desmis
2017-06-27 10:28:35 +02:00
45 changed files with 1074 additions and 400 deletions

View File

@@ -708,10 +708,11 @@ void Crop::update (int todo)
if (needstransform)
parent->ipf.transform (baseCrop, transCrop, cropx / skip, cropy / skip, trafx / skip, trafy / skip, skips (parent->fw, skip), skips (parent->fh, skip), parent->getFullWidth(), parent->getFullHeight(),
parent->imgsrc->getMetaData()->getFocalLen(), parent->imgsrc->getMetaData()->getFocalLen35mm(),
parent->imgsrc->getMetaData()->getFocusDist(), parent->imgsrc->getRotateDegree(), false);
else {
baseCrop->copyData (transCrop);
}
parent->imgsrc->getMetaData()->getFocusDist(),
parent->imgsrc->getMetaData()->getFNumber(),
parent->imgsrc->getRotateDegree(), false);
else
baseCrop->copyData(transCrop);
if (transCrop) {
baseCrop = transCrop;