Merge branch 'master' into spot-removal-tool

2016-10-07 13:55:59 +02:00
parent 56dafcf8c1 897b9d92ee
commit 6b22cbd831
192 changed files with 21297 additions and 13713 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -467,6 +467,8 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    DEMOSAIC,         // EvRetinexmapcurve
    DEMOSAIC,         // EvviewMethod
    ALLNORAW,         // EvcbdlMethod
+    RETINEX,          // EvRetinexgaintransmission
+    RETINEX,          // EvLskal
    SPOT              // EvSpotEnabled
 };