merge with dev

2017-12-10 14:44:54 +01:00
parent 1a105bef4c 4cc7861125
commit 5d67bb2e39
19 changed files with 1200 additions and 23 deletions
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -2058,6 +2058,8 @@ void RawImageSource::demosaic (const RAWParams &raw)
            fast_demosaic();
        } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::MONO) ) {
            nodemosaic(true);
+        } else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCD) ) {
+            rcd_demosaic ();
        } else {
            nodemosaic (false);
        }