merge with dev

2019-12-01 06:53:23 +01:00
parent c58d2a1d75 3748133cd2
commit c0da01cf9a
116 changed files with 4040 additions and 562 deletions
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -2692,6 +2692,7 @@ const std::vector<const char*>& RAWParams::BayerSensor::getPSDemosaicMethodStrin
    static const std::vector<const char*> method_strings {
        "amaze",
        "amazevng4",
+        "rcdvng4",
        "lmmse"
    };
    return method_strings;