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.h
+++ b/rtengine/procparams.h
@@ -1398,6 +1398,7 @@ struct RAWParams {
        enum class PSDemosaicMethod {
            AMAZE,
            AMAZEVNG4,
+            RCDVNG4,
            LMMSE
        };