Merge branch 'dev' into relax-procparam-dependency

This commit is contained in:
Flössie
2019-03-10 12:54:04 +01:00
24 changed files with 281 additions and 148 deletions

View File

@@ -166,6 +166,8 @@ private:
} else {
imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
}
} else if (imgsrc->getSensorType() == ST_FUJI_XTRANS) {
imgsrc->setBorder(params.raw.xtranssensor.border);
}
imgsrc->getFullSize (fw, fh, tr);