Merge branch 'dev' into testoutputprofile

2018-06-25 01:07:02 +02:00
parent 81a0795d1a ae9ea3d3e0
commit 88e645a329
59 changed files with 580 additions and 372 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1225,7 +1225,9 @@ struct RAWParams {
            AMAZE,
            AMAZEVNG4,
            RCD,
+            RCDVNG4,
            DCB,
+            DCBVNG4,
            LMMSE,
            IGV,
            AHD,
@@ -1308,6 +1310,7 @@ struct RAWParams {
        enum class Method {
            FOUR_PASS,
            THREE_PASS,
+            TWO_PASS,
            ONE_PASS,
            FAST,
            MONO,