merge with dev

2019-03-03 18:20:16 +01:00
parent 2748cde1c1 9c9728ac95
commit 65a418ae27
10 changed files with 57 additions and 12 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -167,6 +167,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);