merge with dev

2019-11-25 10:23:20 +01:00
parent d37e6e21af f054ed00e8
commit cee051f7f0
5 changed files with 20 additions and 24 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1783,6 +1783,7 @@ struct RAWParams {
        enum class PSDemosaicMethod {
            AMAZE,
            AMAZEVNG4,
+            RCDVNG4,
            LMMSE
        };